diff --git a/.env.localhost b/.env.localhost
index c70595c1c42..5a6da11d7f0 100644
--- a/.env.localhost
+++ b/.env.localhost
@@ -5,7 +5,7 @@ APP_BASE="https://local.zinfra.io:8081"
 
 FORCED_CONFIG_URL="https://github.com/wireapp/wire-web-config-wire"
 
-CSP_EXTRA_CONNECT_SRC="http://localhost:32123, ws://localhost:32123, https://*.zinfra.io, https://*.wire.link, https://*.wire.com, https://api.raygun.io, wss://*.zinfra.io, wss://*.wire.link, wss://prod-nginz-ssl.wire.com, https://wire.count.ly"
+CSP_EXTRA_CONNECT_SRC="http://localhost:32123, ws://localhost:32123, https://*.zinfra.io, https://*.wire.link, https://*.wire.com, https://api.raygun.io, wss://*.zinfra.io, wss://*.wire.link, wss://prod-nginz-ssl.wire.com, https://wire.count.ly, https://balderdash.hogwash.work:9000, https://balderdash.hogwash.work:5556, https://accounts.google.com, https://oauth2.googleapis.com/token"
 CSP_EXTRA_IMG_SRC="https://*.zinfra.io, https://*.wire.com, https://*.wire.link"
 CSP_EXTRA_SCRIPT_SRC="http://localhost:32123, https://*.zinfra.io, https://*.wire.com, https://*.wire.link, https://api.raygun.io"
 ENFORCE_HTTPS="false"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000000..cbc75624b91
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+## Description
+
+## Screenshots/Screencast (for UI changes)
+
+## Checklist
+
+- [ ] PR has been self reviewed by the author;
+- [ ] Hard-to-understand areas of the code have been commented;
+- [ ] If it is a core feature, unit tests have been added;
+
+### Important details for the reviewers
+
+(Delete this section if unnecessary)
+
+- use (x) data
+- can be reviewed commit-by-commit
+- be sure to look at ...
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index e03c8b486f7..a8b98c626e3 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -22,25 +22,13 @@ updates:
     open-pull-requests-limit: 99
     labels:
       - 'type: chore 🧹'
+    groups:
+      eslint:
+        patterns:
+          - '*eslint*'
+
     ignore:
-      - dependency-name: core-js
-        versions:
-          - '>= 3.a'
-      - dependency-name: webrtc-adapter
-        versions:
-          - '>= 7.a'
-      - dependency-name: 'less'
-        versions:
-          - '>= 4'
-      - dependency-name: 'husky'
-        versions:
-          - '>= 5.a'
-      - dependency-name: 'tsyringe'
-        versions:
-          - '> 4.3.0'
       - dependency-name: '@wireapp/avs'
-      - dependency-name: 'autoprefixer'
-      - dependency-name: 'cssnano'
 
   # Server dependencies
   - package-ecosystem: npm
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 986cda32513..e9f24785f9a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,7 +20,7 @@ jobs:
         language: ['javascript']
     steps:
       - name: 'Checkout repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Initialize CodeQL'
         uses: github/codeql-action/init@v2
         with:
diff --git a/.github/workflows/create_docker_image.yml b/.github/workflows/create_docker_image.yml
index b09466cb797..26c11f54dfe 100644
--- a/.github/workflows/create_docker_image.yml
+++ b/.github/workflows/create_docker_image.yml
@@ -1,24 +1,30 @@
-name: Create Docker image
+name: Create Release Artifact
 
 on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'tagname for the Docker image'
+        description: 'tagname for the Artifact'
         required: true
         type: string
 
+      create_release:
+        description: 'Wether or not a release entry should be created on github'
+        required: false
+        default: true
+        type: boolean
+
 concurrency:
   group: ci-${{ github.ref }}
   cancel-in-progress: true
 
 jobs:
-  test_build_deploy:
+  create_image:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -32,13 +38,32 @@ jobs:
         run: yarn --immutable
 
       - name: Test
-        run: yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false
+        run: |
+          set -o pipefail
+          yarn test --coverage --coverage-reporters=lcov --detectOpenHandles=false 2>&1 | tee ./unit-tests.log
 
       - name: Build
         run: yarn build:prod
 
+      - name: Set short sha
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Push Docker image
         env:
           DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
           DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
-        run: yarn docker '' "${{inputs.tag}}"
+        run: yarn docker "${{inputs.tag}}-${{ steps.vars.outputs.sha_short }}"
+
+      - name: Create GitHub release
+        if: ${{inputs.create_release}}
+        id: create_release_production
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{github.token}}
+        with:
+          tag_name: ${{inputs.tag}}
+          name: ${{inputs.tag}}
+          files: ./unit-tests.log
+          draft: false
+          prerelease: true
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
index 1b2d307cdd7..83c72972ffd 100644
--- a/.github/workflows/dependabot-auto-merge.yml
+++ b/.github/workflows/dependabot-auto-merge.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.5.1
+        uses: dependabot/fetch-metadata@v1.6.0
         with:
           github-token: '${{secrets.WEBTEAM_AUTOMERGE_TOKEN}}'
 
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
index 34b14c395b9..a9b8d46d944 100644
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -15,6 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v3
diff --git a/.github/workflows/deploy-to-test-env.yml b/.github/workflows/deploy-to-test-env.yml
index 11a9f31436b..405920a336a 100644
--- a/.github/workflows/deploy-to-test-env.yml
+++ b/.github/workflows/deploy-to-test-env.yml
@@ -9,7 +9,6 @@ on:
         type: choice
         options:
           - wire-webapp-qa-al2-migration
-          - wire-webapp-edge-al2
           - wire-webapp-mls-al2
 
 concurrency:
@@ -32,7 +31,7 @@ jobs:
           echo -e "env = ${{inputs.env}}"
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/jira-lint-and-link.yml b/.github/workflows/jira-lint-and-link.yml
index a977c8ab73f..06c40a2750e 100644
--- a/.github/workflows/jira-lint-and-link.yml
+++ b/.github/workflows/jira-lint-and-link.yml
@@ -6,7 +6,7 @@ jobs:
   add-jira-description:
     runs-on: ubuntu-latest
     steps:
-      - uses: cakeinpanic/jira-description-action@v0.4.0
+      - uses: cakeinpanic/jira-description-action@v0.7.0
         name: jira-description-action
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2def74ea705..96891a035ff 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
diff --git a/.github/workflows/semantic-commit-lint.yml b/.github/workflows/semantic-commit-lint.yml
index 23cf0f074d8..fc4edfb9229 100644
--- a/.github/workflows/semantic-commit-lint.yml
+++ b/.github/workflows/semantic-commit-lint.yml
@@ -14,7 +14,7 @@ jobs:
       # Please look up the latest version from
       # https://github.com/amannn/action-semantic-pull-request/releases
       - name: Run Semantic Commint Linter
-        uses: amannn/action-semantic-pull-request@v5.2.0
+        uses: amannn/action-semantic-pull-request@v5.3.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/sync_translations.yml b/.github/workflows/sync_translations.yml
index a075511852b..df66e5fa8af 100644
--- a/.github/workflows/sync_translations.yml
+++ b/.github/workflows/sync_translations.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Node.js
         uses: actions/setup-node@v3
@@ -37,7 +37,7 @@ jobs:
         run: yarn translate:merge
 
       - name: Download translations
-        uses: crowdin/github-action@v1.11.0
+        uses: crowdin/github-action@v1.13.1
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           CROWDIN_PROJECT_ID: 342359
diff --git a/.github/workflows/test_build_deploy.yml b/.github/workflows/test_build_deploy.yml
index 0071a08918d..3e6b9129967 100644
--- a/.github/workflows/test_build_deploy.yml
+++ b/.github/workflows/test_build_deploy.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -93,11 +93,19 @@ jobs:
           key: '${{github.ref}}'
           map: |
             {
-              "edge": { "dev_env": "wire-webapp-edge-al2" },
               "dev": { "dev_env": "wire-webapp-dev-al2" },
               "master": { "dev_env": "wire-webapp-master-al2" }
             }
 
+      - uses: kanga333/variable-mapper@master
+        with:
+          # We try to map a branch to a dev environment
+          key: '${{github.ref}}'
+          map: |
+            {
+              "dev": { "preprod_env": "wire-webapp-edge-al2" }
+            }
+
       - uses: kanga333/variable-mapper@master
         with:
           # We try to map a tag to a dev environment
@@ -147,6 +155,22 @@ jobs:
           wait_for_deployment: false
           wait_for_environment_recovery: ${{env.DEPLOYMENT_RECOVERY_TIMEOUT_SECONDS}}
 
+      - name: Deploy to pre-prod env
+        if: env.preprod_env
+        uses: einaregilsson/beanstalk-deploy@v21
+        with:
+          application_name: ${{env.AWS_APPLICATION_NAME}}
+          aws_access_key: ${{secrets.WEBTEAM_AWS_ACCESS_KEY_ID}}
+          aws_secret_key: ${{secrets.WEBTEAM_AWS_SECRET_ACCESS_KEY}}
+          deployment_package: ${{env.AWS_BUILD_ZIP_PATH}}
+          environment_name: ${{env.preprod_env}}
+          region: eu-central-1
+          use_existing_version_if_available: true
+          version_description: ${{github.sha}}
+          version_label: ${{github.run_id}}
+          wait_for_deployment: false
+          wait_for_environment_recovery: ${{env.DEPLOYMENT_RECOVERY_TIMEOUT_SECONDS}}
+
       - name: Deploy to prod env
         if: env.prod_env
         uses: einaregilsson/beanstalk-deploy@v21
@@ -172,21 +196,21 @@ jobs:
         env:
           DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
           DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
-        run: yarn docker '' "${{env.BRANCH_NAME}}"
+        run: yarn docker "${{env.BRANCH_NAME}}"
 
       - name: Push staging Docker image
         if: contains(env.TAG, 'staging')
         env:
           DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
           DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
-        run: yarn docker '' staging "$TAG"
+        run: yarn docker staging "$TAG"
 
       - name: Push production Docker image
         if: contains(env.TAG, 'production')
         env:
           DOCKER_PASSWORD: ${{secrets.WEBTEAM_QUAY_PASSWORD}}
           DOCKER_USERNAME: ${{secrets.WEBTEAM_QUAY_USERNAME}}
-        run: yarn docker '' production "$TAG"
+        run: yarn docker production "$TAG"
 
       - name: Generate changelog for production release
         if: contains(env.TAG, 'production')
@@ -287,7 +311,7 @@ jobs:
           echo "::set-output name=releaseInfo::$(cat ${ARTIFACT_LOCAL_PATH})"
 
       - name: Checking out 'wire-server'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: ${{ steps.release-info-file.outputs.exists == 'true' }}
         with:
           repository: 'wireapp/wire-server'
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 2b09fbc86e7..dc0378c3488 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npx --no-install lint-staged && yarn check:circular-dependencies 
\ No newline at end of file
+yarn lint-staged
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index eeceb1bcbcf..766e5d79580 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:21-alpine
 
 # For some extra dependencies...
 RUN apk add --no-cache dumb-init git bash
diff --git a/README.md b/README.md
index c00df646050..7742c544c13 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Wire™
 
-[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://wire.softgarden.io/en/vacancies)
+[![We are hiring](https://github.com/wireapp/wire/blob/master/assets/header-small.png?raw=true)](https://www.linkedin.com/company/wire-secure-communication/jobs/)
 
 This repository is part of the source code of Wire. You can find more information at [wire.com](https://wire.com) or by contacting opensource@wire.com.
 
diff --git a/app-config/package.json b/app-config/package.json
index e085a68407e..567b3e77a64 100644
--- a/app-config/package.json
+++ b/app-config/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.16-0",
-    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.15"
+    "wire-web-config-default-master": "https://github.com/wireapp/wire-web-config-wire#v0.31.19-0",
+    "wire-web-config-default-staging": "https://github.com/wireapp/wire-web-config-default#v0.31.18"
   }
 }
diff --git a/bin/push_docker.js b/bin/push_docker.js
index 3219881dccb..c30aceae769 100644
--- a/bin/push_docker.js
+++ b/bin/push_docker.js
@@ -33,25 +33,18 @@ require('dotenv').config();
  * Note: You must run "yarn build:prod" before creating the Docker image, otherwise the compiled JavaScript code (and other assets) won't be part of the bundle.
  *
  * Demo execution:
- * yarn docker '' staging '2021-08-25' '1240cfda9e609470cf1154e18f5bc582ca8907ff'
+ * yarn docker staging '2021-08-25' '1240cfda9e609470cf1154e18f5bc582ca8907ff'
  */
 
-/** Either empty (for our own cloud releases) or a suffix (i.e. "ey") for custom deployments */
-const distributionParam = process.argv[2] || '';
 /** Either "staging" (for internal releases / staging bumps) or "production" (for cloud releases) */
-const stageParam = process.argv[3] || '';
+const stageParam = process.argv[2] || '';
 /** Version tag of webapp (i.e. "2021-08-25") */
-const versionParam = process.argv[4] || '';
+const versionParam = process.argv[3] || '';
 /** Commit ID of https://github.com/wireapp/wire-webapp (i.e. "1240cfda9e609470cf1154e18f5bc582ca8907ff") */
-const commitSha = process.env.GITHUB_SHA || process.argv[5];
+const commitSha = process.env.GITHUB_SHA || process.argv[4];
 const commitShortSha = commitSha.substring(0, 7);
-/** Defines which config version (listed in "app-config/package.json") is going to be used */
-const configurationEntry = `wire-web-config-default-${
-  distributionParam || stageParam === 'production' ? 'master' : 'staging'
-}`;
-const configVersion = appConfigPkg.dependencies[configurationEntry].split('#')[1];
 const dockerRegistryDomain = 'quay.io';
-const repository = `${dockerRegistryDomain}/wire/webapp${distributionParam ? `-${distributionParam}` : ''}`;
+const repository = `${dockerRegistryDomain}/wire/webapp`;
 
 const tags = [];
 
@@ -61,6 +54,9 @@ if (stageParam) {
 }
 
 if (['production', 'staging'].includes(stageParam)) {
+  /** Defines which config version (listed in "app-config/package.json") is going to be used */
+  const configurationEntry = `wire-web-config-default-${stageParam === 'production' ? 'master' : 'staging'}`;
+  const configVersion = appConfigPkg.dependencies[configurationEntry].split('#')[1];
   tags.push(`${repository}:${versionParam}-${configVersion}-${commitShortSha}`);
 }
 
diff --git a/bin/translations_download.ts b/bin/translations_download.ts
deleted file mode 100755
index b8a594e2e45..00000000000
--- a/bin/translations_download.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env node
-
-/*
- * Wire
- * Copyright (C) 2020 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import https from 'https';
-import * as path from 'path';
-import fs from 'fs-extra';
-import AdmZip from 'adm-zip';
-
-const rootDir = path.resolve(__dirname, '..');
-const destinationPath = path.join(rootDir, 'src/i18n');
-const zipDir = path.join(rootDir, 'temp/i18n');
-const zipPath = path.join(zipDir, 'wire-webapp.zip');
-
-// https://crowdin.com/project/wire-webapp/settings#api
-const getProjectAuthentication = () => {
-  const crowdinYaml = path.join(rootDir, 'keys/crowdin.yaml');
-  const crowdinYamlContent = fs.readFileSync(crowdinYaml, 'utf8');
-  const keyRegex = /api_key: ["']?([0-9a-f]+)["']?/;
-  const usernameRegex = /username: ["']?(.+)["']?/;
-  return {
-    apiKey: (crowdinYamlContent.match(keyRegex) || [])[1],
-    username: (crowdinYamlContent.match(usernameRegex) || [])[1],
-  };
-};
-
-const {apiKey: accountApiKey, username} = getProjectAuthentication();
-
-// Crowdin API v1: https://support.crowdin.com/api/api-integration-setup/
-const CROWDIN_API = 'https://api.crowdin.com/api/project/wire-webapp';
-
-const CROWDIN_URL = {
-  DOWNLOAD: `${CROWDIN_API}/download/all.zip?login=${username}&account-key=${accountApiKey}`,
-  EXPORT: `${CROWDIN_API}/export?login=${username}&account-key=${accountApiKey}&json`,
-};
-
-function fetchUpdates(): Promise<void> {
-  console.info('Building translations ...');
-
-  return new Promise((resolve, reject) => {
-    https.get(CROWDIN_URL.EXPORT, response => {
-      if (!response.statusCode) {
-        return reject(new Error('Failed to export, no status code'));
-      } else if (response.statusCode < 200 || response.statusCode > 299) {
-        return reject(new Error(`Failed to export, status code: ${response.statusCode}`));
-      }
-      response.on('data', () => resolve());
-      response.on('error', error => reject(error));
-    });
-  });
-}
-
-async function download(): Promise<void> {
-  console.info('Downloading built translations ...');
-
-  await fs.ensureDir(zipDir);
-
-  await new Promise<void>((resolve, reject) => {
-    https.get(CROWDIN_URL.DOWNLOAD, response => {
-      if (!response.statusCode) {
-        return reject(new Error('Failed to export, no status code'));
-      } else if (response.statusCode < 200 || response.statusCode > 299) {
-        return reject(new Error(`Failed to export, status code: ${response.statusCode}`));
-      }
-
-      response.on('error', reject);
-
-      const writeStream = fs.createWriteStream(zipPath);
-      console.info('Writing zip file ...');
-
-      response.pipe(writeStream);
-
-      writeStream.on('error', error => reject(error));
-
-      writeStream.on('finish', () => {
-        console.info('Extracting zip file ...');
-        const zip = new AdmZip(zipPath);
-        zip.getEntries().forEach(entry => {
-          if (!entry.isDirectory) {
-            console.info(`Writing ${path.join(destinationPath, entry.name)} ...`);
-            zip.extractEntryTo(entry, destinationPath, false, true);
-          }
-        });
-        console.info('Deleting zip file ...');
-        fs.unlinkSync(zipPath);
-        resolve();
-      });
-    });
-  });
-}
-
-fetchUpdates()
-  .then(download)
-  .catch(error => {
-    console.error(error);
-    process.exit(1);
-  });
diff --git a/package.json b/package.json
index 26d8269490e..c6614763af9 100644
--- a/package.json
+++ b/package.json
@@ -1,173 +1,153 @@
 {
   "dependencies": {
-    "@datadog/browser-logs": "^4.43.0",
-    "@datadog/browser-rum": "^4.43.0",
+    "@datadog/browser-logs": "^4.50.1",
+    "@datadog/browser-rum": "^4.50.1",
     "@emotion/react": "11.11.1",
-    "@types/eslint": "8.37.0",
-    "@wireapp/avs": "9.2.15",
-    "@wireapp/core": "40.6.0",
+    "@lexical/history": "0.12.2",
+    "@lexical/react": "0.12.2",
+    "@peculiar/x509": "1.9.5",
+    "@wireapp/avs": "9.5.2",
+    "@wireapp/commons": "5.2.1",
+    "@wireapp/core": "42.17.0",
     "@wireapp/lru-cache": "3.8.1",
-    "@wireapp/react-ui-kit": "9.7.5",
-    "@wireapp/store-engine-dexie": "2.1.1",
+    "@wireapp/react-ui-kit": "9.9.11",
+    "@wireapp/store-engine-dexie": "2.1.6",
     "@wireapp/store-engine-sqleet": "1.8.9",
-    "@wireapp/webapp-events": "0.17.0",
+    "@wireapp/webapp-events": "0.18.3",
     "amplify": "https://github.com/wireapp/amplify#head=master",
-    "beautiful-react-hooks": "^4.3.0",
+    "beautiful-react-hooks": "^5.0.0",
     "classnames": "2.3.2",
     "copy-webpack-plugin": "11.0.0",
-    "core-js": "3.25.5",
-    "countly-sdk-web": "23.2.2",
+    "core-js": "3.33.1",
+    "countly-sdk-web": "23.6.2",
     "date-fns": "2.30.0",
     "dexie-batch": "0.4.3",
-    "highlight.js": "11.8.0",
-    "http-status-codes": "2.2.0",
-    "jimp": "0.22.8",
-    "jquery": "3.7.0",
-    "js-cookie": "3.0.1",
+    "emoji-picker-react": "4.5.3",
+    "highlight.js": "11.9.0",
+    "http-status-codes": "2.3.0",
+    "jimp": "0.22.10",
+    "jquery": "3.7.1",
+    "js-cookie": "3.0.5",
     "jszip": "3.10.1",
     "keyboardjs": "2.7.0",
     "knockout": "3.5.1",
-    "libsodium-wrappers": "0.7.11",
+    "lexical": "0.12.2",
+    "libsodium-wrappers": "0.7.13",
     "linkify-it": "4.0.1",
     "long": "5.2.3",
-    "markdown-it": "13.0.1",
+    "markdown-it": "13.0.2",
     "murmurhash": "2.0.1",
+    "oidc-client-ts": "^2.2.5",
     "platform": "1.3.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-error-boundary": "4.0.10",
-    "react-intl": "6.4.4",
-    "react-redux": "8.1.1",
-    "react-router": "6.14.0",
-    "react-router-dom": "6.14.0",
+    "react-error-boundary": "4.0.11",
+    "react-intl": "6.5.1",
+    "react-redux": "8.1.3",
+    "react-router": "6.17.0",
+    "react-router-dom": "6.17.0",
     "react-transition-group": "4.4.5",
     "redux": "4.2.1",
     "redux-logdown": "1.0.4",
     "redux-thunk": "2.4.2",
     "speakingurl": "14.0.1",
     "switch-path": "1.2.0",
-    "tsyringe": "4.7.0",
-    "uint32": "0.2.1",
+    "tsyringe": "4.8.0",
     "underscore": "1.13.6",
     "uuidjs": "4.2.13",
-    "webrtc-adapter": "6.4.8",
-    "zustand": "4.3.8"
+    "webrtc-adapter": "8.2.3",
+    "zustand": "4.4.4"
   },
   "devDependencies": {
-    "@babel/core": "7.22.5",
-    "@babel/eslint-parser": "7.22.5",
-    "@babel/plugin-proposal-decorators": "7.22.5",
-    "@babel/preset-env": "7.22.5",
-    "@babel/preset-react": "7.22.5",
-    "@babel/preset-typescript": "7.22.5",
+    "@babel/core": "7.23.2",
+    "@babel/eslint-parser": "7.22.15",
+    "@babel/plugin-proposal-decorators": "7.23.2",
+    "@babel/preset-env": "7.23.2",
+    "@babel/preset-react": "7.22.15",
+    "@babel/preset-typescript": "7.23.2",
     "@emotion/eslint-plugin": "^11.11.0",
-    "@faker-js/faker": "7.6.0",
-    "@formatjs/cli": "6.1.3",
+    "@faker-js/faker": "8.1.0",
+    "@formatjs/cli": "6.2.1",
     "@koush/wrtc": "0.5.3",
-    "@testing-library/react": "13.4.0",
-    "@types/adm-zip": "0.5.0",
-    "@types/caniuse-lite": "^1.0.1",
-    "@types/classnames": "2.3.1",
-    "@types/dexie-batch": "0.4.3",
-    "@types/fs-extra": "11.0.1",
-    "@types/generate-changelog": "1.8.1",
-    "@types/highlight.js": "10.1.0",
-    "@types/jest": "29.5.2",
+    "@testing-library/react": "14.0.0",
+    "@types/adm-zip": "0.5.2",
+    "@types/dexie-batch": "0.4.6",
+    "@types/eslint": "^8",
+    "@types/fs-extra": "11.0.3",
+    "@types/generate-changelog": "1.8.2",
+    "@types/jest": "29.5.6",
     "@types/jquery": "^3",
-    "@types/js-cookie": "3.0.3",
-    "@types/jsdom": "21.1.1",
-    "@types/keyboardjs": "2.5.1",
+    "@types/js-cookie": "3.0.5",
+    "@types/jsdom": "21.1.4",
+    "@types/keyboardjs": "2.5.2",
     "@types/libsodium-wrappers": "^0",
-    "@types/linkify-it": "3.0.2",
-    "@types/markdown-it": "12.2.3",
-    "@types/node": "^18.16.3",
-    "@types/open-graph": "0.2.2",
-    "@types/platform": "1.3.4",
-    "@types/prettier": "^2.7.3",
-    "@types/react": "18.0.28",
-    "@types/react-dom": "18.2.6",
-    "@types/react-redux": "7.1.25",
-    "@types/react-transition-group": "4.4.6",
-    "@types/redux-mock-store": "1.0.3",
+    "@types/linkify-it": "3.0.4",
+    "@types/loadable__component": "^5",
+    "@types/markdown-it": "13.0.4",
+    "@types/node": "^20.8.7",
+    "@types/open-graph": "0.2.4",
+    "@types/platform": "1.3.5",
+    "@types/react": "18.2.28",
+    "@types/react-dom": "18.2.14",
+    "@types/react-redux": "7.1.28",
+    "@types/react-transition-group": "4.4.8",
+    "@types/redux-mock-store": "1.0.5",
     "@types/seedrandom": "^3",
-    "@types/sinon": "10.0.15",
-    "@types/speakingurl": "13.0.3",
-    "@types/uint32": "0.2.0",
-    "@types/underscore": "1.11.5",
-    "@types/webpack-env": "1.18.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "@wireapp/copy-config": "2.1.1",
-    "@wireapp/eslint-config": "2.2.2",
-    "@wireapp/prettier-config": "0.6.0",
-    "@wireapp/store-engine": "^5.1.1",
+    "@types/sinon": "10.0.19",
+    "@types/speakingurl": "13.0.5",
+    "@types/underscore": "1.11.12",
+    "@types/webpack-env": "1.18.3",
+    "@wireapp/copy-config": "2.1.9",
+    "@wireapp/eslint-config": "3.0.4",
+    "@wireapp/prettier-config": "0.6.3",
+    "@wireapp/store-engine": "^5.1.4",
     "adm-zip": "0.5.10",
-    "archiver": "^5.3.1",
-    "autoprefixer": "^10.4.13",
-    "babel-loader": "9.1.2",
-    "babel-plugin-transform-import-meta": "^2.2.0",
-    "caniuse-lite": "^1.0.30001507",
+    "archiver": "^6.0.1",
+    "autoprefixer": "^10.4.16",
+    "babel-loader": "9.1.3",
+    "babel-plugin-transform-import-meta": "^2.2.1",
     "cross-env": "7.0.3",
-    "cspell": "6.31.1",
+    "cspell": "7.3.8",
     "css-loader": "^6.8.1",
-    "cssnano": "^5.1.14",
-    "dexie": "3.2.3",
+    "cssnano": "6.0.1",
+    "dexie": "3.2.4",
     "dotenv": "16.3.1",
-    "dpdm": "3.13.1",
-    "eslint": "^8.41.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-import-resolver-alias": "^1.1.2",
-    "eslint-import-resolver-typescript": "^3.5.5",
-    "eslint-plugin-babel": "5.3.1",
-    "eslint-plugin-better-styled-components": "^1.1.2",
-    "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jest": "^27.2.2",
-    "eslint-plugin-jest-dom": "^4.0.3",
-    "eslint-plugin-jsdoc": "^39.8.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-no-unsanitized": "^4.0.2",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.32.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-simple-import-sort": "^8.0.0",
-    "eslint-plugin-sort-keys-fix": "1.1.2",
-    "eslint-plugin-testing-library": "^5.11.0",
-    "eslint-plugin-typescript-sort-keys": "2.3.0",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "fake-indexeddb": "4.0.1",
+    "dpdm": "3.14.0",
+    "eslint": "^8.52.0",
+    "eslint-plugin-prettier": "^5.0.1",
+    "fake-indexeddb": "4.0.2",
     "generate-changelog": "1.8.0",
     "html-webpack-plugin": "^5.5.3",
-    "husky": "7.0.4",
-    "i18next-scanner": "4.2.0",
+    "husky": "8.0.3",
+    "i18next-scanner": "4.4.0",
     "intersection-observer": "0.12.2",
-    "jest": "29.5.0",
-    "jest-canvas-mock": "2.5.1",
-    "jest-environment-jsdom": "29.5.0",
-    "jest-jasmine2": "29.5.0",
+    "jest": "29.7.0",
+    "jest-canvas-mock": "2.5.2",
+    "jest-environment-jsdom": "29.7.0",
+    "jest-jasmine2": "29.7.0",
     "jsdom-worker": "0.3.0",
-    "less": "3.13.1",
+    "less": "4.2.0",
     "less-loader": "^11.1.3",
-    "lint-staged": "13.2.2",
-    "node-fetch": "2.6.11",
+    "lint-staged": "15.0.1",
+    "node-fetch": "2.7.0",
     "os-browserify": "0.3.0",
     "path-browserify": "1.0.1",
-    "postcss": "8.4.24",
+    "postcss": "8.4.31",
     "postcss-import": "^15.1.0",
     "postcss-less": "6.0.0",
     "postcss-loader": "^7.3.3",
-    "postcss-preset-env": "^8.5.1",
-    "postcss-scss": "4.0.6",
-    "prettier": "^2.8.8",
+    "postcss-preset-env": "^9.2.0",
+    "postcss-scss": "4.0.9",
+    "prettier": "^3.0.3",
     "raf": "3.4.1",
     "redux-devtools-extension": "2.13.9",
     "redux-mock-store": "1.5.4",
     "seedrandom": "^3.0.5",
-    "simple-git": "3.19.0",
-    "sinon": "15.2.0",
+    "simple-git": "3.20.0",
+    "sinon": "16.1.0",
     "snabbdom": "3.5.1",
     "style-loader": "^3.3.3",
-    "stylelint": "14.16.1",
+    "stylelint": "^15",
     "stylelint-config-idiomatic-order": "9.0.0",
     "stylelint-config-prettier": "9.0.5",
     "svg-inline-loader": "0.8.2",
@@ -175,12 +155,12 @@
     "text-encoding": "0.7.0",
     "ts-node": "10.9.1",
     "tsc-watch": "6.0.4",
-    "typescript": "5.0.4",
-    "webpack": "5.88.0",
+    "typescript": "5.2.2",
+    "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
     "webpack-dev-middleware": "6.1.1",
     "webpack-hot-middleware": "2.25.4",
-    "workbox-webpack-plugin": "6.6.1"
+    "workbox-webpack-plugin": "7.0.0"
   },
   "engines": {
     "yarn": ">= 1.0.0",
@@ -237,9 +217,7 @@
     "test:server": "cd server && yarn test",
     "test:types": "tsc --project tsconfig.build.json --noEmit && cd server && tsc --noEmit",
     "translate:extract": "i18next-scanner 'src/{page,script}/**/*.{js,html,htm}'",
-    "translate:merge": "formatjs extract --format './bin/translations_extract_formatter.js' --out-file './src/i18n/en-US.json' './src/script/strings.ts'",
-    "translate:upload": "yarn translate:merge && ts-node ./bin/translations_upload.ts",
-    "translate:download": "ts-node ./bin/translations_download.ts"
+    "translate:merge": "formatjs extract --format './bin/translations_extract_formatter.js' --out-file './src/i18n/en-US.json' './src/script/strings.ts'"
   },
   "resolutions": {
     "libsodium": "0.7.10",
diff --git a/server/Server.ts b/server/Server.ts
index 9a9257a92de..472ab5b71c0 100644
--- a/server/Server.ts
+++ b/server/Server.ts
@@ -38,12 +38,16 @@ import {GoogleWebmasterRoute} from './routes/googlewebmaster/GoogleWebmasterRout
 import {RedirectRoutes} from './routes/RedirectRoutes';
 import {Root} from './routes/Root';
 import * as BrowserUtil from './util/BrowserUtil';
+import {replaceHostnameInObject} from './util/hostnameReplacer';
 
 class Server {
   private readonly app: express.Express;
   private server?: http.Server | https.Server;
 
-  constructor(private readonly config: ServerConfig, private readonly clientConfig: ClientConfig) {
+  constructor(
+    private readonly config: ServerConfig,
+    private readonly clientConfig: ClientConfig,
+  ) {
     if (this.config.DEVELOPMENT) {
       console.info(this.config);
     } else if (!this.config.APP_BASE.startsWith('https')) {
@@ -66,7 +70,7 @@ class Server {
     this.initSiteMap(this.config);
     this.app.use(Root());
     this.app.use(HealthCheckRoute());
-    this.app.use(ConfigRoute(this.clientConfig));
+    this.app.use(ConfigRoute(this.config, this.clientConfig));
     this.app.use(GoogleWebmasterRoute(this.config));
     this.app.use(AppleAssociationRoute());
     this.app.use(NotFoundRoute());
@@ -133,12 +137,14 @@ class Server {
         preload: true,
       }),
     );
-    this.app.use(
+    this.app.use((req, res, next) => {
       helmet.contentSecurityPolicy({
-        directives: this.config.CSP,
+        directives: this.config.ENABLE_DYNAMIC_HOSTNAME
+          ? replaceHostnameInObject(this.config.CSP, req)
+          : this.config.CSP,
         reportOnly: false,
-      }),
-    );
+      })(req, res, next);
+    });
     this.app.use(
       helmet.referrerPolicy({
         policy: 'same-origin',
diff --git a/server/config/client.config.ts b/server/config/client.config.ts
index 4b927ba6d90..20da1143ccd 100644
--- a/server/config/client.config.ts
+++ b/server/config/client.config.ts
@@ -49,22 +49,29 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
       ENABLE_ACCOUNT_REGISTRATION_ACCEPT_TERMS_AND_PRIVACY_POLICY:
         env.FEATURE_ENABLE_ACCOUNT_REGISTRATION_ACCEPT_TERMS_AND_PRIVACY_POLICY == 'true',
       ENABLE_DEBUG: env.FEATURE_ENABLE_DEBUG == 'true',
+      ENABLE_PING_CONFIRMATION: env.FEATURE_ENABLE_PING_CONFIRMATION == 'true',
       ENABLE_DOMAIN_DISCOVERY: env.FEATURE_ENABLE_DOMAIN_DISCOVERY != 'false',
       ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY: env.FEATURE_ENABLE_ENFORCE_DESKTOP_APPLICATION_ONLY == 'true',
       ENABLE_EXTRA_CLIENT_ENTROPY: env.FEATURE_ENABLE_EXTRA_CLIENT_ENTROPY == 'true',
       ENABLE_MEDIA_EMBEDS: env.FEATURE_ENABLE_MEDIA_EMBEDS != 'false',
       ENABLE_MLS: env.FEATURE_ENABLE_MLS == 'true',
+      ENABLE_E2EI: env.FEATURE_ENABLE_MLS == 'true' && env.FEATURE_ENABLE_E2EI == 'true',
       ENABLE_PHONE_LOGIN: env.FEATURE_ENABLE_PHONE_LOGIN != 'false',
       ENABLE_PROTEUS_CORE_CRYPTO: env.FEATURE_ENABLE_PROTEUS_CORE_CRYPTO == 'true',
       ENABLE_SSO: env.FEATURE_ENABLE_SSO == 'true',
       ENFORCE_CONSTANT_BITRATE: env.FEATURE_ENFORCE_CONSTANT_BITRATE == 'true',
       FORCE_EXTRA_CLIENT_ENTROPY: env.FEATURE_FORCE_EXTRA_CLIENT_ENTROPY == 'true',
-      MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD:
-        env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD &&
-        Number(env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD),
+      MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD: env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD
+        ? Number(env.FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD)
+        : undefined,
+      MLS_CONFIG_DEFAULT_CIPHERSUITE: env.FEATURE_MLS_CONFIG_DEFAULT_CIPHERSUITE
+        ? Number(env.FEATURE_MLS_CONFIG_DEFAULT_CIPHERSUITE)
+        : undefined,
       PERSIST_TEMPORARY_CLIENTS: env.FEATURE_PERSIST_TEMPORARY_CLIENTS != 'false',
       SHOW_LOADING_INFORMATION: env.FEATURE_SHOW_LOADING_INFORMATION == 'true',
       USE_CORE_CRYPTO: env.FEATURE_USE_CORE_CRYPTO == 'true',
+      MAX_USERS_TO_PING_WITHOUT_ALERT:
+        (env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT && Number(env.FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT)) || 3,
     },
     MAX_GROUP_PARTICIPANTS: (env.MAX_GROUP_PARTICIPANTS && Number(env.MAX_GROUP_PARTICIPANTS)) || 500,
     MAX_VIDEO_PARTICIPANTS: (env.MAX_VIDEO_PARTICIPANTS && Number(env.MAX_VIDEO_PARTICIPANTS)) || 4,
@@ -89,7 +96,10 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
         PRIVACY_VERIFY_FINGERPRINT: env.URL_SUPPORT_PRIVACY_VERIFY_FINGERPRINT,
         SCREEN_ACCESS_DENIED: env.URL_SUPPORT_SCREEN_ACCESS_DENIED,
         LEARN_MORE_ABOUT_GUEST_LINKS: env.URL_LEARN_MORE_ABOUT_GUEST_LINKS,
+        NON_FEDERATING_INFO: env.URL_SUPPORT_NON_FEDERATING_INFO,
+        OAUTH_LEARN_MORE: env.URL_SUPPORT_OAUTH_LEARN_MORE,
         OFFLINE_BACKEND: env.URL_SUPPORT_OFFLINE_BACKEND,
+        FEDERATION_STOP: env.URL_SUPPORT_FEDERATION_STOP,
       },
       TEAMS_BASE: env.URL_TEAMS_BASE,
       TEAMS_CREATE: env.URL_TEAMS_CREATE,
diff --git a/server/config/env.ts b/server/config/env.ts
index 2c03a707388..c7eca3235b4 100644
--- a/server/config/env.ts
+++ b/server/config/env.ts
@@ -61,6 +61,9 @@ export type Env = {
   /** Specifies the name of the brand, e.g. Wire */
   BRAND_NAME: string;
 
+  /** enables replacing all occurences of {{hostname}} in the urls given to the frontend by the hostname of the client*/
+  ENABLE_DYNAMIC_HOSTNAME?: string;
+
   /** Allows a client to use a development version of the api (if present) */
   ENABLE_DEV_BACKEND_API?: string;
 
@@ -77,10 +80,15 @@ export type Env = {
   /** will enable the MLS protocol */
   FEATURE_ENABLE_MLS?: string;
 
+  /** will enable the E2E-Identification protocol, needs active FEATURE_ENABLE_MLS to work */
+  FEATURE_ENABLE_E2EI?: string;
+
   FEATURE_USE_CORE_CRYPTO?: string;
 
   FEATURE_MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD?: string;
 
+  FEATURE_MLS_CONFIG_DEFAULT_CIPHERSUITE?: string;
+
   FEATURE_ENABLE_PROTEUS_CORE_CRYPTO?: string;
 
   FEATURE_FORCE_EXTRA_CLIENT_ENTROPY?: string;
@@ -102,6 +110,15 @@ export type Env = {
   /** Feature toggle for debug utils. Can be set to true or false */
   FEATURE_ENABLE_DEBUG: string;
 
+  /** Feature to open a confirm modal before pinging large groups */
+  FEATURE_ENABLE_PING_CONFIRMATION: string;
+
+  /**
+   * Minimum amount of users required in a conversation to open confirm modal for ping
+   * Must be used with FEATURE_ENABLE_PING_CONFIRMATION
+   */
+  FEATURE_MAX_USERS_TO_PING_WITHOUT_ALERT: string;
+
   /** Feature toggle for domain discovery. Can be set to true or false */
   FEATURE_ENABLE_DOMAIN_DISCOVERY: string;
 
@@ -231,8 +248,14 @@ export type Env = {
 
   URL_LEARN_MORE_ABOUT_GUEST_LINKS: string;
 
+  URL_SUPPORT_NON_FEDERATING_INFO: string;
+
+  URL_SUPPORT_OAUTH_LEARN_MORE: string;
+
   URL_SUPPORT_OFFLINE_BACKEND: string;
 
+  URL_SUPPORT_FEDERATION_STOP: string;
+
   URL_WHATS_NEW: string;
 
   /** Content Security Policy
diff --git a/server/config/server.config.ts b/server/config/server.config.ts
index 1fc9f88c2ca..1bda4a7bf7a 100644
--- a/server/config/server.config.ts
+++ b/server/config/server.config.ts
@@ -107,6 +107,7 @@ export function generateConfig(params: ConfigGeneratorParams, env: Env) {
       IMAGE_URL: env.OPEN_GRAPH_IMAGE_URL,
       TITLE: env.OPEN_GRAPH_TITLE,
     },
+    ENABLE_DYNAMIC_HOSTNAME: env.ENABLE_DYNAMIC_HOSTNAME === 'true',
     PORT_HTTP: Number(env.PORT) || 21080,
     ROBOTS: {
       ALLOW: readFile(ROBOTS_ALLOW_FILE, 'User-agent: *\r\nDisallow: /'),
diff --git a/server/package.json b/server/package.json
index dd384894522..63ffac1379e 100644
--- a/server/package.json
+++ b/server/package.json
@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "dependencies": {
-    "@wireapp/commons": "5.1.0",
+    "@wireapp/commons": "5.2.1",
     "dotenv": "16.3.1",
     "dotenv-extended": "2.9.0",
     "express": "4.18.2",
@@ -13,26 +13,26 @@
     "fs-extra": "11.1.1",
     "geolite2": "1.3.0",
     "hbs": "4.2.0",
-    "helmet": "6.1.5",
-    "http-status-codes": "2.2.0",
+    "helmet": "7.0.0",
+    "http-status-codes": "2.3.0",
     "logdown": "3.3.1",
-    "maxmind": "4.3.9",
-    "nocache": "3.0.4",
+    "maxmind": "4.3.10",
+    "nocache": "4.0.0",
     "opn": "6.0.0",
     "pm2": "5.3.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.17",
-    "@types/express-sitemap-xml": "3.0.1",
-    "@types/express-useragent": "1.0.2",
-    "@types/fs-extra": "11.0.1",
+    "@types/express": "4.17.19",
+    "@types/express-sitemap-xml": "3.0.3",
+    "@types/express-useragent": "1.0.4",
+    "@types/fs-extra": "11.0.3",
     "@types/geolite2": "2.0.0",
-    "@types/hbs": "4.0.1",
-    "@types/jest": "^29.5.2",
+    "@types/hbs": "4.0.3",
+    "@types/jest": "^29.5.6",
     "@types/node": "18.11.18",
-    "jest": "29.5.0",
+    "jest": "29.7.0",
     "rimraf": "4.4.1",
-    "typescript": "5.1.3"
+    "typescript": "5.2.2"
   },
   "scripts": {
     "build": "yarn clean && tsc && yarn generate-version-file && yarn copy-assets",
diff --git a/server/routes/RedirectRoutes.ts b/server/routes/RedirectRoutes.ts
index 84e3d2596a3..0137f2982f2 100644
--- a/server/routes/RedirectRoutes.ts
+++ b/server/routes/RedirectRoutes.ts
@@ -60,4 +60,18 @@ export const RedirectRoutes = (config: ServerConfig, clientConfig: ClientConfig)
   router.get('/version/?', (_req, res) => {
     return res.json({version: config.VERSION});
   }),
+  /**
+   * This route is used by the OIDC Provider to redirect the user back to the client.
+   * The OIDC Provider will redirect the user to this route with a query string containing the necessary information for the client to complete the authentication.
+   */
+  router.get('/oidc?', (_req, res) => {
+    const {query} = _req;
+    const queryString = Object.keys(query)
+      .map(key => `${encodeURIComponent(key)}=${encodeURIComponent(query[key] as string)}`)
+      .join('&');
+    return res.redirect(
+      HTTP_STATUS.MOVED_TEMPORARILY,
+      `/auth/?${queryString ? queryString : 'no_query=true'}#/e2ei-redirect`,
+    );
+  }),
 ];
diff --git a/server/routes/config/ConfigRoute.ts b/server/routes/config/ConfigRoute.ts
index 0b330630e7b..710526fed73 100644
--- a/server/routes/config/ConfigRoute.ts
+++ b/server/routes/config/ConfigRoute.ts
@@ -19,10 +19,15 @@
 
 import {Router} from 'express';
 
-import {ClientConfig} from '../../config';
+import {ClientConfig, ServerConfig} from '../../config';
+import {replaceHostname} from '../../util/hostnameReplacer';
 
-export const ConfigRoute = (config: ClientConfig) =>
-  Router().get('/config.js', (_, res) => {
-    const payload = `window.wire = window.wire || {}; window.wire.env = ${JSON.stringify(config)};`;
+export const ConfigRoute = (serverConfig: ServerConfig, clientConfig: ClientConfig) =>
+  Router().get('/config.js', (request, res) => {
+    const serializedConfig = `window.wire = window.wire || {}; window.wire.env = ${JSON.stringify(clientConfig)};`;
+    const payload = serverConfig.ENABLE_DYNAMIC_HOSTNAME
+      ? // In case we want URLs that depends on the the hostname, we need to replace the placeholder with the actual hostname.
+        replaceHostname(serializedConfig, request)
+      : serializedConfig;
     res.type('application/javascript').send(payload);
   });
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 80ea7127d18..c29deee8dd4 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -5,7 +5,7 @@
     "module": "commonjs",
     "outDir": "dist",
     "removeComments": true,
-    "lib": ["esnext", "dom"],
+    "lib": ["esnext"],
     "downlevelIteration": true,
     "forceConsistentCasingInFileNames": true,
     "moduleResolution": "node",
diff --git a/server/util/BrowserUtil.ts b/server/util/BrowserUtil.ts
index 185b65c0ff1..fc05e8b6158 100644
--- a/server/util/BrowserUtil.ts
+++ b/server/util/BrowserUtil.ts
@@ -146,15 +146,20 @@ function isSupportedBrowser(userAgent: string): boolean {
   if (!parsedUserAgent) {
     return false;
   }
-  const invalidBrowser = parsedUserAgent.is.mobile || parsedUserAgent.is.franz;
+  const invalidBrowser = parsedUserAgent.is.franz;
   if (invalidBrowser) {
     return false;
   }
   const browserName = parsedUserAgent.browser.name.toLowerCase();
   const supportedBrowserVersionObject = CommonConfig.WEBAPP_SUPPORTED_BROWSERS[browserName];
   const supportedBrowserVersion = supportedBrowserVersionObject?.major;
+  const isSupportedMobile =
+    [CommonConfig.BROWSER.SAFARI, CommonConfig.BROWSER.CHROME].includes(browserName) && parsedUserAgent.is.mobile;
 
   try {
+    if (isSupportedMobile) {
+      return true;
+    }
     const browserVersionString = (parsedUserAgent.browser.version.split('.') || [])[0];
     const browserVersion = parseInt(browserVersionString, 10);
     return supportedBrowserVersion ? browserVersion >= supportedBrowserVersion : false;
diff --git a/src/script/error/ConnectionError.ts b/server/util/hostnameReplacer.ts
similarity index 63%
rename from src/script/error/ConnectionError.ts
rename to server/util/hostnameReplacer.ts
index 615bba71b34..cfe667ef8e2 100644
--- a/src/script/error/ConnectionError.ts
+++ b/server/util/hostnameReplacer.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,12 @@
  *
  */
 
-import {BaseError, BASE_ERROR_TYPE} from './BaseError';
+import {Request} from 'express';
 
-export class ConnectionError extends BaseError {
-  constructor(type: BASE_ERROR_TYPE | string, message: string) {
-    super(type, message);
-  }
-
-  static get MESSAGE(): Record<string, string> {
-    return {};
-  }
+export function replaceHostname(template: string, request: Request): string {
+  return template.replaceAll('[[hostname]]', request.hostname.replace('webapp.', ''));
+}
 
-  static get TYPE(): Record<string, string> {
-    return {};
-  }
+export function replaceHostnameInObject<T>(object: T, request: Request): T {
+  return JSON.parse(replaceHostname(JSON.stringify(object), request));
 }
diff --git a/server/yarn.lock b/server/yarn.lock
index 68639553f86..0d20d50b06e 100644
--- a/server/yarn.lock
+++ b/server/yarn.lock
@@ -5,206 +5,205 @@ __metadata:
   version: 6
   cacheKey: 8
 
-"@ampproject/remapping@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "@ampproject/remapping@npm:2.2.0"
+"@ampproject/remapping@npm:^2.2.0":
+  version: 2.2.1
+  resolution: "@ampproject/remapping@npm:2.2.1"
   dependencies:
-    "@jridgewell/gen-mapping": ^0.1.0
+    "@jridgewell/gen-mapping": ^0.3.0
     "@jridgewell/trace-mapping": ^0.3.9
-  checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292
+  checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/code-frame@npm:7.18.6"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13":
+  version: 7.22.13
+  resolution: "@babel/code-frame@npm:7.22.13"
   dependencies:
-    "@babel/highlight": ^7.18.6
-  checksum: 195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba
+    "@babel/highlight": ^7.22.13
+    chalk: ^2.4.2
+  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.20.5":
-  version: 7.20.14
-  resolution: "@babel/compat-data@npm:7.20.14"
-  checksum: 6c9efe36232094e4ad0b70d165587f21ca718e5d011f7a52a77a18502a7524e90e2855aa5a2e086395bcfd21bd2c7c99128dcd8d9fdffe94316b72acf5c66f2c
+"@babel/compat-data@npm:^7.22.9":
+  version: 7.23.2
+  resolution: "@babel/compat-data@npm:7.23.2"
+  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
   languageName: node
   linkType: hard
 
 "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3":
-  version: 7.20.12
-  resolution: "@babel/core@npm:7.20.12"
-  dependencies:
-    "@ampproject/remapping": ^2.1.0
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.20.7
-    "@babel/helper-compilation-targets": ^7.20.7
-    "@babel/helper-module-transforms": ^7.20.11
-    "@babel/helpers": ^7.20.7
-    "@babel/parser": ^7.20.7
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.12
-    "@babel/types": ^7.20.7
-    convert-source-map: ^1.7.0
+  version: 7.23.2
+  resolution: "@babel/core@npm:7.23.2"
+  dependencies:
+    "@ampproject/remapping": ^2.2.0
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helpers": ^7.23.2
+    "@babel/parser": ^7.23.0
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+    convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
-    json5: ^2.2.2
-    semver: ^6.3.0
-  checksum: 62e6c3e2149a70b5c9729ef5f0d3e2e97e9dcde89fc039c8d8e3463d5d7ba9b29ee84d10faf79b61532ac1645aa62f2bd42338320617e6e3a8a4d8e2a27076e7
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: 003897718ded16f3b75632d63cd49486bf67ff206cc7ebd1a10d49e2456f8d45740910d5ec7e42e3faf0deec7a2e96b1a02e766d19a67a8309053f0d4e57c0fe
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.20.7, @babel/generator@npm:^7.7.2":
-  version: 7.20.14
-  resolution: "@babel/generator@npm:7.20.14"
+"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.7.2":
+  version: 7.23.0
+  resolution: "@babel/generator@npm:7.23.0"
   dependencies:
-    "@babel/types": ^7.20.7
+    "@babel/types": ^7.23.0
     "@jridgewell/gen-mapping": ^0.3.2
+    "@jridgewell/trace-mapping": ^0.3.17
     jsesc: ^2.5.1
-  checksum: 5f6aa2d86af26e76d276923a5c34191124a119b16ee9ccc34aef654a7dec84fbd7d2daed2e6458a6a06bf87f3661deb77c9fea59b8f67faff5c90793c96d76d6
+  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/helper-compilation-targets@npm:7.20.7"
+"@babel/helper-compilation-targets@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
   dependencies:
-    "@babel/compat-data": ^7.20.5
-    "@babel/helper-validator-option": ^7.18.6
-    browserslist: ^4.21.3
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.15
+    browserslist: ^4.21.9
     lru-cache: ^5.1.1
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 8c32c873ba86e2e1805b30e0807abd07188acbe00ebb97576f0b09061cc65007f1312b589eccb4349c5a8c7f8bb9f2ab199d41da7030bf103d9f347dcd3a3cf4
+    semver: ^6.3.1
+  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-environment-visitor@npm:7.18.9"
-  checksum: b25101f6162ddca2d12da73942c08ad203d7668e06663df685634a8fde54a98bc015f6f62938e8554457a592a024108d45b8f3e651fd6dcdb877275b73cc4420
+"@babel/helper-environment-visitor@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
+  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.19.0":
-  version: 7.19.0
-  resolution: "@babel/helper-function-name@npm:7.19.0"
+"@babel/helper-function-name@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-function-name@npm:7.23.0"
   dependencies:
-    "@babel/template": ^7.18.10
-    "@babel/types": ^7.19.0
-  checksum: eac1f5db428ba546270c2b8d750c24eb528b8fcfe50c81de2e0bdebf0e20f24bec688d4331533b782e4a907fad435244621ca2193cfcf80a86731299840e0f6e
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.23.0
+  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-hoist-variables@npm:7.18.6"
+"@babel/helper-hoist-variables@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f
+    "@babel/types": ^7.22.5
+  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-module-imports@npm:7.18.6"
+"@babel/helper-module-imports@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-module-imports@npm:7.22.15"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def
+    "@babel/types": ^7.22.15
+  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.20.11":
-  version: 7.20.11
-  resolution: "@babel/helper-module-transforms@npm:7.20.11"
+"@babel/helper-module-transforms@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-module-transforms@npm:7.23.0"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-simple-access": ^7.20.2
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/helper-validator-identifier": ^7.19.1
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.10
-    "@babel/types": ^7.20.7
-  checksum: 29319ebafa693d48756c6ba0d871677bb0037e0da084fbe221a17c38d57093fc8aa38543c07d76e788266a937976e37ab4901971ca7f237c5ab45f524b9ecca0
+    "@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
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 6e2afffb058cf3f8ce92f5116f710dda4341c81cfcd872f9a0197ea594f7ce0ab3cb940b0590af2fe99e60d2e5448bfba6bca8156ed70a2ed4be2adc8586c891
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.8.0":
-  version: 7.20.2
-  resolution: "@babel/helper-plugin-utils@npm:7.20.2"
-  checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0":
+  version: 7.22.5
+  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
+  checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.20.2":
-  version: 7.20.2
-  resolution: "@babel/helper-simple-access@npm:7.20.2"
+"@babel/helper-simple-access@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-simple-access@npm:7.22.5"
   dependencies:
-    "@babel/types": ^7.20.2
-  checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1
+    "@babel/types": ^7.22.5
+  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.18.6"
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b
+    "@babel/types": ^7.22.5
+  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.19.4":
-  version: 7.19.4
-  resolution: "@babel/helper-string-parser@npm:7.19.4"
-  checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943
+"@babel/helper-string-parser@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-string-parser@npm:7.22.5"
+  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/helper-validator-identifier@npm:7.19.1"
-  checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
+"@babel/helper-validator-identifier@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
+  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-validator-option@npm:7.18.6"
-  checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf
+"@babel/helper-validator-option@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-validator-option@npm:7.22.15"
+  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.20.7":
-  version: 7.20.13
-  resolution: "@babel/helpers@npm:7.20.13"
+"@babel/helpers@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/helpers@npm:7.23.2"
   dependencies:
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.13
-    "@babel/types": ^7.20.7
-  checksum: d62076fa834f342798f8c3fd7aec0870cc1725d273d99e540cbaa8d6c3ed10258228dd14601c8e66bfeabbb9424c3b31090ecc467fe855f7bd72c4734df7fb09
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/highlight@npm:7.18.6"
+"@babel/highlight@npm:^7.22.13":
+  version: 7.22.20
+  resolution: "@babel/highlight@npm:7.22.20"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.18.6
-    chalk: ^2.0.0
+    "@babel/helper-validator-identifier": ^7.22.20
+    chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789
+  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.13, @babel/parser@npm:^7.20.7":
-  version: 7.20.13
-  resolution: "@babel/parser@npm:7.20.13"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/parser@npm:7.23.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 7eb2e3d9d9ad5e24b087c88d137f5701d94f049e28b9dce9f3f5c6d4d9b06a0d7c43b9106f1c02df8a204226200e0517de4bc81a339768a4ebd4c59107ea93a4
+  checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
   languageName: node
   linkType: hard
 
@@ -264,13 +263,13 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.18.6
-  resolution: "@babel/plugin-syntax-jsx@npm:7.18.6"
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6d37ea972970195f1ffe1a54745ce2ae456e0ac6145fae9aa1480f297248b262ea6ebb93010eddb86ebfacb94f57c05a1fc5d232b9a67325b09060299d515c67
+  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
   languageName: node
   linkType: hard
 
@@ -352,53 +351,53 @@ __metadata:
   linkType: hard
 
 "@babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.20.0
-  resolution: "@babel/plugin-syntax-typescript@npm:7.20.0"
+  version: 7.22.5
+  resolution: "@babel/plugin-syntax-typescript@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.19.0
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 6189c0b5c32ba3c9a80a42338bd50719d783b20ef29b853d4f03929e971913d3cefd80184e924ae98ad6db09080be8fe6f1ffde9a6db8972523234f0274d36f7
+  checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3":
-  version: 7.20.7
-  resolution: "@babel/template@npm:7.20.7"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
   dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-  checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e
+    "@babel/code-frame": ^7.22.13
+    "@babel/parser": ^7.22.15
+    "@babel/types": ^7.22.15
+  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.20.10, @babel/traverse@npm:^7.20.12, @babel/traverse@npm:^7.20.13, @babel/traverse@npm:^7.7.2":
-  version: 7.20.13
-  resolution: "@babel/traverse@npm:7.20.13"
+"@babel/traverse@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/traverse@npm:7.23.2"
   dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/generator": ^7.20.7
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.19.0
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.20.13
-    "@babel/types": ^7.20.7
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
+    "@babel/helper-hoist-variables": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.0
+    "@babel/types": ^7.23.0
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 30ca6e0bd18233fda48fa09315efd14dfc61dcf5b8fa3712b343bfc61b32bc63b5e85ea1773cc9576c9b293b96f46b4589aaeb0a52e1f3eeac4edc076d049fc7
+  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.6, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
-  version: 7.20.7
-  resolution: "@babel/types@npm:7.20.7"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3":
+  version: 7.23.0
+  resolution: "@babel/types@npm:7.23.0"
   dependencies:
-    "@babel/helper-string-parser": ^7.19.4
-    "@babel/helper-validator-identifier": ^7.19.1
+    "@babel/helper-string-parser": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.20
     to-fast-properties: ^2.0.0
-  checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811
+  checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
   languageName: node
   linkType: hard
 
@@ -409,10 +408,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  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"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
   languageName: node
   linkType: hard
 
@@ -436,50 +442,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/console@npm:29.5.0"
+"@jest/console@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/console@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
-    jest-message-util: ^29.5.0
-    jest-util: ^29.5.0
+    jest-message-util: ^29.7.0
+    jest-util: ^29.7.0
     slash: ^3.0.0
-  checksum: 9f4f4b8fabd1221361b7f2e92d4a90f5f8c2e2b29077249996ab3c8b7f765175ffee795368f8d6b5b2bb3adb32dc09319f7270c7c787b0d259e624e00e0f64a5
+  checksum: 0e3624e32c5a8e7361e889db70b170876401b7d70f509a2538c31d5cd50deb0c1ae4b92dc63fe18a0902e0a48c590c21d53787a0df41a52b34fa7cab96c384d6
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/core@npm:29.5.0"
+"@jest/core@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/core@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/reporters": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
-    jest-config: ^29.5.0
-    jest-haste-map: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-resolve-dependencies: ^29.5.0
-    jest-runner: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
-    jest-watcher: ^29.5.0
+    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.5.0
+    pretty-format: ^29.7.0
     slash: ^3.0.0
     strip-ansi: ^6.0.0
   peerDependencies:
@@ -487,86 +493,77 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 9e8f5243fe82d5a57f3971e1b96f320058df7c315328a3a827263f3b17f64be10c80f4a9c1b1773628b64d2de6d607c70b5b2d5bf13e7f5ad04223e9ef6aac06
+  checksum: af759c9781cfc914553320446ce4e47775ae42779e73621c438feb1e4231a5d4862f84b1d8565926f2d1aab29b3ec3dcfdc84db28608bdf5f29867124ebcfc0d
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/environment@npm:29.5.0"
+"@jest/environment@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/environment@npm:29.7.0"
   dependencies:
-    "@jest/fake-timers": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.5.0
-  checksum: 921de6325cd4817dec6685e5ff299b499b6379f3f9cf489b4b13588ee1f3820a0c77b49e6a087996b6de8f629f6f5251e636cba08d1bdb97d8071cc7d033c88a
+    jest-mock: ^29.7.0
+  checksum: 6fb398143b2543d4b9b8d1c6dbce83fa5247f84f550330604be744e24c2bd2178bb893657d62d1b97cf2f24baf85c450223f8237cccb71192c36a38ea2272934
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "@jest/expect-utils@npm:29.4.1"
+"@jest/expect-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect-utils@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.2.0
-  checksum: 865b4ee79d43e2457efb8ce3f58108f2fe141ce620350fe21d0baaf7e2f00b9b67f6e9c1c89760b1008c100e844fb03a6dda264418ed378243956904d9a88c69
+    jest-get-type: ^29.6.3
+  checksum: 75eb177f3d00b6331bcaa057e07c0ccb0733a1d0a1943e1d8db346779039cb7f103789f16e502f888a3096fb58c2300c38d1f3748b36a7fa762eb6f6d1b160ed
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/expect-utils@npm:29.5.0"
+"@jest/expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.4.3
-  checksum: c46fb677c88535cf83cf29f0a5b1f376c6a1109ddda266ad7da1a9cbc53cb441fa402dd61fc7b111ffc99603c11a9b3357ee41a1c0e035a58830bcb360871476
+    expect: ^29.7.0
+    jest-snapshot: ^29.7.0
+  checksum: a01cb85fd9401bab3370618f4b9013b90c93536562222d920e702a0b575d239d74cecfe98010aaec7ad464f67cf534a353d92d181646a4b792acaa7e912ae55e
   languageName: node
   linkType: hard
 
-"@jest/expect@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/expect@npm:29.5.0"
+"@jest/fake-timers@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/fake-timers@npm:29.7.0"
   dependencies:
-    expect: ^29.5.0
-    jest-snapshot: ^29.5.0
-  checksum: bd10e295111547e6339137107d83986ab48d46561525393834d7d2d8b2ae9d5626653f3f5e48e5c3fa742ac982e97bdf1f541b53b9e1d117a247b08e938527f6
-  languageName: node
-  linkType: hard
-
-"@jest/fake-timers@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/fake-timers@npm:29.5.0"
-  dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@sinonjs/fake-timers": ^10.0.2
     "@types/node": "*"
-    jest-message-util: ^29.5.0
-    jest-mock: ^29.5.0
-    jest-util: ^29.5.0
-  checksum: 69930c6922341f244151ec0d27640852ec96237f730fc024da1f53143d31b43cde75d92f9d8e5937981cdce3b31416abc3a7090a0d22c2377512c4a6613244ee
+    jest-message-util: ^29.7.0
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
+  checksum: caf2bbd11f71c9241b458d1b5a66cbe95debc5a15d96442444b5d5c7ba774f523c76627c6931cca5e10e76f0d08761f6f1f01a608898f4751a0eee54fc3d8d00
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/globals@npm:29.5.0"
+"@jest/globals@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/globals@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/expect": ^29.5.0
-    "@jest/types": ^29.5.0
-    jest-mock: ^29.5.0
-  checksum: b309ab8f21b571a7c672608682e84bbdd3d2b554ddf81e4e32617fec0a69094a290ab42e3c8b2c66ba891882bfb1b8b2736720ea1285b3ad646d55c2abefedd9
+    "@jest/environment": ^29.7.0
+    "@jest/expect": ^29.7.0
+    "@jest/types": ^29.6.3
+    jest-mock: ^29.7.0
+  checksum: 97dbb9459135693ad3a422e65ca1c250f03d82b2a77f6207e7fa0edd2c9d2015fbe4346f3dc9ebff1678b9d8da74754d4d440b7837497f8927059c0642a22123
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/reporters@npm:29.5.0"
+"@jest/reporters@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/reporters@npm:29.7.0"
   dependencies:
     "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
-    "@jridgewell/trace-mapping": ^0.3.15
+    "@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
@@ -574,13 +571,13 @@ __metadata:
     glob: ^7.1.3
     graceful-fs: ^4.2.9
     istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^5.1.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.5.0
-    jest-util: ^29.5.0
-    jest-worker: ^29.5.0
+    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
@@ -590,183 +587,139 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 481268aac9a4a75cc49c4df1273d6b111808dec815e9d009dad717c32383ebb0cebac76e820ad1ab44e207540e1c2fe1e640d44c4f262de92ab1933e057fdeeb
+  checksum: 7eadabd62cc344f629024b8a268ecc8367dba756152b761bdcb7b7e570a3864fc51b2a9810cd310d85e0a0173ef002ba4528d5ea0329fbf66ee2a3ada9c40455
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.4.0":
-  version: 29.4.0
-  resolution: "@jest/schemas@npm:29.4.0"
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
-    "@sinclair/typebox": ^0.25.16
-  checksum: 005c90b7b641af029133fa390c0c8a75b63edf651da6253d7c472a8f15ddd18aa139edcd4236e57f974006e39c67217925768115484dbd7bfed2eba224de8b7d
+    "@sinclair/typebox": ^0.27.8
+  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "@jest/schemas@npm:29.4.3"
+"@jest/source-map@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/source-map@npm:29.6.3"
   dependencies:
-    "@sinclair/typebox": ^0.25.16
-  checksum: ac754e245c19dc39e10ebd41dce09040214c96a4cd8efa143b82148e383e45128f24599195ab4f01433adae4ccfbe2db6574c90db2862ccd8551a86704b5bebd
-  languageName: node
-  linkType: hard
-
-"@jest/source-map@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "@jest/source-map@npm:29.4.3"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.15
+    "@jridgewell/trace-mapping": ^0.3.18
     callsites: ^3.0.0
     graceful-fs: ^4.2.9
-  checksum: 2301d225145f8123540c0be073f35a80fd26a2f5e59550fd68525d8cea580fb896d12bf65106591ffb7366a8a19790076dbebc70e0f5e6ceb51f81827ed1f89c
+  checksum: bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/test-result@npm:29.5.0"
+"@jest/test-result@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-result@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/console": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/istanbul-lib-coverage": ^2.0.0
     collect-v8-coverage: ^1.0.0
-  checksum: 2e8ff5242227ab960c520c3ea0f6544c595cc1c42fa3873c158e9f4f685f4ec9670ec08a4af94ae3885c0005a43550a9595191ffbc27a0965df27d9d98bbf901
+  checksum: 67b6317d526e335212e5da0e768e3b8ab8a53df110361b80761353ad23b6aea4432b7c5665bdeb87658ea373b90fb1afe02ed3611ef6c858c7fba377505057fa
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/test-sequencer@npm:29.5.0"
+"@jest/test-sequencer@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-sequencer@npm:29.7.0"
   dependencies:
-    "@jest/test-result": ^29.5.0
+    "@jest/test-result": ^29.7.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.5.0
+    jest-haste-map: ^29.7.0
     slash: ^3.0.0
-  checksum: eca34b4aeb2fda6dfb7f9f4b064c858a7adf64ec5c6091b6f4ed9d3c19549177cbadcf1c615c4c182688fa1cf085c8c55c3ca6eea40719a34554b0bf071d842e
+  checksum: 73f43599017946be85c0b6357993b038f875b796e2f0950487a82f4ebcb115fa12131932dd9904026b4ad8be131fe6e28bd8d0aa93b1563705185f9804bff8bd
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/transform@npm:29.5.0"
+"@jest/transform@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/transform@npm:29.7.0"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/types": ^29.5.0
-    "@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.5.0
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.5.0
+    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.2
-  checksum: d55d604085c157cf5112e165ff5ac1fa788873b3b31265fb4734ca59892ee24e44119964cc47eb6d178dd9512bbb6c576d1e20e51a201ff4e24d31e818a1c92d
+  checksum: 0f8ac9f413903b3cb6d240102db848f2a354f63971ab885833799a9964999dd51c388162106a807f810071f864302cdd8e3f0c241c29ce02d85a36f18f3f40ab
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "@jest/types@npm:29.4.1"
+"@jest/types@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/types@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.4.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
-  checksum: 0aa0b6a210b3474289e5dcaa8e7abb2238dba8d0baf2eb5a3f080fb95e9a39e71e8abc96811d4ef7011f5d993755bb54515e9d827d7ebc2a2d4d9579d84f5a04
+  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/types@npm:29.5.0"
-  dependencies:
-    "@jest/schemas": ^29.4.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
-  checksum: 1811f94b19cf8a9460a289c4f056796cfc373480e0492692a6125a553cd1a63824bd846d7bb78820b7b6f758f6dd3c2d4558293bb676d541b2fa59c70fdf9d39
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "@jridgewell/gen-mapping@npm:0.1.1"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.0
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
+"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
+  version: 0.3.3
+  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
   dependencies:
     "@jridgewell/set-array": ^1.0.1
     "@jridgewell/sourcemap-codec": ^1.4.10
     "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882
+  checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:3.1.0":
-  version: 3.1.0
-  resolution: "@jridgewell/resolve-uri@npm:3.1.0"
-  checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267
+"@jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
+  checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1":
+"@jridgewell/set-array@npm:^1.0.1":
   version: 1.1.2
   resolution: "@jridgewell/set-array@npm:1.1.2"
   checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10":
-  version: 1.4.14
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
-  checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.17
-  resolution: "@jridgewell/trace-mapping@npm:0.3.17"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.19
+  resolution: "@jridgewell/trace-mapping@npm:0.3.19"
   dependencies:
-    "@jridgewell/resolve-uri": 3.1.0
-    "@jridgewell/sourcemap-codec": 1.4.14
-  checksum: 9d703b859cff5cd83b7308fd457a431387db5db96bd781a63bf48e183418dd9d3d44e76b9e4ae13237f6abeeb25d739ec9215c1d5bfdd08f66f750a50074a339
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 956a6f0f6fec060fb48c6bf1f5ec2064e13cd38c8be3873877d4b92b4a27ba58289a34071752671262a3e3c202abcc3fa2aac64d8447b4b0fa1ba3c9047f1c20
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
   dependencies:
-    "@gar/promisify": ^1.1.3
     semver: ^7.3.5
-  checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225
-  languageName: node
-  linkType: hard
-
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
-  dependencies:
-    mkdirp: ^1.0.4
-    rimraf: ^3.0.2
-  checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
+  checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e
   languageName: node
   linkType: hard
 
@@ -806,9 +759,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
+  languageName: node
+  linkType: hard
+
 "@pm2/agent@npm:~2.0.0":
-  version: 2.0.1
-  resolution: "@pm2/agent@npm:2.0.1"
+  version: 2.0.3
+  resolution: "@pm2/agent@npm:2.0.3"
   dependencies:
     async: ~3.2.0
     chalk: ~3.0.0
@@ -820,16 +780,16 @@ __metadata:
     nssocket: 0.6.0
     pm2-axon: ~4.0.1
     pm2-axon-rpc: ~0.7.0
-    proxy-agent: ~5.0.0
-    semver: ~7.2.0
+    proxy-agent: ~6.3.0
+    semver: ~7.5.0
     ws: ~7.4.0
-  checksum: d15e1ccec8e25bd020eabf2a59e0d2896082414b7950e918a1a19485ef1001012d7df6063fb720f453d9a2cd887abc80d576f985d2c28c127a7c1a16b95aee65
+  checksum: 59a102665c5bf6e66338bb36fc7b41de4f1056397ca09691ce20fdae272728f4fb71232b1b4a707843fad3d54e86741e02b32dc9acc2f53b9d975642b3d7305c
   languageName: node
   linkType: hard
 
 "@pm2/io@npm:~5.0.0":
-  version: 5.0.0
-  resolution: "@pm2/io@npm:5.0.0"
+  version: 5.0.2
+  resolution: "@pm2/io@npm:5.0.2"
   dependencies:
     "@opencensus/core": 0.0.9
     "@opencensus/propagation-b3": 0.0.8
@@ -837,11 +797,11 @@ __metadata:
     debug: ~4.3.1
     eventemitter2: ^6.3.1
     require-in-the-middle: ^5.0.0
-    semver: 6.3.0
+    semver: ~7.5.4
     shimmer: ^1.2.0
     signal-exit: ^3.0.3
     tslib: 1.9.3
-  checksum: f912096e823003de941a539d1098243cdc39b896704dea176e75a1d4fb0e0573b552c0a30e5198c2415fee9e1d8365ce0a8e78257eb85a8bfb994f1fb8153af1
+  checksum: 54e4cf462a00f86d5d3a201dee72490a253896e732dee6ce0282c55ef59d088974d7f5665f586d9f2ef35c099f5bf345fdd39a099c61c88877d215da2ce345ac
   languageName: node
   linkType: hard
 
@@ -867,35 +827,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.25.16":
-  version: 0.25.21
-  resolution: "@sinclair/typebox@npm:0.25.21"
-  checksum: 763af1163fe4eabee9b914d4e4548a39fbba3287d2b3b1ff043c1da3c5a321e99d50a3ca94eb182988131e00b006a6f019799cde8da2f61e2f118b30b0276a00
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
   languageName: node
   linkType: hard
 
-"@sinonjs/commons@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sinonjs/commons@npm:2.0.0"
+"@sinonjs/commons@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@sinonjs/commons@npm:3.0.0"
   dependencies:
     type-detect: 4.0.8
-  checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
+  checksum: b4b5b73d4df4560fb8c0c7b38c7ad4aeabedd362f3373859d804c988c725889cde33550e4bcc7cd316a30f5152a2d1d43db71b6d0c38f5feef71fd8d016763f8
   languageName: node
   linkType: hard
 
 "@sinonjs/fake-timers@npm:^10.0.2":
-  version: 10.0.2
-  resolution: "@sinonjs/fake-timers@npm:10.0.2"
+  version: 10.3.0
+  resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
-    "@sinonjs/commons": ^2.0.0
-  checksum: c62aa98e7cefda8dedc101ce227abc888dc46b8ff9706c5f0a8dfd9c3ada97d0a5611384738d9ba0b26b59f99c2ba24efece8e779bb08329e9e87358fa309824
-  languageName: node
-  linkType: hard
-
-"@tootallnate/once@npm:1":
-  version: 1.1.2
-  resolution: "@tootallnate/once@npm:1.1.2"
-  checksum: e1fb1bbbc12089a0cb9433dc290f97bddd062deadb6178ce9bcb93bb7c1aecde5e60184bc7065aec42fe1663622a213493c48bbd4972d931aae48315f18e1be9
+    "@sinonjs/commons": ^3.0.0
+  checksum: 614d30cb4d5201550c940945d44c9e0b6d64a888ff2cd5b357f95ad6721070d6b8839cd10e15b76bf5e14af0bcc1d8f9ec00d49a46318f1f669a4bec1d7f3148
   languageName: node
   linkType: hard
 
@@ -906,126 +859,122 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tootallnate/quickjs-emscripten@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0"
+  checksum: c350a2947ffb80b22e14ff35099fd582d1340d65723384a0fd0515e905e2534459ad2f301a43279a37308a27c99273c932e64649abd57d0bb3ca8c557150eccc
+  languageName: node
+  linkType: hard
+
 "@types/babel__core@npm:^7.1.14":
-  version: 7.20.0
-  resolution: "@types/babel__core@npm:7.20.0"
+  version: 7.20.2
+  resolution: "@types/babel__core@npm:7.20.2"
   dependencies:
     "@babel/parser": ^7.20.7
     "@babel/types": ^7.20.7
     "@types/babel__generator": "*"
     "@types/babel__template": "*"
     "@types/babel__traverse": "*"
-  checksum: 49b601a0a7637f1f387442c8156bd086cfd10ff4b82b0e1994e73a6396643b5435366fb33d6b604eade8467cca594ef97adcbc412aede90bb112ebe88d0ad6df
+  checksum: 564fbaa8ff1305d50807ada0ec227c3e7528bebb2f8fe6b2ed88db0735a31511a74ad18729679c43eeed8025ed29d408f53059289719e95ab1352ed559a100bd
   languageName: node
   linkType: hard
 
 "@types/babel__generator@npm:*":
-  version: 7.6.4
-  resolution: "@types/babel__generator@npm:7.6.4"
+  version: 7.6.5
+  resolution: "@types/babel__generator@npm:7.6.5"
   dependencies:
     "@babel/types": ^7.0.0
-  checksum: 20effbbb5f8a3a0211e95959d06ae70c097fb6191011b73b38fe86deebefad8e09ee014605e0fd3cdaedc73d158be555866810e9166e1f09e4cfd880b874dcb0
+  checksum: c7459f5025c4c800eaf58f4db3b24e9d736331fe7df40961d9bc49f31b46e2a3be83dc9276e8688f10a5ed752ae153ad5f1bdd45e2245bac95273730b9115ec2
   languageName: node
   linkType: hard
 
 "@types/babel__template@npm:*":
-  version: 7.4.1
-  resolution: "@types/babel__template@npm:7.4.1"
+  version: 7.4.2
+  resolution: "@types/babel__template@npm:7.4.2"
   dependencies:
     "@babel/parser": ^7.1.0
     "@babel/types": ^7.0.0
-  checksum: 649fe8b42c2876be1fd28c6ed9b276f78152d5904ec290b6c861d9ef324206e0a5c242e8305c421ac52ecf6358fa7e32ab7a692f55370484825c1df29b1596ee
+  checksum: 0fe977b45a3269336c77f3ae4641a6c48abf0fa35ab1a23fb571690786af02d6cec08255a43499b0b25c5633800f7ae882ace450cce905e3060fa9e6995047ae
   languageName: node
   linkType: hard
 
 "@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
-  version: 7.18.3
-  resolution: "@types/babel__traverse@npm:7.18.3"
+  version: 7.20.2
+  resolution: "@types/babel__traverse@npm:7.20.2"
   dependencies:
-    "@babel/types": ^7.3.0
-  checksum: d20953338b2f012ab7750932ece0a78e7d1645b0a6ff42d49be90f55e9998085da1374a9786a7da252df89555c6586695ba4d1d4b4e88ab2b9f306bcd35e00d3
+    "@babel/types": ^7.20.7
+  checksum: 981340286479524436348d32373eaa3bf993c635cbf70307b4b69463eee83406a959ac4844f683911e0db8ab8d9f0025ab630dc7a8c170fee9ee74144c2a528f
   languageName: node
   linkType: hard
 
 "@types/body-parser@npm:*":
-  version: 1.19.2
-  resolution: "@types/body-parser@npm:1.19.2"
+  version: 1.19.3
+  resolution: "@types/body-parser@npm:1.19.3"
   dependencies:
     "@types/connect": "*"
     "@types/node": "*"
-  checksum: e17840c7d747a549f00aebe72c89313d09fbc4b632b949b2470c5cb3b1cb73863901ae84d9335b567a79ec5efcfb8a28ff8e3f36bc8748a9686756b6d5681f40
+  checksum: 932fa71437c275023799123680ef26ffd90efd37f51a1abe405e6ae6e5b4ad9511b7a3a8f5a12877ed1444a02b6286c0a137a98e914b3c61932390c83643cc2c
   languageName: node
   linkType: hard
 
 "@types/connect@npm:*":
-  version: 3.4.35
-  resolution: "@types/connect@npm:3.4.35"
+  version: 3.4.36
+  resolution: "@types/connect@npm:3.4.36"
   dependencies:
     "@types/node": "*"
-  checksum: fe81351470f2d3165e8b12ce33542eef89ea893e36dd62e8f7d72566dfb7e448376ae962f9f3ea888547ce8b55a40020ca0e01d637fab5d99567673084542641
+  checksum: 4dee3d966fb527b98f0cbbdcf6977c9193fc3204ed539b7522fe5e64dfa45f9017bdda4ffb1f760062262fce7701a0ee1c2f6ce2e50af36c74d4e37052303172
   languageName: node
   linkType: hard
 
-"@types/express-serve-static-core@npm:^4.17.31, @types/express-serve-static-core@npm:^4.17.33":
-  version: 4.17.33
-  resolution: "@types/express-serve-static-core@npm:4.17.33"
+"@types/express-serve-static-core@npm:^4.17.33":
+  version: 4.17.37
+  resolution: "@types/express-serve-static-core@npm:4.17.37"
   dependencies:
     "@types/node": "*"
     "@types/qs": "*"
     "@types/range-parser": "*"
-  checksum: dce580d16b85f207445af9d4053d66942b27d0c72e86153089fa00feee3e96ae336b7bedb31ed4eea9e553c99d6dd356ed6e0928f135375d9f862a1a8015adf2
+    "@types/send": "*"
+  checksum: 2dab1380e45eb44e56ecc1be1c42c4b897364d2f2a08e03ca28fbcb1e6866e390217385435813711c046f9acd684424d088855dc32825d5cbecf72c60ecd037f
   languageName: node
   linkType: hard
 
-"@types/express-sitemap-xml@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@types/express-sitemap-xml@npm:3.0.1"
+"@types/express-sitemap-xml@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@types/express-sitemap-xml@npm:3.0.3"
   dependencies:
     "@types/express": "*"
-  checksum: 1beed154166a5d844c478d0647d50f865c57c77ebd0c3348221e32916919f4fe2170226e859ca959fe1c0467fdd6b2c95932cb0fed2794aa4cb4a35d346f8dc3
+  checksum: d6d20da77364589fe7d43160227becb89c8920ce411bf06505f9c97473a022e39d504ff67ab896eb8fe449d5f703129938e61593fe1accb554edf4667114b454
   languageName: node
   linkType: hard
 
-"@types/express-useragent@npm:1.0.2":
-  version: 1.0.2
-  resolution: "@types/express-useragent@npm:1.0.2"
+"@types/express-useragent@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@types/express-useragent@npm:1.0.4"
   dependencies:
     "@types/express": "*"
-  checksum: b3a7d6b79eee94fc6b999c2b3cfbe5cd898a4041dea77bb2b2a84851eb37ad198fe146a08e4df64d256be477b2b02f75cb705847ffd8d2fd56e00683c02809df
-  languageName: node
-  linkType: hard
-
-"@types/express@npm:*":
-  version: 4.17.16
-  resolution: "@types/express@npm:4.17.16"
-  dependencies:
-    "@types/body-parser": "*"
-    "@types/express-serve-static-core": ^4.17.31
-    "@types/qs": "*"
-    "@types/serve-static": "*"
-  checksum: 43f3ed2cea6e5e83c7c1098c5152f644e975fd764443717ff9c812a1518416a9e7e9f824ffe852c118888cbfb994ed023cad08331f49b19ced469bb185cdd5cd
+  checksum: 20019a130237d3a1063b9265bd997d45722e282ca63c8c362fe55f53a77f9670698be8db1335300574cc9a78c80b4e9212aaec2aebdb0981a8c338b2dbcb0b7c
   languageName: node
   linkType: hard
 
-"@types/express@npm:4.17.17":
-  version: 4.17.17
-  resolution: "@types/express@npm:4.17.17"
+"@types/express@npm:*, @types/express@npm:4.17.19":
+  version: 4.17.19
+  resolution: "@types/express@npm:4.17.19"
   dependencies:
     "@types/body-parser": "*"
     "@types/express-serve-static-core": ^4.17.33
     "@types/qs": "*"
     "@types/serve-static": "*"
-  checksum: 0196dacc275ac3ce89d7364885cb08e7fb61f53ca101f65886dbf1daf9b7eb05c0943e2e4bbd01b0cc5e50f37e0eea7e4cbe97d0304094411ac73e1b7998f4da
+  checksum: 3d39d0655eb0825d96fec100985a38737767ddd6da2dbda1e330a3adf36c98a9b7cd8d9539db32876d1fbb47a09343cad7b38c30c8dd7c291271fcb9b85cb21b
   languageName: node
   linkType: hard
 
-"@types/fs-extra@npm:11.0.1":
-  version: 11.0.1
-  resolution: "@types/fs-extra@npm:11.0.1"
+"@types/fs-extra@npm:11.0.3":
+  version: 11.0.3
+  resolution: "@types/fs-extra@npm:11.0.3"
   dependencies:
     "@types/jsonfile": "*"
     "@types/node": "*"
-  checksum: 3e930346e5d84f419deb8ced1c582beef8cb20d0bd8a0eb145a37d75bab0572a1895f0e48a0d681d386b3a58b9a992b2d2acecc464bcaec2548f53ea00718651
+  checksum: f196bc216906e7016a6c9c549dbe204fe7e1e87515c7e961f741309e25f8e2f8c268dba3dbf0ca7f3ddab5911d39888472f8624ac0c11a461f1b2d05377e38fa
   languageName: node
   linkType: hard
 
@@ -1037,20 +986,27 @@ __metadata:
   linkType: hard
 
 "@types/graceful-fs@npm:^4.1.3":
-  version: 4.1.6
-  resolution: "@types/graceful-fs@npm:4.1.6"
+  version: 4.1.7
+  resolution: "@types/graceful-fs@npm:4.1.7"
   dependencies:
     "@types/node": "*"
-  checksum: c3070ccdc9ca0f40df747bced1c96c71a61992d6f7c767e8fd24bb6a3c2de26e8b84135ede000b7e79db530a23e7e88dcd9db60eee6395d0f4ce1dae91369dd4
+  checksum: 8b97e208f85c9efd02a6003a582c77646dd87be0af13aec9419a720771560a8a87a979eaca73ae193d7c73127f34d0a958403a9b5d6246e450289fd8c79adf09
   languageName: node
   linkType: hard
 
-"@types/hbs@npm:4.0.1":
-  version: 4.0.1
-  resolution: "@types/hbs@npm:4.0.1"
+"@types/hbs@npm:4.0.3":
+  version: 4.0.3
+  resolution: "@types/hbs@npm:4.0.3"
   dependencies:
     handlebars: ^4.1.0
-  checksum: 28eae02b0a4133b0864096a59ca7e4573bcacebd9a0412c56428d06fe6ed42aa041d0cc57124551aecb841e08533ca3bdca7998d13cf44ba98ffdf32bff67fa5
+  checksum: a3e6e70894154d289da2d7af0b893ab677882a52b4322433d14c8af914eb845b75f16bae820c080e4143a68702e123a13877453f11fc08a63f079bce67ecdc1c
+  languageName: node
+  linkType: hard
+
+"@types/http-errors@npm:*":
+  version: 2.0.2
+  resolution: "@types/http-errors@npm:2.0.2"
+  checksum: d7f14045240ac4b563725130942b8e5c8080bfabc724c8ff3f166ea928ff7ae02c5194763bc8f6aaf21897e8a44049b0492493b9de3e058247e58fdfe0f86692
   languageName: node
   linkType: hard
 
@@ -1062,84 +1018,104 @@ __metadata:
   linkType: hard
 
 "@types/istanbul-lib-report@npm:*":
-  version: 3.0.0
-  resolution: "@types/istanbul-lib-report@npm:3.0.0"
+  version: 3.0.1
+  resolution: "@types/istanbul-lib-report@npm:3.0.1"
   dependencies:
     "@types/istanbul-lib-coverage": "*"
-  checksum: 656398b62dc288e1b5226f8880af98087233cdb90100655c989a09f3052b5775bf98ba58a16c5ae642fb66c61aba402e07a9f2bff1d1569e3b306026c59f3f36
+  checksum: cfc66de48577bb7b2636a6afded7056483693c3ea70916276518cdfaa0d4b51bf564ded88fb13e75716665c3af3d4d54e9c2de042c0219dcabad7e81c398688b
   languageName: node
   linkType: hard
 
 "@types/istanbul-reports@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "@types/istanbul-reports@npm:3.0.1"
+  version: 3.0.2
+  resolution: "@types/istanbul-reports@npm:3.0.2"
   dependencies:
     "@types/istanbul-lib-report": "*"
-  checksum: f1ad54bc68f37f60b30c7915886b92f86b847033e597f9b34f2415acdbe5ed742fa559a0a40050d74cdba3b6a63c342cac1f3a64dba5b68b66a6941f4abd7903
+  checksum: f52028d6fe4d28f0085dd7ed66ccfa6af632579e9a4091b90928ffef93d4dbec0bacd49e9caf1b939d05df9eafc5ac1f5939413cdf8ac59fbe4b29602d4d0939
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.2":
-  version: 29.5.2
-  resolution: "@types/jest@npm:29.5.2"
+"@types/jest@npm:^29.5.6":
+  version: 29.5.6
+  resolution: "@types/jest@npm:29.5.6"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: 7d205599ea3cccc262bad5cc173d3242d6bf8138c99458509230e4ecef07a52d6ddcde5a1dbd49ace655c0af51d2dbadef3748697292ea4d86da19d9e03e19c0
+  checksum: fa13a27bd1c8efd0381a419478769d0d6d3a8e93e1952d7ac3a16274e8440af6f73ed6f96ac1ff00761198badf2ee226b5ab5583a5d87a78d609ea78da5c5a24
   languageName: node
   linkType: hard
 
 "@types/jsonfile@npm:*":
-  version: 6.1.1
-  resolution: "@types/jsonfile@npm:6.1.1"
+  version: 6.1.2
+  resolution: "@types/jsonfile@npm:6.1.2"
   dependencies:
     "@types/node": "*"
-  checksum: 0f8fe0a9221a00e8413cffba723dfe16553868724b830237256fb0052ecd5cac96498189d1235a001cfa815f352008261c9ceb373f0aa58227f891e0c7a12c4d
+  checksum: 3e020944de09e54ef7c4200dfbbedba76da417a58c712611ff9d30921e214dfabbe81dadd4d6608647a3ee8900d445407d7336dd991b8fe6df4249320ad4a1b4
   languageName: node
   linkType: hard
 
 "@types/mime@npm:*":
-  version: 3.0.1
-  resolution: "@types/mime@npm:3.0.1"
-  checksum: 4040fac73fd0cea2460e29b348c1a6173da747f3a87da0dbce80dd7a9355a3d0e51d6d9a401654f3e5550620e3718b5a899b2ec1debf18424e298a2c605346e7
+  version: 3.0.2
+  resolution: "@types/mime@npm:3.0.2"
+  checksum: 09cf74f6377d1b27f4a24512cb689ad30af59880ac473ed6f7bc5285ecde88bbe8fe500789340ad57810da9d6fe1704f86e8bfe147b9ea76d58925204a60b906
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:18.11.18":
+"@types/mime@npm:^1":
+  version: 1.3.3
+  resolution: "@types/mime@npm:1.3.3"
+  checksum: 7e27dede6517c1d604821a8a5412d6b7131decc8397ad4bac9216fc90dea26c9571426623ebeea2a9b89dbfb89ad98f7370a3c62cd2be8896c6e897333b117c9
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:*":
+  version: 20.8.6
+  resolution: "@types/node@npm:20.8.6"
+  dependencies:
+    undici-types: ~5.25.1
+  checksum: ccfb7ac482c5a96edeb239893c5c099f5257fcc2ed9ae62fefdfbc782b79e16dbc2af9a85b379665237bf759904b44ca2be68e75d239e0297882aad42f61905c
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:18.11.18":
   version: 18.11.18
   resolution: "@types/node@npm:18.11.18"
   checksum: 03f17f9480f8d775c8a72da5ea7e9383db5f6d85aa5fefde90dd953a1449bd5e4ffde376f139da4f3744b4c83942166d2a7603969a6f8ea826edfb16e6e3b49d
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2.1.5":
-  version: 2.7.2
-  resolution: "@types/prettier@npm:2.7.2"
-  checksum: b47d76a5252265f8d25dd2fe2a5a61dc43ba0e6a96ffdd00c594cb4fd74c1982c2e346497e3472805d97915407a09423804cc2110a0b8e1b22cffcab246479b7
+"@types/qs@npm:*":
+  version: 6.9.8
+  resolution: "@types/qs@npm:6.9.8"
+  checksum: c28e07d00d07970e5134c6eed184a0189b8a4649e28fdf36d9117fe671c067a44820890de6bdecef18217647a95e9c6aebdaaae69f5fe4b0bec9345db885f77e
   languageName: node
   linkType: hard
 
-"@types/qs@npm:*":
-  version: 6.9.7
-  resolution: "@types/qs@npm:6.9.7"
-  checksum: 7fd6f9c25053e9b5bb6bc9f9f76c1d89e6c04f7707a7ba0e44cc01f17ef5284adb82f230f542c2d5557d69407c9a40f0f3515e8319afd14e1e16b5543ac6cdba
+"@types/range-parser@npm:*":
+  version: 1.2.5
+  resolution: "@types/range-parser@npm:1.2.5"
+  checksum: db9aaa04a02d019395a9a4346475669a2864a32a6477ad0fc457bd2ef39a167cabe742f55a8a3fa8bc90abac795b716c22b37348bc3e19313ebe6c9310815233
   languageName: node
   linkType: hard
 
-"@types/range-parser@npm:*":
-  version: 1.2.4
-  resolution: "@types/range-parser@npm:1.2.4"
-  checksum: b7c0dfd5080a989d6c8bb0b6750fc0933d9acabeb476da6fe71d8bdf1ab65e37c136169d84148034802f48378ab94e3c37bb4ef7656b2bec2cb9c0f8d4146a95
+"@types/send@npm:*":
+  version: 0.17.2
+  resolution: "@types/send@npm:0.17.2"
+  dependencies:
+    "@types/mime": ^1
+    "@types/node": "*"
+  checksum: 1ff5b1bd6a4f6fdc6402c7024781ff5dbd0e1f51a43c69529fb67c710943c7416d2f0d77c57c70fccf6616f25f838f32f960284526e408d4edae2e91e1fce95a
   languageName: node
   linkType: hard
 
 "@types/serve-static@npm:*":
-  version: 1.15.0
-  resolution: "@types/serve-static@npm:1.15.0"
+  version: 1.15.3
+  resolution: "@types/serve-static@npm:1.15.3"
   dependencies:
+    "@types/http-errors": "*"
     "@types/mime": "*"
     "@types/node": "*"
-  checksum: b6ac93d471fb0f53ddcac1f9b67572a09cd62806f7db5855244b28f6f421139626f24799392566e97d1ffc61b12f9de7f30380c39fcae3c8a161fe161d44edf2
+  checksum: afa52252f0ba94cdb5391e80f23e17fd629bdf2a31be8876e2c4490312ed6b0570822dd7de7cea04c9002049e207709563568b7f4ee10bb9f456321db1e83e40
   languageName: node
   linkType: hard
 
@@ -1151,30 +1127,30 @@ __metadata:
   linkType: hard
 
 "@types/yargs-parser@npm:*":
-  version: 21.0.0
-  resolution: "@types/yargs-parser@npm:21.0.0"
-  checksum: b2f4c8d12ac18a567440379909127cf2cec393daffb73f246d0a25df36ea983b93b7e9e824251f959e9f928cbc7c1aab6728d0a0ff15d6145f66cec2be67d9a2
+  version: 21.0.1
+  resolution: "@types/yargs-parser@npm:21.0.1"
+  checksum: 64e6316c2045e2d460c4fb79572f872f9d2f98fddc6d9d3949c71f0b6ad0ef8a2706cf49db26dfb02a9cb81433abb8f340f015e1d20a9692279abe9477b72c8e
   languageName: node
   linkType: hard
 
 "@types/yargs@npm:^17.0.8":
-  version: 17.0.20
-  resolution: "@types/yargs@npm:17.0.20"
+  version: 17.0.28
+  resolution: "@types/yargs@npm:17.0.28"
   dependencies:
     "@types/yargs-parser": "*"
-  checksum: dc2edbb0e4b6bfe5189b86c057bb6991139af02372b1d3591083e4ce8f9605b19d598e56413e30f41453733f7a048f732f899cb637f3938f90ed3eb13f23cc90
+  checksum: f78c5e5c29903933c0557b4ffcd1d0b8564d66859c8ca4aa51da3714e49109ed7c2644334a1918d033df19028f4cecc91fd2e502651bb8e8451f246c371da847
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:5.1.0":
-  version: 5.1.0
-  resolution: "@wireapp/commons@npm:5.1.0"
+"@wireapp/commons@npm:5.2.1":
+  version: 5.2.1
+  resolution: "@wireapp/commons@npm:5.2.1"
   dependencies:
     ansi-regex: 5.0.1
     fs-extra: 11.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: 1abb97ff5ab0f0cf0b9882997f71929170abb7e0d4b5d1cd0bff3821b94e38aaddcebf9fb410493601d3595a843b86582c81e5036e567997be011741c6e0ec28
+  checksum: 1510b705a40d45ceaf07b12b5a199d94fe977d3b2faaafc298ff167a65b820471f5863f9f93f27d2003f9f44ee3401423d6e12bb38ecd7808f8b2fc72821d411
   languageName: node
   linkType: hard
 
@@ -1195,23 +1171,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "acorn-walk@npm:8.2.0"
-  checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.7.0":
-  version: 8.8.2
-  resolution: "acorn@npm:8.8.2"
-  bin:
-    acorn: bin/acorn
-  checksum: f790b99a1bf63ef160c967e23c46feea7787e531292bb827126334612c234ed489a0dc2c7ba33156416f0ffa8d25bf2b0fdb7f35c2ba60eb3e960572bece4001
-  languageName: node
-  linkType: hard
-
-"agent-base@npm:6, agent-base@npm:^6.0.0, agent-base@npm:^6.0.2":
+"agent-base@npm:6, agent-base@npm:^6.0.2":
   version: 6.0.2
   resolution: "agent-base@npm:6.0.2"
   dependencies:
@@ -1220,14 +1180,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "agent-base@npm:7.1.0"
+  dependencies:
+    debug: ^4.3.4
+  checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
+  languageName: node
+  linkType: hard
+
 "agentkeepalive@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "agentkeepalive@npm:4.2.1"
+  version: 4.5.0
+  resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
-    debug: ^4.1.0
-    depd: ^1.1.2
     humanize-ms: ^1.2.1
-  checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18
+  checksum: 13278cd5b125e51eddd5079f04d6fe0914ac1b8b91c1f3db2c1822f99ac1a7457869068997784342fe455d59daaff22e14fb7b8c3da4e741896e7e31faf92481
   languageName: node
   linkType: hard
 
@@ -1280,6 +1247,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-regex@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "ansi-regex@npm:6.0.1"
+  checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169
+  languageName: node
+  linkType: hard
+
 "ansi-styles@npm:^3.2.1":
   version: 3.2.1
   resolution: "ansi-styles@npm:3.2.1"
@@ -1305,6 +1279,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
+  languageName: node
+  linkType: hard
+
 "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
   version: 3.1.3
   resolution: "anymatch@npm:3.1.3"
@@ -1348,7 +1329,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ast-types@npm:^0.13.2":
+"ast-types@npm:^0.13.4":
   version: 0.13.4
   resolution: "ast-types@npm:0.13.4"
   dependencies:
@@ -1401,20 +1382,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-jest@npm:29.5.0"
+"babel-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "babel-jest@npm:29.7.0"
   dependencies:
-    "@jest/transform": ^29.5.0
+    "@jest/transform": ^29.7.0
     "@types/babel__core": ^7.1.14
     babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^29.5.0
+    babel-preset-jest: ^29.6.3
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     slash: ^3.0.0
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: eafb6d37deb71f0c80bf3c80215aa46732153e5e8bcd73f6ff47d92e5c0c98c8f7f75995d0efec6289c371edad3693cd8fa2367b0661c4deb71a3a7117267ede
+  checksum: ee6f8e0495afee07cac5e4ee167be705c711a8cc8a737e05a587a131fdae2b3c8f9aa55dfd4d9c03009ac2d27f2de63d8ba96d3e8460da4d00e8af19ef9a83f7
   languageName: node
   linkType: hard
 
@@ -1431,15 +1412,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-plugin-jest-hoist@npm:29.5.0"
+"babel-plugin-jest-hoist@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-plugin-jest-hoist@npm:29.6.3"
   dependencies:
     "@babel/template": ^7.3.3
     "@babel/types": ^7.3.3
     "@types/babel__core": ^7.1.14
     "@types/babel__traverse": ^7.0.6
-  checksum: 099b5254073b6bc985b6d2d045ad26fb8ed30ff8ae6404c4fe8ee7cd0e98a820f69e3dfb871c7c65aae0f4b65af77046244c07bb92d49ef9005c90eedf681539
+  checksum: 51250f22815a7318f17214a9d44650ba89551e6d4f47a2dc259128428324b52f5a73979d010cefd921fd5a720d8c1d55ad74ff601cd94c7bd44d5f6292fde2d1
   languageName: node
   linkType: hard
 
@@ -1465,15 +1446,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-preset-jest@npm:29.5.0"
+"babel-preset-jest@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-preset-jest@npm:29.6.3"
   dependencies:
-    babel-plugin-jest-hoist: ^29.5.0
+    babel-plugin-jest-hoist: ^29.6.3
     babel-preset-current-node-syntax: ^1.0.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad
+  checksum: aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb
   languageName: node
   linkType: hard
 
@@ -1484,6 +1465,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"basic-ftp@npm:^5.0.2":
+  version: 5.0.3
+  resolution: "basic-ftp@npm:5.0.3"
+  checksum: 8b04e88eb85a64de9311721bb0707c9cd70453eefdd854cab85438e6f46fb6c597ddad57ed1acf0a9ede3c677b14e657f51051688a5f23d6f3ea7b5d9073b850
+  languageName: node
+  linkType: hard
+
 "binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
@@ -1555,17 +1543,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.21.3":
-  version: 4.21.4
-  resolution: "browserslist@npm:4.21.4"
+"browserslist@npm:^4.21.9":
+  version: 4.22.1
+  resolution: "browserslist@npm:4.22.1"
   dependencies:
-    caniuse-lite: ^1.0.30001400
-    electron-to-chromium: ^1.4.251
-    node-releases: ^2.0.6
-    update-browserslist-db: ^1.0.9
+    caniuse-lite: ^1.0.30001541
+    electron-to-chromium: ^1.4.535
+    node-releases: ^2.0.13
+    update-browserslist-db: ^1.0.13
   bin:
     browserslist: cli.js
-  checksum: 4af3793704dbb4615bcd29059ab472344dc7961c8680aa6c4bb84f05340e14038d06a5aead58724eae69455b8fade8b8c69f1638016e87e5578969d74c078b79
+  checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862
   languageName: node
   linkType: hard
 
@@ -1592,29 +1580,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
+"cacache@npm:^17.0.0":
+  version: 17.1.4
+  resolution: "cacache@npm:17.1.4"
   dependencies:
-    "@npmcli/fs": ^2.1.0
-    "@npmcli/move-file": ^2.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    glob: ^8.0.1
-    infer-owner: ^1.0.4
+    "@npmcli/fs": ^3.1.0
+    fs-minipass: ^3.0.0
+    glob: ^10.2.2
     lru-cache: ^7.7.1
-    minipass: ^3.1.6
+    minipass: ^7.0.3
     minipass-collect: ^1.0.2
     minipass-flush: ^1.0.5
     minipass-pipeline: ^1.2.4
-    mkdirp: ^1.0.4
     p-map: ^4.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
+    ssri: ^10.0.0
     tar: ^6.1.11
-    unique-filename: ^2.0.0
-  checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6
+    unique-filename: ^3.0.0
+  checksum: b7751df756656954a51201335addced8f63fc53266fa56392c9f5ae83c8d27debffb4458ac2d168a744a4517ec3f2163af05c20097f93d17bdc2dc8a385e14a6
   languageName: node
   linkType: hard
 
@@ -1649,10 +1631,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.30001400":
-  version: 1.0.30001449
-  resolution: "caniuse-lite@npm:1.0.30001449"
-  checksum: f1b395f0a5495c1931c53f58441e0db79b8b0f8ef72bb6d241d13c49b05827630efe6793d540610e0a014d8fdda330dd42f981c82951bd4bdcf635480e1a0102
+"caniuse-lite@npm:^1.0.30001541":
+  version: 1.0.30001549
+  resolution: "caniuse-lite@npm:1.0.30001549"
+  checksum: 7f2abeedc8cf8b92cc0613855d71b995ce436068c0bcdd798c5af7d297ccf9f52496b00181beda42d82d25079dd4b6e389c67486156d40d8854e5707a25cb054
   languageName: node
   linkType: hard
 
@@ -1666,7 +1648,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.0, chalk@npm:^2.3.0":
+"chalk@npm:^2.3.0, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -1728,16 +1710,16 @@ __metadata:
   linkType: hard
 
 "ci-info@npm:^3.2.0":
-  version: 3.7.1
-  resolution: "ci-info@npm:3.7.1"
-  checksum: 72d93d5101ea1c186511277fbd8d06ae8a6e028cc2fb94361e92bf735b39c5ebd192e8d15a66ff8c4e3ed569f87c2f844e96f90e141b2de5c649f77ec34ff601
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 6b19dc9b2966d1f8c2041a838217299718f15d6c4b63ae36e4674edd2bee48f780e94761286a56aa59eb305a85fbea4ddffb7630ec063e7ec7e7e5ad42549a87
   languageName: node
   linkType: hard
 
 "cjs-module-lexer@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "cjs-module-lexer@npm:1.2.2"
-  checksum: 977f3f042bd4f08e368c890d91eecfbc4f91da0bc009a3c557bc4dfbf32022ad1141244ac1178d44de70fc9f3dea7add7cd9a658a34b9fae98a55d8f92331ce5
+  version: 1.2.3
+  resolution: "cjs-module-lexer@npm:1.2.3"
+  checksum: 5ea3cb867a9bb609b6d476cd86590d105f3cfd6514db38ff71f63992ab40939c2feb68967faa15a6d2b1f90daa6416b79ea2de486e9e2485a6f8b66a21b4fb0a
   languageName: node
   linkType: hard
 
@@ -1776,9 +1758,9 @@ __metadata:
   linkType: hard
 
 "collect-v8-coverage@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "collect-v8-coverage@npm:1.0.1"
-  checksum: 4efe0a1fccd517b65478a2364b33dadd0a43fc92a56f59aaece9b6186fe5177b2de471253587de7c91516f07c7268c2f6770b6cbcffc0e0ece353b766ec87e55
+  version: 1.0.2
+  resolution: "collect-v8-coverage@npm:1.0.2"
+  checksum: c10f41c39ab84629d16f9f6137bc8a63d332244383fc368caf2d2052b5e04c20cd1fd70f66fcf4e2422b84c8226598b776d39d5f2d2a51867cc1ed5d1982b4da
   languageName: node
   linkType: hard
 
@@ -1870,13 +1852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
-  version: 1.9.0
-  resolution: "convert-source-map@npm:1.9.0"
-  checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8
-  languageName: node
-  linkType: hard
-
 "convert-source-map@npm:^2.0.0":
   version: 2.0.0
   resolution: "convert-source-map@npm:2.0.0"
@@ -1898,10 +1873,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-util-is@npm:~1.0.0":
-  version: 1.0.3
-  resolution: "core-util-is@npm:1.0.3"
-  checksum: 9de8597363a8e9b9952491ebe18167e3b36e7707569eed0ebf14f8bba773611376466ae34575bca8cfe3c767890c859c74056084738f09d4e4a6f902b2ad7d99
+"create-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "create-jest@npm:29.7.0"
+  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
+  bin:
+    create-jest: bin/create-jest.js
+  checksum: 1427d49458adcd88547ef6fa39041e1fe9033a661293aa8d2c3aa1b4967cb5bf4f0c00436c7a61816558f28ba2ba81a94d5c962e8022ea9a883978fc8e1f2945
   languageName: node
   linkType: hard
 
@@ -1912,7 +1897,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.3":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
   dependencies:
@@ -1930,17 +1915,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-uri-to-buffer@npm:3":
-  version: 3.0.1
-  resolution: "data-uri-to-buffer@npm:3.0.1"
-  checksum: c59c3009686a78c071806b72f4810856ec28222f0f4e252aa495ec027ed9732298ceea99c50328cf59b151dd34cbc3ad6150bbb43e41fc56fa19f48c99e9fc30
+"data-uri-to-buffer@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "data-uri-to-buffer@npm:6.0.1"
+  checksum: 9140e68c585ae33d950f5943bd476751346c8b789ae80b01a578a33cb8f7f706d1ca7378aff2b1878b2a6d9a8c88c55cc286d88191c8b8ead8255c3c4d934530
   languageName: node
   linkType: hard
 
 "dayjs@npm:~1.11.5":
-  version: 1.11.7
-  resolution: "dayjs@npm:1.11.7"
-  checksum: 5003a7c1dd9ed51385beb658231c3548700b82d3548c0cfbe549d85f2d08e90e972510282b7506941452c58d32136d6362f009c77ca55381a09c704e9f177ebb
+  version: 1.11.10
+  resolution: "dayjs@npm:1.11.10"
+  checksum: a6b5a3813b8884f5cd557e2e6b7fa569f4c5d0c97aca9558e38534af4f2d60daafd3ff8c2000fed3435cfcec9e805bcebd99f90130c6d1c5ef524084ced588c4
   languageName: node
   linkType: hard
 
@@ -1960,7 +1945,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3, debug@npm:~4.3.1":
+"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:~4.3.1":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -1981,36 +1966,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dedent@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "dedent@npm:0.7.0"
-  checksum: 87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
-  languageName: node
-  linkType: hard
-
-"deep-is@npm:~0.1.3":
-  version: 0.1.4
-  resolution: "deep-is@npm:0.1.4"
-  checksum: edb65dd0d7d1b9c40b2f50219aef30e116cedd6fc79290e740972c132c09106d2e80aa0bc8826673dd5a00222d4179c84b36a790eef63a4c4bca75a37ef90804
+"dedent@npm:^1.0.0":
+  version: 1.5.1
+  resolution: "dedent@npm:1.5.1"
+  peerDependencies:
+    babel-plugin-macros: ^3.1.0
+  peerDependenciesMeta:
+    babel-plugin-macros:
+      optional: true
+  checksum: c3c300a14edf1bdf5a873f9e4b22e839d62490bc5c8d6169c1f15858a1a76733d06a9a56930e963d677a2ceeca4b6b0894cc5ea2f501aa382ca5b92af3413c2a
   languageName: node
   linkType: hard
 
 "deepmerge@npm:^4.2.2":
-  version: 4.3.0
-  resolution: "deepmerge@npm:4.3.0"
-  checksum: c7980eb5c5be040b371f1df0d566473875cfabed9f672ccc177b81ba8eee5686ce2478de2f1d0076391621cbe729e5eacda397179a59ef0f68901849647db126
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052
   languageName: node
   linkType: hard
 
-"degenerator@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "degenerator@npm:3.0.2"
+"degenerator@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "degenerator@npm:5.0.1"
   dependencies:
-    ast-types: ^0.13.2
-    escodegen: ^1.8.1
-    esprima: ^4.0.0
-    vm2: ^3.9.8
-  checksum: 6a8fffe1ddde692931a1d74c0636d9e6963f2aa16748d4b95f4833cdcbe8df571e5c127e4f1d625a4c340cc60f5a969ac9e5aa14baecfb6f69b85638e180cd97
+    ast-types: ^0.13.4
+    escodegen: ^2.1.0
+    esprima: ^4.0.1
+  checksum: a64fa39cdf6c2edd75188157d32338ee9de7193d7dbb2aeb4acb1eb30fa4a15ed80ba8dae9bd4d7b085472cf174a5baf81adb761aaa8e326771392c922084152
   languageName: node
   linkType: hard
 
@@ -2028,13 +2010,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"depd@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
-  languageName: node
-  linkType: hard
-
 "destroy@npm:1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
@@ -2049,17 +2024,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.3.1":
-  version: 29.3.1
-  resolution: "diff-sequences@npm:29.3.1"
-  checksum: 8edab8c383355022e470779a099852d595dd856f9f5bd7af24f177e74138a668932268b4c4fd54096eed643861575c3652d4ecbbb1a9d710488286aed3ffa443
-  languageName: node
-  linkType: hard
-
-"diff-sequences@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "diff-sequences@npm:29.4.3"
-  checksum: 28b265e04fdddcf7f9f814effe102cc95a9dec0564a579b5aed140edb24fc345c611ca52d76d725a3cab55d3888b915b5e8a4702e0f6058968a90fa5f41fcde7
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa
   languageName: node
   linkType: hard
 
@@ -2091,6 +2059,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eastasianwidth@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "eastasianwidth@npm:0.2.0"
+  checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed
+  languageName: node
+  linkType: hard
+
 "ee-first@npm:1.1.1":
   version: 1.1.1
   resolution: "ee-first@npm:1.1.1"
@@ -2098,10 +2073,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.251":
-  version: 1.4.284
-  resolution: "electron-to-chromium@npm:1.4.284"
-  checksum: be496e9dca6509dbdbb54dc32146fc99f8eb716d28a7ee8ccd3eba0066561df36fc51418d8bd7cf5a5891810bf56c0def3418e74248f51ea4a843d423603d10a
+"electron-to-chromium@npm:^1.4.535":
+  version: 1.4.554
+  resolution: "electron-to-chromium@npm:1.4.554"
+  checksum: cbac43c50b43777327f4a7bf149ee3088c1da8b91bbcd80f78d2cc77bc52763f6d0941574499239d9caefd3430d3093f865e5f1093371418f7d6b70301eeae9b
   languageName: node
   linkType: hard
 
@@ -2128,6 +2103,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"emoji-regex@npm:^9.2.2":
+  version: 9.2.2
+  resolution: "emoji-regex@npm:9.2.2"
+  checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601
+  languageName: node
+  linkType: hard
+
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
@@ -2211,14 +2193,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^1.8.1":
-  version: 1.14.3
-  resolution: "escodegen@npm:1.14.3"
+"escodegen@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
   dependencies:
     esprima: ^4.0.1
-    estraverse: ^4.2.0
+    estraverse: ^5.2.0
     esutils: ^2.0.2
-    optionator: ^0.8.1
     source-map: ~0.6.1
   dependenciesMeta:
     source-map:
@@ -2226,7 +2207,7 @@ __metadata:
   bin:
     escodegen: bin/escodegen.js
     esgenerate: bin/esgenerate.js
-  checksum: 381cdc4767ecdb221206bbbab021b467bbc2a6f5c9a99c9e6353040080bdd3dfe73d7604ad89a47aca6ea7d58bc635f6bd3fbc8da9a1998e9ddfa8372362ccd0
+  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
   languageName: node
   linkType: hard
 
@@ -2240,10 +2221,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estraverse@npm:^4.2.0":
-  version: 4.3.0
-  resolution: "estraverse@npm:4.3.0"
-  checksum: a6299491f9940bb246124a8d44b7b7a413a8336f5436f9837aaa9330209bd9ee8af7e91a654a3545aee9c54b3308e78ee360cef1d777d37cfef77d2fa33b5827
+"estraverse@npm:^5.2.0":
+  version: 5.3.0
+  resolution: "estraverse@npm:5.3.0"
+  checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
   languageName: node
   linkType: hard
 
@@ -2306,29 +2287,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expect@npm:^29.0.0":
-  version: 29.4.1
-  resolution: "expect@npm:29.4.1"
+"expect@npm:^29.0.0, expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "expect@npm:29.7.0"
   dependencies:
-    "@jest/expect-utils": ^29.4.1
-    jest-get-type: ^29.2.0
-    jest-matcher-utils: ^29.4.1
-    jest-message-util: ^29.4.1
-    jest-util: ^29.4.1
-  checksum: 5918f69371557bbceb01bc163cd0ac03e8cbbc5de761892a9c27ef17a1f9e94dc91edd8298b4eaca18b71ba4a9d521c74b072f0a46950b13d6b61123b0431836
+    "@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
+  checksum: 9257f10288e149b81254a0fda8ffe8d54a7061cd61d7515779998b012579d2b8c22354b0eb901daf0145f347403da582f75f359f4810c007182ad3fb318b5c0c
   languageName: node
   linkType: hard
 
-"expect@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "expect@npm:29.5.0"
-  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
-  checksum: 58f70b38693df6e5c6892db1bcd050f0e518d6f785175dc53917d4fa6a7359a048e5690e19ddcb96b65c4493881dd89a3dabdab1a84dfa55c10cdbdabf37b2d7
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48
   languageName: node
   linkType: hard
 
@@ -2402,13 +2377,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-levenshtein@npm:~2.0.6":
-  version: 2.0.6
-  resolution: "fast-levenshtein@npm:2.0.6"
-  checksum: 92cfec0a8dfafd9c7a15fba8f2cc29cd0b62b85f056d99ce448bbcd9f708e18ab2764bda4dd5158364f4145a7c72788538994f0d1787b956ef0d1062b0f7c24c
-  languageName: node
-  linkType: hard
-
 "fb-watchman@npm:^2.0.0":
   version: 2.0.2
   resolution: "fb-watchman@npm:2.0.2"
@@ -2425,13 +2393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"file-uri-to-path@npm:2":
-  version: 2.0.0
-  resolution: "file-uri-to-path@npm:2.0.0"
-  checksum: 4a71a99ddaa6ae7ae7bffe2948c34da59982ed465d930a0af9cb59fcc10fcd93366cc356ec3337c18373fde5df7ac52afda4558f155febd1799d135552207edb
-  languageName: node
-  linkType: hard
-
 "fill-range@npm:^7.0.1":
   version: 7.0.1
   resolution: "fill-range@npm:7.0.1"
@@ -2467,12 +2428,12 @@ __metadata:
   linkType: hard
 
 "follow-redirects@npm:^1.14.0":
-  version: 1.15.2
-  resolution: "follow-redirects@npm:1.15.2"
+  version: 1.15.3
+  resolution: "follow-redirects@npm:1.15.3"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190
+  checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
   languageName: node
   linkType: hard
 
@@ -2483,6 +2444,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
+  dependencies:
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
+  languageName: node
+  linkType: hard
+
 "forwarded@npm:0.2.0":
   version: 0.2.0
   resolution: "forwarded@npm:0.2.0"
@@ -2530,7 +2501,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+"fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
@@ -2539,6 +2510,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: ^7.0.3
+  checksum: 8722a41109130851d979222d3ec88aabaceeaaf8f57b2a8f744ef8bd2d1ce95453b04a61daa0078822bc5cd21e008814f06fe6586f56fef511e71b8d2394d802
+  languageName: node
+  linkType: hard
+
 "fs.realpath@npm:^1.0.0":
   version: 1.0.0
   resolution: "fs.realpath@npm:1.0.0"
@@ -2547,38 +2527,28 @@ __metadata:
   linkType: hard
 
 "fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
   conditions: os=darwin
   languageName: node
   linkType: hard
 
 "fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=18f3a7"
   dependencies:
     node-gyp: latest
   conditions: os=darwin
   languageName: node
   linkType: hard
 
-"ftp@npm:^0.3.10":
-  version: 0.3.10
-  resolution: "ftp@npm:0.3.10"
-  dependencies:
-    readable-stream: 1.1.x
-    xregexp: 2.0.0
-  checksum: ddd313c1d44eb7429f3a7d77a0155dc8fe86a4c64dca58f395632333ce4b4e74c61413c6e0ef66ea3f3d32d905952fbb6d028c7117d522f793eb1fa282e17357
-  languageName: node
-  linkType: hard
-
 "function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
   languageName: node
   linkType: hard
 
@@ -2629,13 +2599,14 @@ __metadata:
   linkType: hard
 
 "get-intrinsic@npm:^1.0.2":
-  version: 1.2.0
-  resolution: "get-intrinsic@npm:1.2.0"
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 78fc0487b783f5c58cf2dccafc3ae656ee8d2d8062a8831ce4a95e7057af4587a1d4882246c033aca0a7b4965276f4802b45cc300338d1b77a73d3e3e3f4877d
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
   languageName: node
   linkType: hard
 
@@ -2653,17 +2624,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-uri@npm:3":
-  version: 3.0.2
-  resolution: "get-uri@npm:3.0.2"
+"get-uri@npm:^6.0.1":
+  version: 6.0.2
+  resolution: "get-uri@npm:6.0.2"
   dependencies:
-    "@tootallnate/once": 1
-    data-uri-to-buffer: 3
-    debug: 4
-    file-uri-to-path: 2
+    basic-ftp: ^5.0.2
+    data-uri-to-buffer: ^6.0.0
+    debug: ^4.3.4
     fs-extra: ^8.1.0
-    ftp: ^0.3.10
-  checksum: 5325b2906b08ca37529ca421cf52bc50376e75c6a945e0a8064e3f76b4bb67b8ab1e316a2fc7a307c8c606ab36d030720f39a57c97b027ff1134335e12102946
+  checksum: 762de3b0e3d4e7afc966e4ce93be587d70c270590da9b4c8fbff888362656c055838d926903d1774cbfeed4d392b4d6def4b2c06d48c050580070426a3a8629b
   languageName: node
   linkType: hard
 
@@ -2690,6 +2659,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^10.2.2":
+  version: 10.3.10
+  resolution: "glob@npm:10.3.10"
+  dependencies:
+    foreground-child: ^3.1.0
+    jackspeak: ^2.3.5
+    minimatch: ^9.0.1
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+    path-scurry: ^1.10.1
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
+  languageName: node
+  linkType: hard
+
 "glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4":
   version: 7.2.3
   resolution: "glob@npm:7.2.3"
@@ -2704,28 +2688,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.1":
-  version: 8.1.0
-  resolution: "glob@npm:8.1.0"
-  dependencies:
-    fs.realpath: ^1.0.0
-    inflight: ^1.0.4
-    inherits: 2
-    minimatch: ^5.0.1
-    once: ^1.3.0
-  checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47
-  languageName: node
-  linkType: hard
-
 "glob@npm:^9.2.0":
-  version: 9.2.1
-  resolution: "glob@npm:9.2.1"
+  version: 9.3.5
+  resolution: "glob@npm:9.3.5"
   dependencies:
     fs.realpath: ^1.0.0
-    minimatch: ^7.4.1
+    minimatch: ^8.0.2
     minipass: ^4.2.4
     path-scurry: ^1.6.1
-  checksum: ef9b1c32491e6b532bdd0d2abcc3c9f48e83446609e11285869156982fc5a756dfbaa6f59f797712343bd1e22500ac15708692806633653fde4ef67c85e2aab7
+  checksum: 94b093adbc591bc36b582f77927d1fb0dbf3ccc231828512b017601408be98d1fe798fc8c0b19c6f2d1a7660339c3502ce698de475e9d938ccbb69b47b647c84
   languageName: node
   linkType: hard
 
@@ -2737,13 +2708,13 @@ __metadata:
   linkType: hard
 
 "graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
   languageName: node
   linkType: hard
 
-"handlebars@npm:4.7.7, handlebars@npm:^4.1.0":
+"handlebars@npm:4.7.7":
   version: 4.7.7
   resolution: "handlebars@npm:4.7.7"
   dependencies:
@@ -2761,6 +2732,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"handlebars@npm:^4.1.0":
+  version: 4.7.8
+  resolution: "handlebars@npm:4.7.8"
+  dependencies:
+    minimist: ^1.2.5
+    neo-async: ^2.6.2
+    source-map: ^0.6.1
+    uglify-js: ^3.1.4
+    wordwrap: ^1.0.0
+  dependenciesMeta:
+    uglify-js:
+      optional: true
+  bin:
+    handlebars: bin/handlebars
+  checksum: 00e68bb5c183fd7b8b63322e6234b5ac8fbb960d712cb3f25587d559c2951d9642df83c04a1172c918c41bcfc81bfbd7a7718bbce93b893e0135fc99edea93ff
+  languageName: node
+  linkType: hard
+
 "has-flag@npm:^3.0.0":
   version: 3.0.0
   resolution: "has-flag@npm:3.0.0"
@@ -2775,6 +2764,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"has-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "has-proto@npm:1.0.1"
+  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  languageName: node
+  linkType: hard
+
 "has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
@@ -2790,11 +2786,9 @@ __metadata:
   linkType: hard
 
 "has@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has@npm:1.0.3"
-  dependencies:
-    function-bind: ^1.1.1
-  checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
+  version: 1.0.4
+  resolution: "has@npm:1.0.4"
+  checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550
   languageName: node
   linkType: hard
 
@@ -2808,10 +2802,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"helmet@npm:6.1.5":
-  version: 6.1.5
-  resolution: "helmet@npm:6.1.5"
-  checksum: 58cc8f8715e2c486f3c7a58f89fcda3c9e83ab427bfe16d8486d8be53a681afc291f9900b9e60e5d42c63c25ece3da864a33cdd621a12f5a67cbc9046cff393d
+"helmet@npm:7.0.0":
+  version: 7.0.0
+  resolution: "helmet@npm:7.0.0"
+  checksum: 3622b8b68b7ac4736369fe7717adb5b87ddcdcda7c11c13277d79fb5670acab032e8c971835565b1d2144d234f3e0dbcd327a44249b9e61f0f64c0c753faf1bc
   languageName: node
   linkType: hard
 
@@ -2822,7 +2816,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.1.0":
+"http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
   checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
@@ -2842,17 +2836,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^4.0.0, http-proxy-agent@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "http-proxy-agent@npm:4.0.1"
-  dependencies:
-    "@tootallnate/once": 1
-    agent-base: 6
-    debug: 4
-  checksum: c6a5da5a1929416b6bbdf77b1aca13888013fe7eb9d59fc292e25d18e041bb154a8dfada58e223fc7b76b9b2d155a87e92e608235201f77d34aa258707963a82
-  languageName: node
-  linkType: hard
-
 "http-proxy-agent@npm:^5.0.0":
   version: 5.0.0
   resolution: "http-proxy-agent@npm:5.0.0"
@@ -2864,14 +2847,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-status-codes@npm:2.2.0":
-  version: 2.2.0
-  resolution: "http-status-codes@npm:2.2.0"
-  checksum: 31e1d730856210445da0907d9b484629e69e4fe92ac032478a7aa4d89e5b215e2b4e75d7ebce40d0537b6850bd281b2f65c7cc36cc2677e5de056d6cea1045ce
+"http-proxy-agent@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "http-proxy-agent@npm:7.0.0"
+  dependencies:
+    agent-base: ^7.1.0
+    debug: ^4.3.4
+  checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6
+  languageName: node
+  linkType: hard
+
+"http-status-codes@npm:2.3.0":
+  version: 2.3.0
+  resolution: "http-status-codes@npm:2.3.0"
+  checksum: dae3b99e0155441b6df28e8265ff27c56a45f82c6092f736414233e9ccf063d5ea93c1e1279e8b499c4642e2538b37995c76b1640ed3f615d0e2883d3a1dcfd5
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:5, https-proxy-agent@npm:^5.0.0":
+"https-proxy-agent@npm:^5.0.0":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
@@ -2881,6 +2874,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "https-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: 4
+  checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292
+  languageName: node
+  linkType: hard
+
 "human-signals@npm:^2.1.0":
   version: 2.1.0
   resolution: "human-signals@npm:2.1.0"
@@ -2941,13 +2944,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
-  languageName: node
-  linkType: hard
-
 "inflight@npm:^1.0.4":
   version: 1.0.6
   resolution: "inflight@npm:1.0.6"
@@ -2958,7 +2954,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3, inherits@npm:~2.0.1":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
@@ -2972,7 +2968,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip@npm:^1.1.5":
+"ip@npm:^1.1.8":
   version: 1.1.8
   resolution: "ip@npm:1.1.8"
   checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb
@@ -3009,12 +3005,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.9.0":
-  version: 2.11.0
-  resolution: "is-core-module@npm:2.11.0"
+"is-core-module@npm:^2.13.0":
+  version: 2.13.0
+  resolution: "is-core-module@npm:2.13.0"
   dependencies:
     has: ^1.0.3
-  checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab
+  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
   languageName: node
   linkType: hard
 
@@ -3076,13 +3072,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isarray@npm:0.0.1":
-  version: 0.0.1
-  resolution: "isarray@npm:0.0.1"
-  checksum: 49191f1425681df4a18c2f0f93db3adb85573bcdd6a4482539d98eac9e705d8961317b01175627e860516a2fc45f8f9302db26e5a380a97a520e272e2a40a8d4
-  languageName: node
-  linkType: hard
-
 "isexe@npm:^2.0.0":
   version: 2.0.0
   resolution: "isexe@npm:2.0.0"
@@ -3097,7 +3086,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
+"istanbul-lib-instrument@npm:^5.0.4":
   version: 5.2.1
   resolution: "istanbul-lib-instrument@npm:5.2.1"
   dependencies:
@@ -3110,14 +3099,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"istanbul-lib-instrument@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "istanbul-lib-instrument@npm:6.0.1"
+  dependencies:
+    "@babel/core": ^7.12.3
+    "@babel/parser": ^7.14.7
+    "@istanbuljs/schema": ^0.1.2
+    istanbul-lib-coverage: ^3.2.0
+    semver: ^7.5.4
+  checksum: fb23472e739cfc9b027cefcd7d551d5e7ca7ff2817ae5150fab99fe42786a7f7b56a29a2aa8309c37092e18297b8003f9c274f50ca4360949094d17fbac81472
+  languageName: node
+  linkType: hard
+
 "istanbul-lib-report@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "istanbul-lib-report@npm:3.0.0"
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
   dependencies:
     istanbul-lib-coverage: ^3.0.0
-    make-dir: ^3.0.0
+    make-dir: ^4.0.0
     supports-color: ^7.1.0
-  checksum: 3f29eb3f53c59b987386e07fe772d24c7f58c6897f34c9d7a296f4000de7ae3de9eb95c3de3df91dc65b134c84dee35c54eee572a56243e8907c48064e34ff1b
+  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
   languageName: node
   linkType: hard
 
@@ -3133,68 +3135,81 @@ __metadata:
   linkType: hard
 
 "istanbul-reports@npm:^3.1.3":
-  version: 3.1.5
-  resolution: "istanbul-reports@npm:3.1.5"
+  version: 3.1.6
+  resolution: "istanbul-reports@npm:3.1.6"
   dependencies:
     html-escaper: ^2.0.0
     istanbul-lib-report: ^3.0.0
-  checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89
+  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-changed-files@npm:29.5.0"
+"jackspeak@npm:^2.3.5":
+  version: 2.3.6
+  resolution: "jackspeak@npm:2.3.6"
+  dependencies:
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
+  languageName: node
+  linkType: hard
+
+"jest-changed-files@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-changed-files@npm:29.7.0"
   dependencies:
     execa: ^5.0.0
+    jest-util: ^29.7.0
     p-limit: ^3.1.0
-  checksum: a67a7cb3c11f8f92bd1b7c79e84f724cbd11a9ad51f3cdadafe3ce7ee3c79ee50dbea128f920f5fddc807e9e4e83f5462143094391feedd959a77dd20ab96cf3
+  checksum: 963e203893c396c5dfc75e00a49426688efea7361b0f0e040035809cecd2d46b3c01c02be2d9e8d38b1138357d2de7719ea5b5be21f66c10f2e9685a5a73bb99
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-circus@npm:29.5.0"
+"jest-circus@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-circus@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/expect": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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: ^0.7.0
+    dedent: ^1.0.0
     is-generator-fn: ^2.0.0
-    jest-each: ^29.5.0
-    jest-matcher-utils: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.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.5.0
+    pretty-format: ^29.7.0
     pure-rand: ^6.0.0
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: 44ff5d06acedae6de6c866e20e3b61f83e29ab94cf9f960826e7e667de49c12dd9ab9dffd7fa3b7d1f9688a8b5bfb1ebebadbea69d9ed0d3f66af4a0ff8c2b27
+  checksum: 349437148924a5a109c9b8aad6d393a9591b4dac1918fc97d81b7fc515bc905af9918495055071404af1fab4e48e4b04ac3593477b1d5dcf48c4e71b527c70a7
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-cli@npm:29.5.0"
+"jest-cli@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-cli@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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
-    graceful-fs: ^4.2.9
     import-local: ^3.0.2
-    jest-config: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
-    prompts: ^2.0.1
+    jest-config: ^29.7.0
+    jest-util: ^29.7.0
+    jest-validate: ^29.7.0
     yargs: ^17.3.1
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3203,34 +3218,34 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: 39897bbbc0f0d8a6b975ab12fd13887eaa28d92e3dee9e0173a5cb913ae8cc2ae46e090d38c6d723e84d9d6724429cd08685b4e505fa447d31ca615630c7dbba
+  checksum: 664901277a3f5007ea4870632ed6e7889db9da35b2434e7cb488443e6bf5513889b344b7fddf15112135495b9875892b156faeb2d7391ddb9e2a849dcb7b6c36
   languageName: node
   linkType: hard
 
-"jest-config@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-config@npm:29.5.0"
+"jest-config@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-config@npm:29.7.0"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/test-sequencer": ^29.5.0
-    "@jest/types": ^29.5.0
-    babel-jest: ^29.5.0
+    "@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.5.0
-    jest-environment-node: ^29.5.0
-    jest-get-type: ^29.4.3
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-runner: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
+    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.5.0
+    pretty-format: ^29.7.0
     slash: ^3.0.0
     strip-json-comments: ^3.1.1
   peerDependencies:
@@ -3241,183 +3256,135 @@ __metadata:
       optional: true
     ts-node:
       optional: true
-  checksum: c37c4dab964c54ab293d4e302d40b09687037ac9d00b88348ec42366970747feeaf265e12e3750cd3660b40c518d4031335eda11ac10b70b10e60797ebbd4b9c
+  checksum: 4cabf8f894c180cac80b7df1038912a3fc88f96f2622de33832f4b3314f83e22b08fb751da570c0ab2b7988f21604bdabade95e3c0c041068ac578c085cf7dff
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "jest-diff@npm:29.4.1"
+"jest-diff@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-diff@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
-    diff-sequences: ^29.3.1
-    jest-get-type: ^29.2.0
-    pretty-format: ^29.4.1
-  checksum: 359af2d11a75bbb3c91e3def8cfd0ede00afc6fb5d69d9495f2af5f6e18f692adb940d8338a186159f75afe48088d82bce14e2cc272cad9a5c2148bf0bc7f6bf
+    diff-sequences: ^29.6.3
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: 08e24a9dd43bfba1ef07a6374e5af138f53137b79ec3d5cc71a2303515335898888fa5409959172e1e05de966c9e714368d15e8994b0af7441f0721ee8e1bb77
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-diff@npm:29.5.0"
-  dependencies:
-    chalk: ^4.0.0
-    diff-sequences: ^29.4.3
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: dfd0f4a299b5d127779c76b40106c37854c89c3e0785098c717d52822d6620d227f6234c3a9291df204d619e799e3654159213bf93220f79c8e92a55475a3d39
-  languageName: node
-  linkType: hard
-
-"jest-docblock@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-docblock@npm:29.4.3"
+"jest-docblock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-docblock@npm:29.7.0"
   dependencies:
     detect-newline: ^3.0.0
-  checksum: e0e9df1485bb8926e5b33478cdf84b3387d9caf3658e7dc1eaa6dc34cb93dea0d2d74797f6e940f0233a88f3dadd60957f2288eb8f95506361f85b84bf8661df
+  checksum: 66390c3e9451f8d96c5da62f577a1dad701180cfa9b071c5025acab2f94d7a3efc2515cfa1654ebe707213241541ce9c5530232cdc8017c91ed64eea1bd3b192
   languageName: node
   linkType: hard
 
-"jest-each@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-each@npm:29.5.0"
+"jest-each@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-each@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
-    jest-util: ^29.5.0
-    pretty-format: ^29.5.0
-  checksum: b8b297534d25834c5d4e31e4c687359787b1e402519e42664eb704cc3a12a7a91a017565a75acb02e8cf9afd3f4eef3350bd785276bec0900184641b765ff7a5
+    jest-get-type: ^29.6.3
+    jest-util: ^29.7.0
+    pretty-format: ^29.7.0
+  checksum: e88f99f0184000fc8813f2a0aa79e29deeb63700a3b9b7928b8a418d7d93cd24933608591dbbdea732b473eb2021c72991b5cc51a17966842841c6e28e6f691c
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-environment-node@npm:29.5.0"
+"jest-environment-node@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-node@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/fake-timers": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/environment": ^29.7.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.5.0
-    jest-util: ^29.5.0
-  checksum: 57981911cc20a4219b0da9e22b2e3c9f31b505e43f78e61c899e3227ded455ce1a3a9483842c69cfa4532f02cfb536ae0995bf245f9211608edacfc1e478d411
-  languageName: node
-  linkType: hard
-
-"jest-get-type@npm:^29.2.0":
-  version: 29.2.0
-  resolution: "jest-get-type@npm:29.2.0"
-  checksum: e396fd880a30d08940ed8a8e43cd4595db1b8ff09649018eb358ca701811137556bae82626af73459e3c0f8c5e972ed1e57fd3b1537b13a260893dac60a90942
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
+  checksum: 501a9966292cbe0ca3f40057a37587cb6def25e1e0c5e39ac6c650fe78d3c70a2428304341d084ac0cced5041483acef41c477abac47e9a290d5545fd2f15646
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-get-type@npm:29.4.3"
-  checksum: 6ac7f2dde1c65e292e4355b6c63b3a4897d7e92cb4c8afcf6d397f2682f8080e094c8b0b68205a74d269882ec06bf696a9de6cd3e1b7333531e5ed7b112605ce
+"jest-get-type@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-get-type@npm:29.6.3"
+  checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-haste-map@npm:29.5.0"
+"jest-haste-map@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-haste-map@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/graceful-fs": ^4.1.3
     "@types/node": "*"
     anymatch: ^3.0.3
     fb-watchman: ^2.0.0
     fsevents: ^2.3.2
     graceful-fs: ^4.2.9
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.5.0
-    jest-worker: ^29.5.0
+    jest-regex-util: ^29.6.3
+    jest-util: ^29.7.0
+    jest-worker: ^29.7.0
     micromatch: ^4.0.4
     walker: ^1.0.8
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7
+  checksum: c2c8f2d3e792a963940fbdfa563ce14ef9e14d4d86da645b96d3cd346b8d35c5ce0b992ee08593939b5f718cf0a1f5a90011a056548a1dbf58397d4356786f01
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-leak-detector@npm:29.5.0"
+"jest-leak-detector@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-leak-detector@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: 0fb845da7ac9cdfc9b3b2e35f6f623a41c547d7dc0103ceb0349013459d00de5870b5689a625e7e37f9644934b40e8f1dcdd5422d14d57470600350364676313
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "jest-matcher-utils@npm:29.4.1"
+"jest-matcher-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-matcher-utils@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
-    jest-diff: ^29.4.1
-    jest-get-type: ^29.2.0
-    pretty-format: ^29.4.1
-  checksum: ea84dbcae82241cb28e94ff586660aeec51196d9245413dc516ce3aa78140b3ea728b1168b242281b59ad513b0148b9f12d674729bd043a894a3ba9d6ec164f4
+    jest-diff: ^29.7.0
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: d7259e5f995d915e8a37a8fd494cb7d6af24cd2a287b200f831717ba0d015190375f9f5dc35393b8ba2aae9b2ebd60984635269c7f8cff7d85b077543b7744cd
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-matcher-utils@npm:29.5.0"
-  dependencies:
-    chalk: ^4.0.0
-    jest-diff: ^29.5.0
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: 1d3e8c746e484a58ce194e3aad152eff21fd0896e8b8bf3d4ab1a4e2cbfed95fb143646f4ad9fdf6e42212b9e8fc033268b58e011b044a9929df45485deb5ac9
-  languageName: node
-  linkType: hard
-
-"jest-message-util@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "jest-message-util@npm:29.4.1"
-  dependencies:
-    "@babel/code-frame": ^7.12.13
-    "@jest/types": ^29.4.1
-    "@types/stack-utils": ^2.0.0
-    chalk: ^4.0.0
-    graceful-fs: ^4.2.9
-    micromatch: ^4.0.4
-    pretty-format: ^29.4.1
-    slash: ^3.0.0
-    stack-utils: ^2.0.3
-  checksum: 7d49823401b6d42f0d2d63dd9c0f11d2f64783416f82a68634190abee46e600e25bb0b380c746726acc56e854687bb03a76e26e617fcdda78e8c6316423b694f
-  languageName: node
-  linkType: hard
-
-"jest-message-util@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-message-util@npm:29.5.0"
+"jest-message-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-message-util@npm:29.7.0"
   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
-  checksum: daddece6bbf846eb6a2ab9be9f2446e54085bef4e5cecd13d2a538fa9c01cb89d38e564c6b74fd8e12d37ed9eface8a362240ae9f21d68b214590631e7a0d8bf
+  checksum: a9d025b1c6726a2ff17d54cc694de088b0489456c69106be6b615db7a51b7beb66788bea7a59991a019d924fbf20f67d085a445aedb9a4d6760363f4d7d09930
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-mock@npm:29.5.0"
+"jest-mock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-mock@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-util: ^29.5.0
-  checksum: 2a9cf07509948fa8608898c445f04fe4dd6e2049ff431e5531eee028c808d3ba3c67f226ac87b0cf383feaa1055776900d197c895e89783016886ac17a4ff10c
+    jest-util: ^29.7.0
+  checksum: 81ba9b68689a60be1482212878973700347cb72833c5e5af09895882b9eb5c4e02843a1bbdf23f94c52d42708bab53a30c45a3482952c9eec173d1eaac5b86c5
   languageName: node
   linkType: hard
 
@@ -3433,208 +3400,191 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-regex-util@npm:29.4.3"
-  checksum: 96fc7fc28cd4dd73a63c13a526202c4bd8b351d4e5b68b1a2a2c88da3308c2a16e26feaa593083eb0bac38cca1aa9dd05025412e7de013ba963fb8e66af22b8a
+"jest-regex-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-regex-util@npm:29.6.3"
+  checksum: 0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-resolve-dependencies@npm:29.5.0"
+"jest-resolve-dependencies@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve-dependencies@npm:29.7.0"
   dependencies:
-    jest-regex-util: ^29.4.3
-    jest-snapshot: ^29.5.0
-  checksum: 479d2e5365d58fe23f2b87001e2e0adcbffe0147700e85abdec8f14b9703b0a55758c1929a9989e3f5d5e954fb88870ea4bfa04783523b664562fcf5f10b0edf
+    jest-regex-util: ^29.6.3
+    jest-snapshot: ^29.7.0
+  checksum: aeb75d8150aaae60ca2bb345a0d198f23496494677cd6aefa26fc005faf354061f073982175daaf32b4b9d86b26ca928586344516e3e6969aa614cb13b883984
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-resolve@npm:29.5.0"
+"jest-resolve@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.5.0
+    jest-haste-map: ^29.7.0
     jest-pnp-resolver: ^1.2.2
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
+    jest-util: ^29.7.0
+    jest-validate: ^29.7.0
     resolve: ^1.20.0
     resolve.exports: ^2.0.0
     slash: ^3.0.0
-  checksum: 9a125f3cf323ceef512089339d35f3ee37f79fe16a831fb6a26773ea6a229b9e490d108fec7af334142e91845b5996de8e7cdd85a4d8d617078737d804e29c8f
+  checksum: 0ca218e10731aa17920526ec39deaec59ab9b966237905ffc4545444481112cd422f01581230eceb7e82d86f44a543d520a71391ec66e1b4ef1a578bd5c73487
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-runner@npm:29.5.0"
+"jest-runner@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runner@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/environment": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.4.3
-    jest-environment-node: ^29.5.0
-    jest-haste-map: ^29.5.0
-    jest-leak-detector: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-resolve: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-util: ^29.5.0
-    jest-watcher: ^29.5.0
-    jest-worker: ^29.5.0
+    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
-  checksum: 437dea69c5dddca22032259787bac74790d5a171c9d804711415f31e5d1abfb64fa52f54a9015bb17a12b858fd0cf3f75ef6f3c9e94255a8596e179f707229c4
+  checksum: f0405778ea64812bf9b5c50b598850d94ccf95d7ba21f090c64827b41decd680ee19fcbb494007cdd7f5d0d8906bfc9eceddd8fa583e753e736ecd462d4682fb
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-runtime@npm:29.5.0"
+"jest-runtime@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runtime@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/fake-timers": ^29.5.0
-    "@jest/globals": ^29.5.0
-    "@jest/source-map": ^29.4.3
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
-    jest-message-util: ^29.5.0
-    jest-mock: ^29.5.0
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.0
+    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
-  checksum: 7af27bd9d54cf1c5735404cf8d76c6509d5610b1ec0106a21baa815c1aff15d774ce534ac2834bc440dccfe6348bae1885fd9a806f23a94ddafdc0f5bae4b09d
+  checksum: d19f113d013e80691e07047f68e1e3448ef024ff2c6b586ce4f90cd7d4c62a2cd1d460110491019719f3c59bfebe16f0e201ed005ef9f80e2cf798c374eed54e
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-snapshot@npm:29.5.0"
+"jest-snapshot@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-snapshot@npm:29.7.0"
   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.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
-    "@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.5.0
+    expect: ^29.7.0
     graceful-fs: ^4.2.9
-    jest-diff: ^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-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.5.0
-    semver: ^7.3.5
-  checksum: fe5df54122ed10eed625de6416a45bc4958d5062b018f05b152bf9785ab7f355dcd55e40cf5da63895bf8278f8d7b2bb4059b2cfbfdee18f509d455d37d8aa2b
+    pretty-format: ^29.7.0
+    semver: ^7.5.3
+  checksum: 86821c3ad0b6899521ce75ee1ae7b01b17e6dfeff9166f2cf17f012e0c5d8c798f30f9e4f8f7f5bed01ea7b55a6bc159f5eda778311162cbfa48785447c237ad
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "jest-util@npm:29.4.1"
+"jest-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-util@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.4.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
-  checksum: 10a0e6c448ace1386f728ee3b7669f67878bb0c2e668a902d11140cc3f75c89a18f4142a37a24ccb587ede20dad86d497b3e8df4f26848a9be50a44779d92bc9
+  checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-util@npm:29.5.0"
+"jest-validate@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-validate@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
-    "@types/node": "*"
-    chalk: ^4.0.0
-    ci-info: ^3.2.0
-    graceful-fs: ^4.2.9
-    picomatch: ^2.2.3
-  checksum: fd9212950d34d2ecad8c990dda0d8ea59a8a554b0c188b53ea5d6c4a0829a64f2e1d49e6e85e812014933d17426d7136da4785f9cf76fff1799de51b88bc85d3
-  languageName: node
-  linkType: hard
-
-"jest-validate@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-validate@npm:29.5.0"
-  dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     camelcase: ^6.2.0
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
+    jest-get-type: ^29.6.3
     leven: ^3.1.0
-    pretty-format: ^29.5.0
-  checksum: 43ca5df7cb75572a254ac3e92fbbe7be6b6a1be898cc1e887a45d55ea003f7a112717d814a674d37f9f18f52d8de40873c8f084f17664ae562736c78dd44c6a1
+    pretty-format: ^29.7.0
+  checksum: 191fcdc980f8a0de4dbdd879fa276435d00eb157a48683af7b3b1b98b0f7d9de7ffe12689b617779097ff1ed77601b9f7126b0871bba4f776e222c40f62e9dae
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-watcher@npm:29.5.0"
+"jest-watcher@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-watcher@npm:29.7.0"
   dependencies:
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
+    jest-util: ^29.7.0
     string-length: ^4.0.1
-  checksum: 62303ac7bdc7e61a8b4239a239d018f7527739da2b2be6a81a7be25b74ca769f1c43ee8558ce8e72bb857245c46d6e03af331227ffb00a57280abb2a928aa776
+  checksum: 67e6e7fe695416deff96b93a14a561a6db69389a0667e9489f24485bb85e5b54e12f3b2ba511ec0b777eca1e727235b073e3ebcdd473d68888650489f88df92f
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-worker@npm:29.5.0"
+"jest-worker@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-worker@npm:29.7.0"
   dependencies:
     "@types/node": "*"
-    jest-util: ^29.5.0
+    jest-util: ^29.7.0
     merge-stream: ^2.0.0
     supports-color: ^8.0.0
-  checksum: 1151a1ae3602b1ea7c42a8f1efe2b5a7bf927039deaa0827bf978880169899b705744e288f80a63603fb3fc2985e0071234986af7dc2c21c7a64333d8777c7c9
+  checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13
   languageName: node
   linkType: hard
 
-"jest@npm:29.5.0":
-  version: 29.5.0
-  resolution: "jest@npm:29.5.0"
+"jest@npm:29.7.0":
+  version: 29.7.0
+  resolution: "jest@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/core": ^29.7.0
+    "@jest/types": ^29.6.3
     import-local: ^3.0.2
-    jest-cli: ^29.5.0
+    jest-cli: ^29.7.0
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -3642,7 +3592,7 @@ __metadata:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: a8ff2eb0f421623412236e23cbe67c638127fffde466cba9606bc0c0553b4c1e5cb116d7e0ef990b5d1712851652c8ee461373b578df50857fe635b94ff455d5
+  checksum: 17ca8d67504a7dbb1998cf3c3077ec9031ba3eb512da8d71cb91bcabb2b8995c4e4b292b740cb9bf1cbff5ce3e110b3f7c777b0cefb6f41ab05445f248d0ee0b
   languageName: node
   linkType: hard
 
@@ -3700,7 +3650,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.2.2":
+"json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -3755,16 +3705,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"levn@npm:~0.3.0":
-  version: 0.3.0
-  resolution: "levn@npm:0.3.0"
-  dependencies:
-    prelude-ls: ~1.1.2
-    type-check: ~0.3.2
-  checksum: 0d084a524231a8246bb10fec48cdbb35282099f6954838604f3c7fc66f2e16fa66fd9cc2f3f20a541a113c4dafdf181e822c887c8a319c9195444e6c64ac395e
-  languageName: node
-  linkType: hard
-
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -3822,50 +3762,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.14.1":
-  version: 7.18.2
-  resolution: "lru-cache@npm:7.18.2"
-  checksum: 51e9c6f960a747cb2ed13dfda4238905a5633c590c0f9e52b0ea971a9660b93c0bbf13a5feac36ef18356736a006259eff9afe8bf57a463ed8f21fbc43720120
+"lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1":
+  version: 7.18.3
+  resolution: "lru-cache@npm:7.18.3"
+  checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.7.1":
-  version: 7.14.1
-  resolution: "lru-cache@npm:7.14.1"
-  checksum: d72c6713c6a6d86836a7a6523b3f1ac6764768cca47ec99341c3e76db06aacd4764620e5e2cda719a36848785a52a70e531822dc2b33fb071fa709683746c104
+"lru-cache@npm:^9.1.1 || ^10.0.0":
+  version: 10.0.1
+  resolution: "lru-cache@npm:10.0.1"
+  checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181
   languageName: node
   linkType: hard
 
-"make-dir@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "make-dir@npm:3.1.0"
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
   dependencies:
-    semver: ^6.0.0
-  checksum: 484200020ab5a1fdf12f393fe5f385fc8e4378824c940fba1729dcd198ae4ff24867bc7a5646331e50cead8abff5d9270c456314386e629acec6dff4b8016b78
+    semver: ^7.5.3
+  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
+"make-fetch-happen@npm:^11.0.3":
+  version: 11.1.1
+  resolution: "make-fetch-happen@npm:11.1.1"
   dependencies:
     agentkeepalive: ^4.2.1
-    cacache: ^16.1.0
-    http-cache-semantics: ^4.1.0
+    cacache: ^17.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: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-fetch: ^2.0.3
+    minipass: ^5.0.0
+    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: ^9.0.0
-  checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c
+    ssri: ^10.0.0
+  checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540
   languageName: node
   linkType: hard
 
@@ -3887,13 +3826,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"maxmind@npm:4.3.9":
-  version: 4.3.9
-  resolution: "maxmind@npm:4.3.9"
+"maxmind@npm:4.3.10":
+  version: 4.3.10
+  resolution: "maxmind@npm:4.3.10"
   dependencies:
     mmdb-lib: 2.0.2
-    tiny-lru: 10.3.0
-  checksum: 4a31b3695e2f0666221f288ad459ceabce3558d02b0afc5b7d7b76265e4578a3019d59ce264fe735dec8eb6c6d5460b4f0ab5bfb3bfb26be2e49b690f1927dd0
+    tiny-lru: 10.4.1
+  checksum: 7733caa051f12633340b71e54f3c28f9257f5b076337e11e2e8ca4a2e1093bc8e65d5753329bd5dde57182405a0486c03ad3c5d9755ca56a0b054c10fdd0178b
   languageName: node
   linkType: hard
 
@@ -3983,28 +3922,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^5.0.1":
-  version: 5.1.6
-  resolution: "minimatch@npm:5.1.6"
+"minimatch@npm:^8.0.2":
+  version: 8.0.4
+  resolution: "minimatch@npm:8.0.4"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77
+  checksum: 2e46cffb86bacbc524ad45a6426f338920c529dd13f3a732cc2cf7618988ee1aae88df4ca28983285aca9e0f45222019ac2d14ebd17c1edadd2ee12221ab801a
   languageName: node
   linkType: hard
 
-"minimatch@npm:^7.4.1":
-  version: 7.4.2
-  resolution: "minimatch@npm:7.4.2"
+"minimatch@npm:^9.0.1":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 9e341b04e69d5ab03e4206dcb61c8a158e3b8709628bf5e1a4eaa9f3b72c0ba925e24ad959b1f6ce6835caa5a927131d5087fae6836b69e7d99d7d5e63ef0bd8
+  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
   languageName: node
   linkType: hard
 
 "minimist@npm:^1.2.5":
-  version: 1.2.7
-  resolution: "minimist@npm:1.2.7"
-  checksum: 7346574a1038ca23c32e02252f603801f09384dd1d78b69a943a4e8c2c28730b80e96193882d3d3b22a063445f460e48316b29b8a25addca2d7e5e8f75478bec
+  version: 1.2.8
+  resolution: "minimist@npm:1.2.8"
+  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
   languageName: node
   linkType: hard
 
@@ -4017,18 +3956,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
   dependencies:
     encoding: ^0.1.13
-    minipass: ^3.1.6
+    minipass: ^7.0.3
     minipass-sized: ^1.0.3
     minizlib: ^2.1.2
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91
+  checksum: af7aad15d5c128ab1ebe52e043bdf7d62c3c6f0cecb9285b40d7b395e1375b45dcdfd40e63e93d26a0e8249c9efd5c325c65575aceee192883970ff8cb11364a
   languageName: node
   linkType: hard
 
@@ -4059,7 +3998,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
+"minipass@npm:^3.0.0":
   version: 3.3.6
   resolution: "minipass@npm:3.3.6"
   dependencies:
@@ -4068,19 +4007,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "minipass@npm:4.0.0"
-  dependencies:
-    yallist: ^4.0.0
-  checksum: 7a609afbf394abfcf9c48e6c90226f471676c8f2a67f07f6838871afb03215ede431d1433feffe1b855455bcb13ef0eb89162841b9796109d6fed8d89790f381
+"minipass@npm:^4.2.4":
+  version: 4.2.8
+  resolution: "minipass@npm:4.2.8"
+  checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.0.2, minipass@npm:^4.2.4":
-  version: 4.2.4
-  resolution: "minipass@npm:4.2.4"
-  checksum: c664f2ae4401408d1e7a6e4f50aca45f87b1b0634bc9261136df5c378e313e77355765f73f59c4a5abcadcdf43d83fcd3eb14e4a7cdcce8e36508e2290345753
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
   languageName: node
   linkType: hard
 
@@ -4094,7 +4038,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:1.0.4, mkdirp@npm:^1.0.3, mkdirp@npm:^1.0.4":
+"mkdirp@npm:1.0.4, mkdirp@npm:^1.0.3":
   version: 1.0.4
   resolution: "mkdirp@npm:1.0.4"
   bin:
@@ -4172,7 +4116,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"neo-async@npm:^2.6.0":
+"neo-async@npm:^2.6.0, neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
   checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9
@@ -4186,21 +4130,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nocache@npm:3.0.4":
-  version: 3.0.4
-  resolution: "nocache@npm:3.0.4"
-  checksum: 6be9ee67eb561ecedc56d805c024c0fda55b9836ecba659c720073b067929aa4fe04bb7121480e004c9cf52989e62d8720f29a7fe0269f1a4941221a1e4be1c2
+"nocache@npm:4.0.0":
+  version: 4.0.0
+  resolution: "nocache@npm:4.0.0"
+  checksum: ba317f7a5b837069c3bf8616c9a25f61bd5ec63ad7aa2ce83e8425116df402ab5b4914bbdfb1ba54893c0f859886cb3ad9a375f1c45ba7a72a9712cf31392292
   languageName: node
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 9.3.1
-  resolution: "node-gyp@npm:9.3.1"
+  version: 9.4.0
+  resolution: "node-gyp@npm:9.4.0"
   dependencies:
     env-paths: ^2.2.0
+    exponential-backoff: ^3.1.1
     glob: ^7.1.4
     graceful-fs: ^4.2.6
-    make-fetch-happen: ^10.0.3
+    make-fetch-happen: ^11.0.3
     nopt: ^6.0.0
     npmlog: ^6.0.0
     rimraf: ^3.0.2
@@ -4209,7 +4154,7 @@ __metadata:
     which: ^2.0.2
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: b860e9976fa645ca0789c69e25387401b4396b93c8375489b5151a6c55cf2640a3b6183c212b38625ef7c508994930b72198338e3d09b9d7ade5acc4aaf51ea7
+  checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99
   languageName: node
   linkType: hard
 
@@ -4220,10 +4165,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.6":
-  version: 2.0.8
-  resolution: "node-releases@npm:2.0.8"
-  checksum: b1ab02c0d5d8e081bf9537232777a7a787dc8fef07f70feabe70a344599b220fe16462f746ac30f3eed5a58549445ad69368964d12a1f8b3b764f6caab7ba34a
+"node-releases@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "node-releases@npm:2.0.13"
+  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
   languageName: node
   linkType: hard
 
@@ -4284,9 +4229,9 @@ __metadata:
   linkType: hard
 
 "object-inspect@npm:^1.9.0":
-  version: 1.12.3
-  resolution: "object-inspect@npm:1.12.3"
-  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
+  version: 1.13.0
+  resolution: "object-inspect@npm:1.13.0"
+  checksum: 21353e910a3079466cb44adca71d8bef15bd8b87e518eb68bb33d82c5c70b83193993edce432cc92268f7dd02c4a8ab338663a011844367d0bd0559f6dde1fed
   languageName: node
   linkType: hard
 
@@ -4326,20 +4271,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.8.1":
-  version: 0.8.3
-  resolution: "optionator@npm:0.8.3"
-  dependencies:
-    deep-is: ~0.1.3
-    fast-levenshtein: ~2.0.6
-    levn: ~0.3.0
-    prelude-ls: ~1.1.2
-    type-check: ~0.3.2
-    word-wrap: ~1.2.3
-  checksum: b8695ddf3d593203e25ab0900e265d860038486c943ff8b774f596a310f8ceebdb30c6832407a8198ba3ec9debe1abe1f51d4aad94843612db3b76d690c61d34
-  languageName: node
-  linkType: hard
-
 "p-defer@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-defer@npm:1.0.0"
@@ -4418,31 +4349,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pac-proxy-agent@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pac-proxy-agent@npm:5.0.0"
+"pac-proxy-agent@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "pac-proxy-agent@npm:7.0.1"
   dependencies:
-    "@tootallnate/once": 1
-    agent-base: 6
-    debug: 4
-    get-uri: 3
-    http-proxy-agent: ^4.0.1
-    https-proxy-agent: 5
-    pac-resolver: ^5.0.0
-    raw-body: ^2.2.0
-    socks-proxy-agent: 5
-  checksum: cfd26a0e2ebfea4ca6162465018ce093bf147d26cf6c8fb3e7155bc7c184370d80d4d09a1c097e3db7676d0e3f574ea1cb56a4aa7d1d2e5cca6238935fabf010
+    "@tootallnate/quickjs-emscripten": ^0.23.0
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    get-uri: ^6.0.1
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.2
+    pac-resolver: ^7.0.0
+    socks-proxy-agent: ^8.0.2
+  checksum: 3d4aa48ec1c19db10158ecc1c4c9a9f77792294412d225ceb3dfa45d5a06950dca9755e2db0d9b69f12769119bea0adf2b24390d9c73c8d81df75e28245ae451
   languageName: node
   linkType: hard
 
-"pac-resolver@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "pac-resolver@npm:5.0.1"
+"pac-resolver@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pac-resolver@npm:7.0.0"
   dependencies:
-    degenerator: ^3.0.2
-    ip: ^1.1.5
+    degenerator: ^5.0.0
+    ip: ^1.1.8
     netmask: ^2.0.2
-  checksum: e3bd8aada70d173cd4cec1ac810fb56161678b7a597060a740c4a31d9c5f8cd95687b2d0fd90b69c0cafe5ef787404074f38042ba08c8d378fed48973f58e493
+  checksum: fa3a898c09848e93e35f5e23443fea36ddb393a851c76a23664a5bf3fcbe58ff77a0bcdae1e4f01b9ea87ea493c52e14d97a0fe39f92474d14cd45559c6e3cde
   languageName: node
   linkType: hard
 
@@ -4500,13 +4430,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.6.1":
-  version: 1.6.1
-  resolution: "path-scurry@npm:1.6.1"
+"path-scurry@npm:^1.10.1, path-scurry@npm:^1.6.1":
+  version: 1.10.1
+  resolution: "path-scurry@npm:1.10.1"
   dependencies:
-    lru-cache: ^7.14.1
-    minipass: ^4.0.2
-  checksum: 7ba57e823cb7bb879669a4e5e05a283cde1bb9e81b6d806b2609f8d8026d0aef08f4b655b17fc86b21c9c32807851bba95ca715db5ab0605fb13c7a3e9172e42
+    lru-cache: ^9.1.1 || ^10.0.0
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
   languageName: node
   linkType: hard
 
@@ -4550,9 +4480,9 @@ __metadata:
   linkType: hard
 
 "pirates@npm:^4.0.4":
-  version: 4.0.5
-  resolution: "pirates@npm:4.0.5"
-  checksum: c9994e61b85260bec6c4fc0307016340d9b0c4f4b6550a957afaaff0c9b1ad58fbbea5cfcf083860a25cb27a375442e2b0edf52e2e1e40e69934e08dcc52d227
+  version: 4.0.6
+  resolution: "pirates@npm:4.0.6"
+  checksum: 46a65fefaf19c6f57460388a5af9ab81e3d7fd0e7bc44ca59d753cb5c4d0df97c6c6e583674869762101836d68675f027d60f841c105d72734df9dfca97cbcc6
   languageName: node
   linkType: hard
 
@@ -4671,39 +4601,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prelude-ls@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "prelude-ls@npm:1.1.2"
-  checksum: c4867c87488e4a0c233e158e4d0d5565b609b105d75e4c05dc760840475f06b731332eb93cc8c9cecb840aa8ec323ca3c9a56ad7820ad2e63f0261dadcb154e4
-  languageName: node
-  linkType: hard
-
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.4.1":
-  version: 29.4.1
-  resolution: "pretty-format@npm:29.4.1"
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "pretty-format@npm:29.7.0"
   dependencies:
-    "@jest/schemas": ^29.4.0
+    "@jest/schemas": ^29.6.3
     ansi-styles: ^5.0.0
     react-is: ^18.0.0
-  checksum: bcc8e86bcf8e7f5106c96e2ea7905912bd17ae2aac76e4e0745d2a50df4b340638ed95090ee455a1c0f78189efa05077bd655ca08bf66292e83ebd7035fc46fd
-  languageName: node
-  linkType: hard
-
-"pretty-format@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "pretty-format@npm:29.5.0"
-  dependencies:
-    "@jest/schemas": ^29.4.3
-    ansi-styles: ^5.0.0
-    react-is: ^18.0.0
-  checksum: 4065356b558e6db25b4d41a01efb386935a6c06a0c9c104ef5ce59f2f476b8210edb8b3949b386e60ada0a6dc5ebcb2e6ccddc8c64dfd1a9943c3c3a9e7eaf89
-  languageName: node
-  linkType: hard
-
-"promise-inflight@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "promise-inflight@npm:1.0.1"
-  checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981
+  checksum: 032c1602383e71e9c0c02a01bbd25d6759d60e9c7cf21937dde8357aa753da348fcec5def5d1002c9678a8524d5fe099ad98861286550ef44de8808cc61e43b6
   languageName: node
   linkType: hard
 
@@ -4746,23 +4651,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proxy-agent@npm:~5.0.0":
-  version: 5.0.0
-  resolution: "proxy-agent@npm:5.0.0"
+"proxy-agent@npm:~6.3.0":
+  version: 6.3.1
+  resolution: "proxy-agent@npm:6.3.1"
   dependencies:
-    agent-base: ^6.0.0
-    debug: 4
-    http-proxy-agent: ^4.0.0
-    https-proxy-agent: ^5.0.0
-    lru-cache: ^5.1.1
-    pac-proxy-agent: ^5.0.0
-    proxy-from-env: ^1.0.0
-    socks-proxy-agent: ^5.0.0
-  checksum: 3b0bb73a4d3a07711d3cad72b2fa4320880f7a6ec1959cdcc186ac6ffb173db8137d7c4046c27fdfa6e2207b2eb75e802f3d5e14c766700586ec4d47299a5124
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.2
+    lru-cache: ^7.14.1
+    pac-proxy-agent: ^7.0.1
+    proxy-from-env: ^1.1.0
+    socks-proxy-agent: ^8.0.2
+  checksum: 31030da419da31809340ac2521090c9a5bf4fe47a944843f829b3502883208c8586a468955e64b694140a41d70af6f45cf4793f5efd4a6f3ed94e5ac8023e36d
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:^1.0.0":
+"proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
   checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
@@ -4770,9 +4675,9 @@ __metadata:
   linkType: hard
 
 "pure-rand@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "pure-rand@npm:6.0.0"
-  checksum: ad1378d0a4859482d053a5264b2b485b445ece4bbc56f8959c233ea678b81ac2d613737925d496ded134eff5f29cc5546bf7492b6bce319ee27bebbad8a0c612
+  version: 6.0.4
+  resolution: "pure-rand@npm:6.0.4"
+  checksum: e1c4e69f8bf7303e5252756d67c3c7551385cd34d94a1f511fe099727ccbab74c898c03a06d4c4a24a89b51858781057b83ebbfe740d984240cdc04fead36068
   languageName: node
   linkType: hard
 
@@ -4792,7 +4697,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1, raw-body@npm:^2.2.0":
+"raw-body@npm:2.5.1":
   version: 2.5.1
   resolution: "raw-body@npm:2.5.1"
   dependencies:
@@ -4820,26 +4725,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:1.1.x":
-  version: 1.1.14
-  resolution: "readable-stream@npm:1.1.14"
-  dependencies:
-    core-util-is: ~1.0.0
-    inherits: ~2.0.1
-    isarray: 0.0.1
-    string_decoder: ~0.10.x
-  checksum: 17dfeae3e909945a4a1abc5613ea92d03269ef54c49288599507fc98ff4615988a1c39a999dcf9aacba70233d9b7040bc11a5f2bfc947e262dedcc0a8b32b5a0
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "readable-stream@npm:3.6.0"
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
   dependencies:
     inherits: ^2.0.3
     string_decoder: ^1.1.1
     util-deprecate: ^1.0.1
-  checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8
+  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
   languageName: node
   linkType: hard
 
@@ -4887,35 +4780,35 @@ __metadata:
   linkType: hard
 
 "resolve.exports@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "resolve.exports@npm:2.0.0"
-  checksum: d8bee3b0cc0a0ae6c8323710983505bc6a3a2574f718e96f01e048a0f0af035941434b386cc9efc7eededc5e1199726185c306ec6f6a1aa55d5fbad926fd0634
+  version: 2.0.2
+  resolution: "resolve.exports@npm:2.0.2"
+  checksum: 1c7778ca1b86a94f8ab4055d196c7d87d1874b96df4d7c3e67bbf793140f0717fd506dcafd62785b079cd6086b9264424ad634fb904409764c3509c3df1653f2
   languageName: node
   linkType: hard
 
 "resolve@npm:^1.20.0, resolve@npm:^1.22.1":
-  version: 1.22.1
-  resolution: "resolve@npm:1.22.1"
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
   languageName: node
   linkType: hard
 
 "resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
-  version: 1.22.1
-  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
   languageName: node
   linkType: hard
 
@@ -4970,47 +4863,38 @@ __metadata:
   linkType: hard
 
 "sax@npm:^1.2.4":
-  version: 1.2.4
-  resolution: "sax@npm:1.2.4"
-  checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
-  languageName: node
-  linkType: hard
-
-"semver@npm:6.3.0, semver@npm:^6.0.0, semver@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "semver@npm:6.3.0"
-  bin:
-    semver: ./bin/semver.js
-  checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
+  version: 1.3.0
+  resolution: "sax@npm:1.3.0"
+  checksum: 238ab3a9ba8c8f8aaf1c5ea9120386391f6ee0af52f1a6a40bbb6df78241dd05d782f2359d614ac6aae08c4c4125208b456548a6cf68625aa4fe178486e63ecd
   languageName: node
   linkType: hard
 
 "semver@npm:^5.3.0, semver@npm:^5.5.0":
-  version: 5.7.1
-  resolution: "semver@npm:5.7.1"
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
   bin:
-    semver: ./bin/semver
-  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
+    semver: bin/semver
+  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
   languageName: node
   linkType: hard
 
-"semver@npm:^7.2, semver@npm:^7.3.5":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
-  dependencies:
-    lru-cache: ^6.0.0
+"semver@npm:^6.3.0, semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
   bin:
     semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
   languageName: node
   linkType: hard
 
-"semver@npm:~7.2.0":
-  version: 7.2.3
-  resolution: "semver@npm:7.2.3"
+"semver@npm:^7.2, semver@npm:^7.3.5, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:~7.5.0, semver@npm:~7.5.4":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
+  dependencies:
+    lru-cache: ^6.0.0
   bin:
     semver: bin/semver.js
-  checksum: e6a27b19853bb07829f863782647408afc20698f6a2b2cce9c60d1f4465cfc38848c47d9e8bbadc48dd62d096b9a4e7fd841e91274f307cb3a9d83a381c10b26
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
   languageName: node
   linkType: hard
 
@@ -5102,6 +4986,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"signal-exit@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
+  languageName: node
+  linkType: hard
+
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -5123,17 +5014,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:5, socks-proxy-agent@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "socks-proxy-agent@npm:5.0.1"
-  dependencies:
-    agent-base: ^6.0.2
-    debug: 4
-    socks: ^2.3.3
-  checksum: 1b60c4977b2fef783f0fc4dc619cd2758aafdb43f3cf679f1e3627cb6c6e752811cee5513ebb4157ad26786033d2f85029440f197d321e8293b38cc5aab01e06
-  languageName: node
-  linkType: hard
-
 "socks-proxy-agent@npm:^7.0.0":
   version: 7.0.0
   resolution: "socks-proxy-agent@npm:7.0.0"
@@ -5145,7 +5025,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks@npm:^2.3.3, socks@npm:^2.6.2":
+"socks-proxy-agent@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "socks-proxy-agent@npm:8.0.2"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    socks: ^2.7.1
+  checksum: 4fb165df08f1f380881dcd887b3cdfdc1aba3797c76c1e9f51d29048be6e494c5b06d68e7aea2e23df4572428f27a3ec22b3d7c75c570c5346507433899a4b6d
+  languageName: node
+  linkType: hard
+
+"socks@npm:^2.6.2, socks@npm:^2.7.1":
   version: 2.7.1
   resolution: "socks@npm:2.7.1"
   dependencies:
@@ -5196,12 +5087,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "ssri@npm:9.0.1"
+"ssri@npm:^10.0.0":
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
   dependencies:
-    minipass: ^3.1.1
-  checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb
+    minipass: ^7.0.3
+  checksum: 0a31b65f21872dea1ed3f7c200d7bc1c1b91c15e419deca14f282508ba917cbb342c08a6814c7f68ca4ca4116dd1a85da2bbf39227480e50125a1ceffeecb750
   languageName: node
   linkType: hard
 
@@ -5231,7 +5122,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
   version: 4.2.3
   resolution: "string-width@npm:4.2.3"
   dependencies:
@@ -5242,6 +5133,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
 "string_decoder@npm:^1.1.1":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
@@ -5251,14 +5153,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string_decoder@npm:~0.10.x":
-  version: 0.10.31
-  resolution: "string_decoder@npm:0.10.31"
-  checksum: fe00f8e303647e5db919948ccb5ce0da7dea209ab54702894dd0c664edd98e5d4df4b80d6fabf7b9e92b237359d21136c95bf068b2f7760b772ca974ba970202
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
   version: 6.0.1
   resolution: "strip-ansi@npm:6.0.1"
   dependencies:
@@ -5267,6 +5162,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-ansi@npm:^7.0.1":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
+  dependencies:
+    ansi-regex: ^6.0.1
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
+  languageName: node
+  linkType: hard
+
 "strip-bom@npm:^4.0.0":
   version: 4.0.0
   resolution: "strip-bom@npm:4.0.0"
@@ -5323,8 +5227,8 @@ __metadata:
   linkType: hard
 
 "systeminformation@npm:^5.7":
-  version: 5.17.8
-  resolution: "systeminformation@npm:5.17.8"
+  version: 5.21.11
+  resolution: "systeminformation@npm:5.21.11"
   bin:
     systeminformation: lib/cli.js
   conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
@@ -5332,16 +5236,16 @@ __metadata:
   linkType: hard
 
 "tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.1.13
-  resolution: "tar@npm:6.1.13"
+  version: 6.2.0
+  resolution: "tar@npm:6.2.0"
   dependencies:
     chownr: ^2.0.0
     fs-minipass: ^2.0.0
-    minipass: ^4.0.0
+    minipass: ^5.0.0
     minizlib: ^2.1.1
     mkdirp: ^1.0.3
     yallist: ^4.0.0
-  checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c
+  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
   languageName: node
   linkType: hard
 
@@ -5356,10 +5260,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-lru@npm:10.3.0":
-  version: 10.3.0
-  resolution: "tiny-lru@npm:10.3.0"
-  checksum: cf5ae030c729293a319c989a03d97396197b74290a014c28ba2f6303b019078fd64174e9a96c5ca5c8b5ee796c1393a6a48240503cab444e654f14dc58b53599
+"tiny-lru@npm:10.4.1":
+  version: 10.4.1
+  resolution: "tiny-lru@npm:10.4.1"
+  checksum: ec2ce11278ff5ecd094823d9d6fcc16fe0aa250bf25cb533d40b997452a113a9ecd9cccbf503ac459a17bb812d94c5ef05cbdfe94b5b8ad03d7cf4fadb78a905
   languageName: node
   linkType: hard
 
@@ -5401,9 +5305,9 @@ __metadata:
   linkType: hard
 
 "tslib@npm:^2.0.1":
-  version: 2.5.0
-  resolution: "tslib@npm:2.5.0"
-  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
   languageName: node
   linkType: hard
 
@@ -5423,15 +5327,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-check@npm:~0.3.2":
-  version: 0.3.2
-  resolution: "type-check@npm:0.3.2"
-  dependencies:
-    prelude-ls: ~1.1.2
-  checksum: dd3b1495642731bc0e1fc40abe5e977e0263005551ac83342ecb6f4f89551d106b368ec32ad3fb2da19b3bd7b2d1f64330da2ea9176d8ddbfe389fb286eb5124
-  languageName: node
-  linkType: hard
-
 "type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
@@ -5456,23 +5351,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.1.3":
-  version: 5.1.3
-  resolution: "typescript@npm:5.1.3"
+"typescript@npm:5.2.2":
+  version: 5.2.2
+  resolution: "typescript@npm:5.2.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: d9d51862d98efa46534f2800a1071a613751b1585dc78884807d0c179bcd93d6e9d4012a508e276742f5f33c480adefc52ffcafaf9e0e00ab641a14cde9a31c7
+  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@5.1.3#~builtin<compat/typescript>":
-  version: 5.1.3
-  resolution: "typescript@patch:typescript@npm%3A5.1.3#~builtin<compat/typescript>::version=5.1.3&hash=a1c5e5"
+"typescript@patch:typescript@5.2.2#~builtin<compat/typescript>":
+  version: 5.2.2
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 32a25b2e128a4616f999d4ee502aabb1525d5647bc8955e6edf05d7fbc53af8aa98252e2f6ba80bcedfc0260c982b885f3c09cfac8bb65d2924f3133ad1e1e62
+  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
   languageName: node
   linkType: hard
 
@@ -5494,21 +5389,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-filename@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unique-filename@npm:2.0.1"
-  dependencies:
-    unique-slug: ^3.0.0
-  checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
+"undici-types@npm:~5.25.1":
+  version: 5.25.3
+  resolution: "undici-types@npm:5.25.3"
+  checksum: ec9d2cc36520cbd9fbe3b3b6c682a87fe5be214699e1f57d1e3d9a2cb5be422e62735f06e0067dc325fd3dd7404c697e4d479f9147dc8a804e049e29f357f2ff
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^3.0.0":
+"unique-filename@npm:^3.0.0":
   version: 3.0.0
-  resolution: "unique-slug@npm:3.0.0"
+  resolution: "unique-filename@npm:3.0.0"
+  dependencies:
+    unique-slug: ^4.0.0
+  checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
+  languageName: node
+  linkType: hard
+
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
   dependencies:
     imurmurhash: ^0.1.4
-  checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c
+  checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15
   languageName: node
   linkType: hard
 
@@ -5533,17 +5435,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.9":
-  version: 1.0.10
-  resolution: "update-browserslist-db@npm:1.0.10"
+"update-browserslist-db@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "update-browserslist-db@npm:1.0.13"
   dependencies:
     escalade: ^3.1.1
     picocolors: ^1.0.0
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
-    browserslist-lint: cli.js
-  checksum: 12db73b4f63029ac407b153732e7cd69a1ea8206c9100b482b7d12859cd3cd0bc59c602d7ae31e652706189f1acb90d42c53ab24a5ba563ed13aebdddc5561a0
+    update-browserslist-db: cli.js
+  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
   languageName: node
   linkType: hard
 
@@ -5571,13 +5473,13 @@ __metadata:
   linkType: hard
 
 "v8-to-istanbul@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "v8-to-istanbul@npm:9.0.1"
+  version: 9.1.3
+  resolution: "v8-to-istanbul@npm:9.1.3"
   dependencies:
     "@jridgewell/trace-mapping": ^0.3.12
     "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^1.6.0
-  checksum: a49c34bf0a3af0c11041a3952a2600913904a983bd1bc87148b5c033bc5c1d02d5a13620fcdbfa2c60bc582a2e2970185780f0c844b4c3a220abf405f8af6311
+    convert-source-map: ^2.0.0
+  checksum: 5d592ab3d186b386065dace8e01c543a922a904b3cfac39667de172455a6b3d0e8e1401574fecb8a12092ad0809b5a8fd15f1cc14d0666139a1bb77cd6ac2cf8
   languageName: node
   linkType: hard
 
@@ -5600,18 +5502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vm2@npm:^3.9.8":
-  version: 3.9.18
-  resolution: "vm2@npm:3.9.18"
-  dependencies:
-    acorn: ^8.7.0
-    acorn-walk: ^8.2.0
-  bin:
-    vm2: bin/vm2
-  checksum: 1b5b20419a5cef19ab6c95d319c27d625b995785696582e6bec86a4b27704028f07b44dc04a7439a407c1bf8c17997c1aecf01886bb8b0e4e1a9b8c916977089
-  languageName: node
-  linkType: hard
-
 "walk@npm:2.3.15":
   version: 2.3.15
   resolution: "walk@npm:2.3.15"
@@ -5654,15 +5544,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "wire-web-server@workspace:."
   dependencies:
-    "@types/express": 4.17.17
-    "@types/express-sitemap-xml": 3.0.1
-    "@types/express-useragent": 1.0.2
-    "@types/fs-extra": 11.0.1
+    "@types/express": 4.17.19
+    "@types/express-sitemap-xml": 3.0.3
+    "@types/express-useragent": 1.0.4
+    "@types/fs-extra": 11.0.3
     "@types/geolite2": 2.0.0
-    "@types/hbs": 4.0.1
-    "@types/jest": ^29.5.2
+    "@types/hbs": 4.0.3
+    "@types/jest": ^29.5.6
     "@types/node": 18.11.18
-    "@wireapp/commons": 5.1.0
+    "@wireapp/commons": 5.2.1
     dotenv: 16.3.1
     dotenv-extended: 2.9.0
     express: 4.18.2
@@ -5671,26 +5561,19 @@ __metadata:
     fs-extra: 11.1.1
     geolite2: 1.3.0
     hbs: 4.2.0
-    helmet: 6.1.5
-    http-status-codes: 2.2.0
-    jest: 29.5.0
+    helmet: 7.0.0
+    http-status-codes: 2.3.0
+    jest: 29.7.0
     logdown: 3.3.1
-    maxmind: 4.3.9
-    nocache: 3.0.4
+    maxmind: 4.3.10
+    nocache: 4.0.0
     opn: 6.0.0
     pm2: 5.3.0
     rimraf: 4.4.1
-    typescript: 5.1.3
+    typescript: 5.2.2
   languageName: unknown
   linkType: soft
 
-"word-wrap@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "word-wrap@npm:1.2.3"
-  checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
-  languageName: node
-  linkType: hard
-
 "wordwrap@npm:^1.0.0":
   version: 1.0.0
   resolution: "wordwrap@npm:1.0.0"
@@ -5698,7 +5581,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
   version: 7.0.0
   resolution: "wrap-ansi@npm:7.0.0"
   dependencies:
@@ -5709,6 +5592,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
+  dependencies:
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
+  languageName: node
+  linkType: hard
+
 "wrappy@npm:1":
   version: 1.0.2
   resolution: "wrappy@npm:1.0.2"
@@ -5763,13 +5657,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xregexp@npm:2.0.0":
-  version: 2.0.0
-  resolution: "xregexp@npm:2.0.0"
-  checksum: de62d1f01c9f1a67c80cafe48a3dc081b324249a0e88e65dc9acae9cce6d8e63c9d91c0f97e2ad2d8c5351c856c139c04dc55ebd941e59b7d1d5c1169e164cff
-  languageName: node
-  linkType: hard
-
 "y18n@npm:^5.0.5":
   version: 5.0.8
   resolution: "y18n@npm:5.0.8"
@@ -5812,8 +5699,8 @@ __metadata:
   linkType: hard
 
 "yargs@npm:^17.3.1":
-  version: 17.6.2
-  resolution: "yargs@npm:17.6.2"
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
   dependencies:
     cliui: ^8.0.1
     escalade: ^3.1.1
@@ -5822,7 +5709,7 @@ __metadata:
     string-width: ^4.2.3
     y18n: ^5.0.5
     yargs-parser: ^21.1.1
-  checksum: 47da1b0d854fa16d45a3ded57b716b013b2179022352a5f7467409da5a04a1eef5b3b3d97a2dfc13e8bbe5f2ffc0afe3bc6a4a72f8254e60f5a4bd7947138643
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
   languageName: node
   linkType: hard
 
diff --git a/src/__mocks__/@wireapp/core-crypto.ts b/src/__mocks__/@wireapp/core-crypto.ts
index 117b8ab4b75..0f1756edff7 100644
--- a/src/__mocks__/@wireapp/core-crypto.ts
+++ b/src/__mocks__/@wireapp/core-crypto.ts
@@ -27,3 +27,17 @@ export enum RatchetTreeType {
   Delta = 2,
   ByRef = 3,
 }
+export enum Ciphersuite {
+  MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519 = 1,
+  MLS_128_DHKEMP256_AES128GCM_SHA256_P256 = 2,
+  MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519 = 3,
+  MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448 = 4,
+  MLS_256_DHKEMP521_AES256GCM_SHA512_P521 = 5,
+  MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448 = 6,
+  MLS_256_DHKEMP384_AES256GCM_SHA384_P384 = 7,
+  MLS_128_X25519KYBER768DRAFT00_AES128GCM_SHA256_Ed25519 = 61489,
+}
+export enum CredentialType {
+  Basic = 1,
+  X509 = 2,
+}
diff --git a/src/__mocks__/@wireapp/core.ts b/src/__mocks__/@wireapp/core.ts
index 9f13a066c3d..edf45749d6f 100644
--- a/src/__mocks__/@wireapp/core.ts
+++ b/src/__mocks__/@wireapp/core.ts
@@ -17,6 +17,8 @@
  *
  */
 
+import {TaskScheduler} from '@wireapp/core/lib/util';
+
 import {EventEmitter} from 'stream';
 
 export class Account extends EventEmitter {
@@ -24,6 +26,11 @@ export class Account extends EventEmitter {
     federationEndpoints: true,
   };
 
+  recurringTaskScheduler = {
+    registerTask: jest.fn(),
+    cancelTask: jest.fn(),
+  };
+
   configureMLSCallbacks = jest.fn();
 
   service = {
@@ -35,22 +42,34 @@ export class Account extends EventEmitter {
       renewKeyMaterial: jest.fn(),
       getClientIds: jest.fn(),
       getEpoch: jest.fn(),
+      conversationExists: jest.fn(),
       exportSecretKey: jest.fn(),
       leaveConferenceSubconversation: jest.fn(),
       on: this.on,
       emit: this.emit,
       off: this.off,
+      scheduleKeyMaterialRenewal: jest.fn(),
     },
     asset: {
       uploadAsset: jest.fn(),
     },
     conversation: {
       send: jest.fn(),
-      isMLSConversationEstablished: jest.fn(),
+      mlsGroupExistsLocally: jest.fn(),
+      joinByExternalCommit: jest.fn(),
       addUsersToMLSConversation: jest.fn(),
       messageTimer: {
         setConversationLevelTimer: jest.fn(),
       },
+      removeUsersFromMLSConversation: jest.fn(),
+      removeUserFromConversation: jest.fn(),
+    },
+    client: {
+      deleteClient: jest.fn(),
     },
   };
 }
+
+export const util = {
+  TaskScheduler,
+};
diff --git a/src/i18n/ar-SA.json b/src/i18n/ar-SA.json
index 17f0e457ef1..bc555c0f4a7 100644
--- a/src/i18n/ar-SA.json
+++ b/src/i18n/ar-SA.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "اسم المستخدم هذا غير صالح",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "التالي",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "إضافة",
   "addParticipantsHeader": "أضف أشخاصًا",
   "addParticipantsHeaderWithCounter": "أضف أشخاصًا ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "تحقق من بريدك الإلكتروني الوارد واتبع الإرشادات التي تظهر.",
   "authPostedResendHeadline": "وصلك بريد",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "إضافة",
   "authVerifyAccountDetail": "هذا يمكنك من استخدام واير على أجهزة متعددة.",
   "authVerifyAccountHeadline": "إضافة عنوان البريد الإلكتروني وكلمة المرور",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "يمكنك طلب كودًا جديدًا {{expiration}}.",
   "authVerifyPasswordHeadline": "أدخل كلمة المرور الخاصة بك",
   "backupCancel": "إلغاء",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "لا يمكن حفظ الملف",
   "backupExportGenericErrorSecondary": "لم يكتمل النسخ الاحتياطي.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "يمكنك استخدام هذا لاستعادة التاريخ إذا فقدت حاسوبك أو انتقلت إلى حاسوب جديد.",
   "backupImportAccountErrorHeadline": "نسخة احتياطية خاطئة",
   "backupImportAccountErrorSecondary": "لا يمكنك استعادة تاريخ من حساب مختلف.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "حدث خطأ ما",
   "backupImportGenericErrorSecondary": "لا يمكن استعادة تاريخك.",
   "backupImportIncompatibleErrorHeadline": "نسخة احتياطية خاطئة",
   "backupImportIncompatibleErrorSecondary": "لا يمكنك استعادة تاريخ من حساب مختلف.",
-  "backupImportOutdatedErrorHeadline": "نسخة احتياطية غير متوافقة",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "يجري الإعداد…",
   "backupImportProgressSecondary": "يستعيد التاريخ · {{processed}} من {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "اُستعيد التاريخ.",
   "backupImportVersionErrorHeadline": "نسخة احتياطية غير متوافقة",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "حاول مرة أخرى",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "قبول",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "التحقق من الأجهزة",
   "conversationDeviceStartedUsingMany": " بدأ باستخدام",
   "conversationDeviceStartedUsingOne": " بدأ باستخدام",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " الأجهزة الخاصة بك",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "ضيف",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "انضم إلى المحادثة",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "هل لديك أصلا حساب؟",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "إنشاء حساب",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "تسجيل الدخول",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "اسمك",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} شخص",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "افتح الخريطة",
   "conversationMemberJoined": "[bold]{{name}}[/bold] اضاف {{users}} للمحادثه",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "وصلت",
   "conversationMissedMessages": "لم تستخدم هذا الجهاز منذ مدة. ربما لن تظهر بعض الرسائل هنا.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "البحث بحسب الاسم",
   "conversationParticipantsTitle": "أشخاص",
   "conversationPing": "بينغ",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": "بينغ",
   "conversationPlaybackError": "غير قادر على التشغيل",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • عبر giphy.com",
   "extensionsGiphyNoGifs": "عفوا، لا توجد صور متحركة  gifs",
   "extensionsGiphyRandom": "عشوائي",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "حروف كثيرة جدا",
   "groupCreationPreferencesErrorNameShort": "على الأقل حرف واحد",
   "groupCreationPreferencesHeader": "أنشئ مجموعة",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "اسم المجموعة",
   "groupParticipantActionBlock": "احظر جهة الاتصال…",
   "groupParticipantActionCancelRequest": "ألغِ الطلب…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "التفاصيل",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "موافق",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "إزالة",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "إزالة؟",
   "modalConversationRemoveMessage": "لن يستطيع {{user}} أن يرسل أو يستقبل رسائل في هذه المحادثة.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "احظر {{user}}؟",
   "modalUserBlockMessage": "لن يستطيع {{user}} التواصل معك أو إضافتك إلى محادثات جماعية.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "إلغاء حظر",
   "modalUserUnblockHeadline": "إلغاء الحظر؟",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "اتصل بك",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "التاريخ",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "اكتشاف الأخطاء وإصلاحها",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/bn-BD.json b/src/i18n/bn-BD.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/bn-BD.json
+++ b/src/i18n/bn-BD.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ca-ES.json b/src/i18n/ca-ES.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/ca-ES.json
+++ b/src/i18n/ca-ES.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/cs-CZ.json b/src/i18n/cs-CZ.json
index 8e01057e820..310fe0524d8 100644
--- a/src/i18n/cs-CZ.json
+++ b/src/i18n/cs-CZ.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Prosím, ověřte své údaje a zkuste to znovu",
   "BackendError.LABEL.ALREADY_INVITED": "Tento e-mail již byl pozván",
-  "BackendError.LABEL.BAD_REQUEST": "Neplatný vstup",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Tato e-mailová adresa není povolena",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Toto telefonní číslo není povoleno",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Tato konverzace dosáhla limitu účastníků",
   "BackendError.LABEL.EMAIL_EXISTS": "Tato e-mailová adresa je již používána. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Toto uživatelské jméno je již obsazeno",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Prosím, zadejte uživatelské jméno s alespoň 2 znaky",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Neplatné uživatelské jméno",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Pozvání bylo odvoláno nebo vypršelo",
   "BackendError.LABEL.INVALID_OPERATION": "Neplatná operace",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Neplatný vstup",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Telefonní číslo je neplatné",
   "BackendError.LABEL.KEY_EXISTS": "Tato e-mailová adresa je již zaregistrována. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Zkontrolujte své údaje a zkuste znovu",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Další",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Přidat",
   "addParticipantsHeader": "Přidat účastníky",
   "addParticipantsHeaderWithCounter": "Přidat účastníky ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Zkontrolujte doručenou poštu a postupujte dle instrukcí.",
   "authPostedResendHeadline": "Přišel ti email.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Přidat",
   "authVerifyAccountDetail": "To umožňuje používat {{brandName}} na více zařízeních.",
   "authVerifyAccountHeadline": "Přidat emailovou adresu a heslo.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Můžete si vyžádat nový kód {{expiration}}.",
   "authVerifyPasswordHeadline": "Zadejte své heslo",
   "backupCancel": "Zrušit",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Soubor nelze uložit",
   "backupExportGenericErrorSecondary": "Záloha nebyla dokončena.",
   "backupExportProgressCompressing": "Připravuje se soubor zálohy",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Nesprávná záloha",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Něco se pokazilo",
   "backupImportGenericErrorSecondary": "Vaše historie nemohla být obnovena.",
   "backupImportIncompatibleErrorHeadline": "Nesprávná záloha",
   "backupImportIncompatibleErrorSecondary": "Nelze obnovit historii z jiného účtu.",
-  "backupImportOutdatedErrorHeadline": "Nekompatibilní záloha",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Připravuje se…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Zkusit znovu",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Přijmout",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " ověřit zařízení",
   "conversationDeviceStartedUsingMany": " začal(a) používat",
   "conversationDeviceStartedUsingOne": " začal(a) používat",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " neověřen jeden ze",
   "conversationDeviceUserDevices": " přístroje uživatele {{user}}",
   "conversationDeviceYourDevices": " vaše přístroje",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Host",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Přihlásit se",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} lidí",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Otevřít mapu",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Doručeno",
   "conversationMissedMessages": "Toto zařízení jste nějakou dobu nepoužíval(a). Některé zprávy se nemusí zobrazit.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Hledat podle jména",
   "conversationParticipantsTitle": "Kontakty",
   "conversationPing": " pingl(a)",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingl(a)",
   "conversationPlaybackError": "Nelze přehrát",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • přes giphy.com",
   "extensionsGiphyNoGifs": "Uups, žádné gify",
   "extensionsGiphyRandom": "Náhodně",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Příliš mnoho znaků",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Vytvořit skupinu",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Název skupiny",
   "groupParticipantActionBlock": "Zablokovat…",
   "groupParticipantActionCancelRequest": "Zrušit žádost",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Odstranit",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Odstranit?",
   "modalConversationRemoveMessage": "{{user}} nebude moci odesílat nebo přijímat zprávy v této konverzaci.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokovat {{user}}?",
   "modalUserBlockMessage": "{{user}} vás nebude moci kontaktovat nebo přizvat ke skupinové konverzaci.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Odblokovat",
   "modalUserUnblockHeadline": "Odblokovat?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Volal(a)",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/da-DK.json b/src/i18n/da-DK.json
index ef2745c9730..8c224ee8ae4 100644
--- a/src/i18n/da-DK.json
+++ b/src/i18n/da-DK.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Næste",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Tilføj",
   "addParticipantsHeader": "Tilføj personer",
   "addParticipantsHeaderWithCounter": "Tilføj personer ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Tjek din email indbakke og følg anvisningerne.",
   "authPostedResendHeadline": "Du har post.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Tilføj",
   "authVerifyAccountDetail": "Dette gør, at du kan bruge {{brandName}} på flere enheder.",
   "authVerifyAccountHeadline": "Tilføj email adresse og adgangskode.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Du kan anmode om en ny kode {{expiration}}.",
   "authVerifyPasswordHeadline": "Indtast din adgangskode",
   "backupCancel": "Annuller",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Filen kunne ikke gemmes",
   "backupExportGenericErrorSecondary": "Sikkerhedskopiering blev ikke færdiggjort.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Du kan bruge dette til at gendanne din historik hvis du mister din computer eller skifter til en ny.",
   "backupImportAccountErrorHeadline": "Forkert sikkerhedskopi",
   "backupImportAccountErrorSecondary": "Du kan ikke gendanne historik fra en anden konto.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Noget gik galt",
   "backupImportGenericErrorSecondary": "Din historik kunne ikke gendannes.",
   "backupImportIncompatibleErrorHeadline": "Forkert sikkerhedskopi",
   "backupImportIncompatibleErrorSecondary": "Du kan ikke gendanne historik fra en anden konto.",
-  "backupImportOutdatedErrorHeadline": "Ukompatibel sikkerhedskopi",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Forbereder…",
   "backupImportProgressSecondary": "Gendanner historik · {{processed}} af {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Historik gendannet.",
   "backupImportVersionErrorHeadline": "Ukompatibel sikkerhedskopi",
   "backupImportVersionErrorSecondary": "Denne sikkerhedskopi er lavet på en nyere eller uddateret version af {{brandName}} og kan ikke blive gendannet her.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Prøv Igen",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Besvar",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verificer enheder",
   "conversationDeviceStartedUsingMany": " begyndte at bruge",
   "conversationDeviceStartedUsingOne": " begyndte at bruge",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " har afbekræftet en af",
   "conversationDeviceUserDevices": " {{user}}’s enheder",
   "conversationDeviceYourDevices": " dine enheder",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gæst",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Opret en konto",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log ind",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} personer",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Åben Kort",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Leveret",
   "conversationMissedMessages": "Du har ikke brugt denne enhed i et stykke tid. Nogle meddelelser vises måske ikke her.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Søg ved navn",
   "conversationParticipantsTitle": "Personer",
   "conversationPing": " pingede",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingede",
   "conversationPlaybackError": "Ikke i stand til at afspille",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Ups, ingen gifs",
   "extensionsGiphyRandom": "Tilfældig",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "For mange tegn",
   "groupCreationPreferencesErrorNameShort": "Mindst 1 tegn",
   "groupCreationPreferencesHeader": "Opret gruppe",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Gruppenavn",
   "groupParticipantActionBlock": "Bloker kontakt…",
   "groupParticipantActionCancelRequest": "Annuller anmodning",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Fjern",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Fjern?",
   "modalConversationRemoveMessage": "{{user}} vil ikke være i stand til at sende eller modtage beskeder i denne samtale.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Tilbagekalde link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokkér {{user}}?",
   "modalUserBlockMessage": "{{user}} vil ikke kunne kontakte dig eller tilføje dig til gruppesamtaler.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Fjern Blokering",
   "modalUserUnblockHeadline": "Fjern Blokering?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Ringede",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Historik",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Du kan kun gendanne historik fra en sikkerhedskopi til den samme platform. Din sikkerhedskopi vil overskrive samtaler du allerede har på denne enhed.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Fejlfinding",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/de-DE.json b/src/i18n/de-DE.json
index 3c0e47c8ee5..e1fd7fba54b 100644
--- a/src/i18n/de-DE.json
+++ b/src/i18n/de-DE.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Bitte Eingaben überprüfen und nochmal versuchen",
   "BackendError.LABEL.ALREADY_INVITED": "Diese E-Mail-Adresse wurde bereits eingeladen",
-  "BackendError.LABEL.BAD_REQUEST": "Ungültige Eingabe",
+  "BackendError.LABEL.BAD_REQUEST": "Bitte Eingaben überprüfen und nochmal versuchen",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Diese E-Mail-Adresse ist nicht zulässig",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Diese Telefonnummer ist nicht zulässig",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Bitte erneut versuchen oder anderen Code anfordern.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Diese Unterhaltung hat die Grenze der Teilnehmeranzahl erreicht",
   "BackendError.LABEL.EMAIL_EXISTS": "Die angegebene E-Mail-Adresse wird bereits verwendet. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "Sie können Ihren Benutzernamen nicht verwenden, da die Zwei-Faktor-Authentifizierung aktiviert ist. Bitte melden Sie sich stattdessen mit Ihrer E-Mail-Adresse an.",
   "BackendError.LABEL.HANDLE_EXISTS": "Dieser Benutzername ist bereits vergeben",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Bitte einen Benutzernamen mit mindestens zwei Zeichen eingeben",
   "BackendError.LABEL.INVALID_CODE": "Bitte erneut versuchen oder anderen Code anfordern.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Dieser Benutzername ist ungültig",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Einladung wurde widerrufen oder ist abgelaufen",
   "BackendError.LABEL.INVALID_OPERATION": "Ungültiger Vorgang",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Ungültige Eingabe",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Bitte Eingaben überprüfen und nochmal versuchen",
   "BackendError.LABEL.INVALID_PHONE": "Diese Telefonnummer ist ungültig",
   "BackendError.LABEL.KEY_EXISTS": "Die angegebene E-Mail-Adresse wurde bereits registriert. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Bitte Eingaben überprüfen und nochmal versuchen",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Zurück zu Unterhaltungsinfo",
   "accessibility.conversation.sectionLabel": "Unterhaltungsliste",
   "accessibility.conversationAssetImageAlt": "Bild von {{username}} vom {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Messaging-Optionen öffnen",
+  "accessibility.conversationContextMenuOpenLabel": "Weitere Optionen öffnen",
   "accessibility.conversationDetailsActionDevicesLabel": "Geräte anzeigen",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Als Gruppen-Admin festlegen",
   "accessibility.conversationDetailsActionNotificationsLabel": "Einstellungen für Benachrichtigungen anzeigen",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Verpasster Ping",
   "accessibility.conversationStatusUnreadReply": "Ungelesene Antwort",
   "accessibility.conversationTitle": "{{username}} Status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Emoji suchen",
   "accessibility.giphyModal.close": "Fenster 'GIF' schließen",
   "accessibility.giphyModal.loading": "Gif laden",
   "accessibility.giphyModal.selectGif": "Gif auswählen",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Einstellungen – Geräte",
   "accessibility.headings.preferencesOptions": "Einstellungen – Optionen",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Emoji auswählen",
+  "accessibility.messageActionsMenuLabel": "Nachrichtenaktionen",
+  "accessibility.messageActionsMenuLike": "Mit Herz reagieren",
+  "accessibility.messageActionsMenuThumbsUp": "Mit Daumen hoch reagieren",
   "accessibility.messageDetailsReadReceipts": "Nachricht von {{readReceiptText}} gelesen, Details öffnen",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} Reaktionen, reagiere mit {{emojiName}} Emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} Reaktion, reagiere mit {{emojiName}} Emoji",
   "accessibility.messages.like": "Nachricht gefällt mir",
   "accessibility.messages.liked": "Nachricht gefällt mir nicht mehr",
   "accessibility.openConversation": "Profil von {{name}} öffnen",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Weiter",
   "accountForm.terms": "Ich akzeptiere die <terms>Nutzungsbedingungen</terms>",
   "accountForm.termsAndPrivacyPolicy": "Ich akzeptiere die <privacypolicy>Datenschutzerklärung</privacypolicy> und <terms>Nutzungsbedingungen</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Wiederholen",
+  "acme.error.button.secondary": "Abbrechen",
+  "acme.error.headline": "Ein Fehler ist aufgetreten",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Zertifikat erhalten",
+  "acme.inProgress.paragraph.alt": "Herunterladen…",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Zertifikat erhalten",
+  "acme.settingsChanged.button.secondary": "Später erinnern",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team-Einstellungen geändert",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Hinzufügen",
   "addParticipantsHeader": "Teilnehmer hinzufügen",
   "addParticipantsHeaderWithCounter": "Teilnehmer hinzufügen ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Überprüfen Sie Ihren Posteingang und folgen Sie den Anweisungen.",
   "authPostedResendHeadline": "Posteingang prüfen",
   "authSSOLoginTitle": "Mit Single Sign-On anmelden",
+  "authSetUsername": "Benutzernamen festlegen",
   "authVerifyAccountAdd": "Hinzufügen",
   "authVerifyAccountDetail": "Dadurch ist {{brandName}} auf mehreren Geräten nutzbar.",
   "authVerifyAccountHeadline": "E-Mail-Adresse und Passwort hinzufügen.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Du kannst {{expiration}} einen neuen Code anfordern.",
   "authVerifyPasswordHeadline": "Passwort eingeben",
   "backupCancel": "Abbrechen",
+  "backupDecryptionModalAction": "Weiter",
+  "backupDecryptionModalMessage": "Das Backup ist passwortgeschützt.",
+  "backupDecryptionModalPlaceholder": "Passwort",
+  "backupDecryptionModalTitle": "Passwort eingeben",
+  "backupEncryptionModalAction": "Jetzt sichern",
+  "backupEncryptionModalCloseBtn": "Abbrechen",
+  "backupEncryptionModalMessage": "Das Backup wird komprimiert und Sie können es mit einem Passwort verschlüsseln.",
+  "backupEncryptionModalPlaceholder": "Passwort (optional)",
+  "backupEncryptionModalTitle": "Passwort festlegen",
   "backupExportGenericErrorHeadline": "Datei nicht gespeichert",
   "backupExportGenericErrorSecondary": "Das Backup wurde nicht abgeschlossen.",
   "backupExportProgressCompressing": "Backup-Datei wird erstellt",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Damit können Sie den Gesprächsverlauf wiederherstellen, wenn Sie Ihren Computer verlieren oder einen neuen verwenden.",
   "backupImportAccountErrorHeadline": "Falsches Backup",
   "backupImportAccountErrorSecondary": "Der Gesprächsverlauf eines anderen Kontos kann nicht wiederhergestellt werden.",
+  "backupImportFormatErrorHeadline": "Inkompatibles Backup",
+  "backupImportFormatErrorSecondary": "Das angegebene Backup-Format wird nicht unterstützt",
   "backupImportGenericErrorHeadline": "Fehler aufgetreten",
   "backupImportGenericErrorSecondary": "Der Gesprächsverlauf konnte nicht wiederhergestellt werden.",
   "backupImportIncompatibleErrorHeadline": "Falsches Backup",
   "backupImportIncompatibleErrorSecondary": "Der Gesprächsverlauf eines anderen Benutzerkontos kann nicht wiederhergestellt werden.",
-  "backupImportOutdatedErrorHeadline": "Inkompatibles Backup",
+  "backupImportPasswordErrorHeadline": "Falsches Passwort",
+  "backupImportPasswordErrorSecondary": "Bitte überprüfen Sie Ihre Eingabe und versuchen Sie es erneut",
   "backupImportProgressHeadline": "Vorbereiten…",
   "backupImportProgressSecondary": "Gesprächsverlauf wiederherstellen · {{processed}} von {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Gesprächsverlauf wiederhergestellt.",
   "backupImportVersionErrorHeadline": "Inkompatibles Backup",
   "backupImportVersionErrorSecondary": "Diese Backup-Datei wurde von einer anderen Version von {{brandName}} erstellt und kann deshalb nicht wiederhergestellt werden.",
+  "backupPasswordHint": "Verwenden Sie mindestens {{minPasswordLength}} Zeichen, mit einem Kleinbuchstaben, einem Großbuchstaben, einer Zahl und einem Sonderzeichen.",
   "backupTryAgain": "Erneut versuchen",
   "buttonActionError": "Ihre Antwort wurde nicht gesendet, bitte erneut versuchen.",
   "callAccept": "Annehmen",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Geräte überprüfen",
   "conversationDeviceStartedUsingMany": " haben begonnen,",
   "conversationDeviceStartedUsingOne": " hat begonnen,",
+  "conversationDeviceStartedUsingYou": " haben begonnen,",
   "conversationDeviceUnverified": " haben die Überprüfung für",
   "conversationDeviceUserDevices": " ein Gerät von {{user}} widerrufen",
   "conversationDeviceYourDevices": " eines Ihrer Geräte widerrufen",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Kontakte",
   "conversationGuestIndicator": "Gast",
   "conversationImageAssetRestricted": "Empfang von Bildern ist verboten",
-  "conversationJoin.buttonExistentAccountOpen": "In {brandName} öffnen",
-  "conversationJoin.existentAccountHeadline": "{name}, Sie wurden zu einer Unterhaltung in {brandName} eingeladen",
+  "conversationJoin.existentAccountJoinInBrowser": "Im Browser beitreten",
   "conversationJoin.existentAccountJoinWithoutLink": "an der Unterhaltung teilnehmen",
-  "conversationJoin.existentAccountJoinWithoutText": "Ohne ein Benutzerkonto {existentAccountJoinWithoutLink}",
-  "conversationJoin.existentAccountSubhead": "Audio- und Videokonferenzen, Textnachrichten, Teilen von Dateien und Bildschirmfreigabe – alles Ende-zu-Ende verschlüsselt.",
+  "conversationJoin.existentAccountUserName": "Sie sind als {selfName} angemeldet",
   "conversationJoin.fullConversationHeadline": "Sie konnten der Unterhaltung nicht beitreten",
   "conversationJoin.fullConversationSubhead": "Die maximale Teilnehmeranzahl in dieser Unterhaltung wurde erreicht.",
   "conversationJoin.hasAccount": "Bereits registriert?",
-  "conversationJoin.headline": "Sie wurden zu einer Unterhaltung in {brandName} eingeladen",
-  "conversationJoin.invalidCreateAccountLink": "Benutzerkonto erstellen",
-  "conversationJoin.invalidCreateAccountText": "für Gruppenkommunikation und Telefonkonferenzen.",
+  "conversationJoin.headline": "Die Unterhaltung findet auf {{domain}} statt",
   "conversationJoin.invalidHeadline": "Unterhaltung nicht gefunden",
   "conversationJoin.invalidSubhead": "Der Link zu dieser Gruppenunterhaltung ist abgelaufen oder nicht mehr gültig.",
-  "conversationJoin.loginLink": "Anmelden",
+  "conversationJoin.join": "Beitreten",
+  "conversationJoin.joinButton": "Als temporärer Gast teilnehmen",
+  "conversationJoin.joinWithOtherAccount": "Mit anderem Benutzerkonto beitreten",
+  "conversationJoin.mainHeadline": "Unterhaltung beitreten",
   "conversationJoin.namePlaceholder": "Ihr Name",
+  "conversationJoin.noAccountHead": "Sie haben kein Benutzerkonto? ",
   "conversationJoin.subhead": "Nehmen Sie als temporärer Gast an der Unterhaltung teil (Zugang verfällt nach 24 Stunden)",
   "conversationJoin.unsupportedJoinHeadline": "Sie wurden zu einer Unterhaltung in {brandName} eingeladen",
   "conversationJoin.unsupportedJoinMobileSubhead": "Bitte diesen Link auf dem Computer öffnen.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favoriten",
   "conversationLabelGroups": "Gruppen",
   "conversationLabelPeople": "Personen",
-  "conversationLikesCaption": "{{number}} Personen",
+  "conversationLikesCaptionPlural": "{{number}} Personen",
+  "conversationLikesCaptionReactedPlural": "reagierten mit {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reagierte mit {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} Person",
   "conversationLocationLink": "Standort anzeigen",
   "conversationMemberJoined": "[bold]{{name}}[/bold] hat {{users}} hinzugefügt",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] hat {{users}} und [showmore]{{count}} andere[/showmore] hinzugefügt",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] hat {{users}} entfernt",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} wurde aus dieser Unterhaltung entfernt, da die gesetzliche Aufbewahrung aktiviert wurde. [link]Mehr erfahren[/link]",
   "conversationMemberRemovedYou": "[bold]Sie[/bold] haben {{users}} entfernt",
+  "conversationMemberWereRemoved": "{{users}} wurden aus der Unterhaltung entfernt",
   "conversationMessageDelivered": "Zugestellt",
   "conversationMissedMessages": "Sie haben dieses Gerät eine Zeit lang nicht benutzt. Einige Nachrichten werden hier möglicherweise nicht angezeigt.",
   "conversationModalRestrictedFileSharingDescription": "Diese Datei konnte aufgrund von Einschränkungen bei der Dateifreigabe nicht geteilt werden.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Nach Namen suchen",
   "conversationParticipantsTitle": "Unterhaltungsübersicht",
   "conversationPing": " hat gepingt",
+  "conversationPingConfirmTitle": "Sind Sie sicher, dass Sie {{memberCount}} Personen anpingen möchten?",
   "conversationPingYou": " haben gepingt",
   "conversationPlaybackError": "Konnte nicht abgespielt werden",
   "conversationPopoverFavorite": "Zu Favoriten hinzufügen",
@@ -511,13 +557,16 @@
   "extensionsBubbleButtonGif": "Gif",
   "extensionsGiphyButtonMore": "Neues Gif",
   "extensionsGiphyButtonOk": "Senden",
-  "extensionsGiphyMessage": "{{tag}} • über giphy.com",
+  "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Kein GIF vorhanden",
   "extensionsGiphyRandom": "Zufällig",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
-  "failedToAddParticipants": "[bold]{{total}} Teilnehmer[/bold] konnten nicht zur Gruppe hinzugefügt werden.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] und [bold]{{name}}[/bold] konnten nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da das Backend nicht mit den Backends aller Gruppenteilnehmer verbunden ist.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} Teilnehmer[/bold] konnten nicht zur Gruppe hinzugefügt werden.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] und [bold]{{name}}[/bold] konnten nicht zur Gruppe hinzugefügt werden, da ihre Backends nicht miteinander verbunden sind.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] und [bold]{{name}}[/bold] konnten nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da die Backends nicht miteinander verbunden sind.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] konnte nicht zur Gruppe hinzugefügt werden, da das Backend von [bold]{{domain}}[/bold] nicht erreicht werden konnte.",
   "featureConfigChangeModalApplock": "Die verbindliche App-Sperre ist deaktiviert. Sie benötigen kein Kennwort oder keine biometrische Authentifizierung mehr, um die App zu entsperren.",
   "featureConfigChangeModalApplockHeadline": "Team-Einstellungen geändert",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Kamera in Anrufen ist deaktiviert",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Selbstlöschende Nachrichten sind aktiviert. Sie können einen Timer setzen, bevor Sie eine Nachricht schreiben.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Selbstlöschende Nachrichten sind ab jetzt verbindlich. Neue Nachrichten werden nach {{timeout}} gelöscht.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "Es gab eine Änderung bei {{brandName}}",
+  "federationConnectionRemove": "Backends [bold]{{backendUrlOne}}[/bold] und [bold]{{backendUrlTwo}}[/bold] sind nicht mehr verbunden.",
+  "federationDelete": "[bold]Ihr Backend[/bold] ist nicht mehr mit [bold]{{backendUrl}}.[/bold] verbunden.",
   "fileTypeRestrictedIncoming": "Datei von&nbsp;[bold]{{name}}[/bold]&nbsp;kann nicht geöffnet werden",
   "fileTypeRestrictedOutgoing": "Das Senden und Empfangen von Dateien mit der Endung {{fileExt}} ist in Ihrer Organisation nicht erlaubt",
   "folderViewTooltip": "Ordner",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Der eingegebene Gruppenname ist zu lang",
   "groupCreationPreferencesErrorNameShort": "Mindestens 1 Zeichen",
   "groupCreationPreferencesHeader": "Gruppe erstellen",
+  "groupCreationPreferencesNonFederatingEditList": "Teilnehmerliste bearbeiten",
+  "groupCreationPreferencesNonFederatingHeadline": "Gruppe kann nicht erstellt werden",
+  "groupCreationPreferencesNonFederatingLeave": "Gruppenerstellung verwerfen",
+  "groupCreationPreferencesNonFederatingMessage": "Personen der Backends {{backends}} können nicht derselben Gruppenunterhaltung beitreten, da ihre Backends nicht miteinander kommunizieren können. Um die Gruppe zu erstellen, entfernen Sie die betroffenen Teilnehmer. [link]Mehr erfahren[/link]",
   "groupCreationPreferencesPlaceholder": "Gruppenname",
   "groupParticipantActionBlock": "Kontakt blockieren…",
   "groupParticipantActionCancelRequest": "Anfrage abbrechen…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Nachricht konnte aufgrund von Verbindungsproblemen nicht gesendet werden.",
   "messageCouldNotBeSentRetry": "Wiederholen",
   "messageDetailsEdited": "Bearbeitet: {{edited}}",
-  "messageDetailsNoLikes": "Niemand hat diese Nachricht bisher mit Gefällt mir markiert.",
+  "messageDetailsNoReactions": "Niemand hat bisher auf diese Nachricht reagiert.",
   "messageDetailsNoReceipts": "Niemand hat diese Nachricht bisher gelesen.",
   "messageDetailsReceiptsOff": "Lesebestätigungen waren beim Senden dieser Nachricht nicht aktiviert.",
   "messageDetailsSent": "Gesendet: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Gefällt{{count}}",
+  "messageDetailsTitleReactions": "Reaktionen{{count}}",
   "messageDetailsTitleReceipts": "Gelesen{{count}}",
   "messageFailedToSendHideDetails": "Details ausblenden",
   "messageFailedToSendParticipants": "{{count}} Teilnehmer",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "wird Ihre Nachricht nicht erhalten.",
   "messageFailedToSendWillReceivePlural": "werden Ihre Nachricht später erhalten.",
   "messageFailedToSendWillReceiveSingular": "wird Ihre Nachricht später erhalten.",
+  "mlsConversationRecovered": "Sie haben das Gerät eine Weile nicht benutzt oder es ist ein Problem aufgetreten. Einige ältere Nachrichten werden hier eventuell nicht angezeigt.",
   "mlsToggleInfo": "Wenn dies aktiviert ist, wird für die Unterhaltung das neue Messaging-Layer-Security-Protokoll (MLS) verwendet.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "Verstanden",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Status der Dienste konnte nicht geändert werden.",
   "modalConversationRemoveAction": "Entfernen",
   "modalConversationRemoveCloseBtn": "Fenster 'Entfernen' schließen",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Zugang deaktivieren?",
+  "modalConversationRemoveGuestsHeadline": "Gastzugang deaktivieren?",
   "modalConversationRemoveGuestsMessage": "Aktuelle Gäste werden aus der Unterhaltung entfernt. Neue Gäste können nicht hinzugefügt werden.",
+  "modalConversationRemoveGuestsOrServicesAction": "Deaktivieren",
   "modalConversationRemoveHeadline": "Entfernen?",
   "modalConversationRemoveMessage": "{{user}} wird in dieser Unterhaltung keine Nachrichten schicken oder empfangen können.",
+  "modalConversationRemoveServicesHeadline": "Zugang zu Diensten deaktivieren?",
   "modalConversationRemoveServicesMessage": "Aktuelle Dienste werden aus der Unterhaltung entfernt. Neue Dienste können nicht hinzugefügt werden.",
   "modalConversationRevokeLinkAction": "Link widerrufen",
   "modalConversationRevokeLinkCloseBtn": "Fenster 'Link widerrufen' schließen",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} blockieren?",
   "modalUserBlockMessage": "{{user}} wird Sie nicht mehr kontaktieren oder zu Gruppenunterhaltungen hinzufügen können.",
   "modalUserBlockedForLegalHold": "Dieser Nutzer ist aufgrund der gesetzlichen Aufbewahrung gesperrt. [link]Mehr erfahren[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Kontaktanfrage konnte nicht angenommen werden",
   "modalUserCannotBeAddedHeadline": "Gäste können nicht hinzugefügt werden",
-  "modalUserCannotConnectLegalHoldHeadline": "Keine Verbindung zu diesem Benutzer ",
-  "modalUserCannotConnectLegalHoldMessage": "Aufgrund der gesetzlichen Aufbewahrung können Sie sich mit diesem Nutzer nicht verbinden. [link]Mehr erfahren[/link]",
+  "modalUserCannotCancelConnectionMessage": "Kontaktanfrage konnte nicht abgebrochen werden",
+  "modalUserCannotConnectHeadline": "Verbindung nicht möglich",
+  "modalUserCannotIgnoreConnectionMessage": "Kontaktanfrage konnte nicht ignoriert werden",
+  "modalUserCannotSendConnectionLegalHoldMessage": "Aufgrund der gesetzlichen Aufbewahrung können Sie sich mit diesem Nutzer nicht verbinden. [link]Mehr erfahren[/link]",
+  "modalUserCannotSendConnectionMessage": "Kontaktanfrage konnte nicht gesendet werden",
+  "modalUserCannotSendConnectionNotFederatingMessage": "Sie können keine Kontaktanfrage senden, da Ihr Backend nicht mit dem von {{Benutzername}} verbunden ist.",
   "modalUserLearnMore": "Mehr erfahren",
   "modalUserUnblockAction": "Freigeben",
   "modalUserUnblockHeadline": "Freigeben?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Hat angerufen",
   "oauth.allow": "Erlauben",
   "oauth.cancel": "Nicht erlauben",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "Wenn Sie die oben aufgeführten Berechtigungen zulassen, kann Ihr Outlook-Kalender eine Verbindung zu Wire herstellen. Wenn Sie die Erlaubnis nicht erteilen, können Sie dieses Add-In nicht verwenden.",
   "oauth.headline": "Berechtigungen",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Erfahren Sie mehr</learnMore> über diese Berechtigungen",
   "oauth.logout": "Konto wechseln",
   "oauth.privacypolicy": "Wires <privacypolicy>Datenschutzerklärung</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "Funktionskonfigurationen Ihres Teams anzuzeigen",
+  "oauth.scope.read_self": "Ihren Wire Benutzer- und Profilnamen sowie Ihre E-Mail-Adresse anzuzeigen",
+  "oauth.scope.write_conversations": "Unterhaltungen in Wire zu erstellen",
+  "oauth.scope.write_conversations_code": "Gäste-Links zu Unterhaltungen in Wire zu erstellen",
+  "oauth.subhead": "Microsoft Outlook benötigt Ihre Erlaubnis, um:",
   "offlineBackendLearnMore": "Mehr erfahren",
   "ongoingAudioCall": "Laufender Audioanruf mit {{conversationName}}.",
   "ongoingGroupAudioCall": "Laufende Telefonkonferenz mit {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Gesprächsverlauf",
   "preferencesOptionsBackupImportHeadline": "Wiederherstellen",
   "preferencesOptionsBackupImportSecondary": "Es können nur Backup-Dateien derselben Plattform wiederhergestellt werden. Der Inhalt der Backup-Datei ersetzt den Gesprächsverlauf auf diesem Gerät.",
+  "preferencesOptionsBackupTryAgain": "Erneut versuchen",
   "preferencesOptionsCall": "Anrufe",
   "preferencesOptionsCallLogs": "Fehlerbehebung",
   "preferencesOptionsCallLogsDetail": "Speichern Sie den Anruf-Fehlerbericht. Diese Informationen helfen dem {{BrandName}}-Support bei der Klärung des Problems.",
diff --git a/src/i18n/el-GR.json b/src/i18n/el-GR.json
index 257a3305fb6..83b447cc112 100644
--- a/src/i18n/el-GR.json
+++ b/src/i18n/el-GR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Μη έγκυρη είσοδος",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Αυτός ο αριθμός τηλεφώνου δεν επιτρέπεται",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Η πρόσκληση ανεκλήθη ή έλήξε",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Μη έγκυρη είσοδος",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Αυτός ο αριθμός τηλεφώνου δεν είναι έγκυρος",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Επόμενο",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Προσθήκη",
   "addParticipantsHeader": "Προσθήκη ατόμων",
   "addParticipantsHeaderWithCounter": "Προσθήκη ατόμων ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Ελέγξτε τα email σας και ακολουθήστε τις οδηγίες που θα βρείτε.",
   "authPostedResendHeadline": "Έχετε μήνυμα.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Προσθήκη",
   "authVerifyAccountDetail": "Αυτό σας επιτρέπει να χρησιμοποιήσετε το {{brandName}} σε πολλαπλές συσκευές.",
   "authVerifyAccountHeadline": "Προσθέστε email και κωδικό πρόσβασης.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Μπορείτε να ζητήσετε νέο κωδικό {{expiration}}.",
   "authVerifyPasswordHeadline": "Εισάγετε τον κωδικό σας",
   "backupCancel": "Ακύρωση",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Κάτι πήγε στραβά",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Αποδοχή",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "επαληθευμένες συσκευές",
   "conversationDeviceStartedUsingMany": "έναρξη χρήσεως",
   "conversationDeviceStartedUsingOne": "έναρξη χρήσεως",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " μία εξ αυτών είναι μη επαληθευμένη",
   "conversationDeviceUserDevices": " {{user}}´ς συσκευές",
   "conversationDeviceYourDevices": "οι συσκευές σας",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Επισκέπτης",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Έχετε ήδη λογαριασμό;",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Δημιουργία λογαριασμού",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Σύνδεση",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Το όνομά σας",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} άτομα",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Άνοιγμα χάρτη",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Παραδόθηκε",
   "conversationMissedMessages": "Δεν έχετε χρησιμοποιήσει αυτή την συσκευή για ένα χρονικό διάστημα. Ορισμένα μηνύματα ενδέχεται να μην εμφανίζονται εδώ.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Αναζήτηση βάση ονόματος",
   "conversationParticipantsTitle": "Άτομα",
   "conversationPing": " σκουντημα",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " σκουντημα",
   "conversationPlaybackError": "Αδύνατη η αναπαραγωγή",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • μέσω giphy.com",
   "extensionsGiphyNoGifs": "Ουπς! δεν υπάρχουν gifs",
   "extensionsGiphyRandom": "Τυχαία",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Δημιουργία ομάδος",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Όνομα ομάδος",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Ακύρωση αιτήματος",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "Εντάξει",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Αφαίρεση",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Αφαίρεση,",
   "modalConversationRemoveMessage": "{{user}} δεν θα μπορεί να στείλει ή να λάβει μηνύματα σε αυτή την συνομιλία.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Ανάκληση συνδέσμου",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Αποκλεισμός {{user}},",
   "modalUserBlockMessage": "{{user}} δεν θα μπορέσει να επικοινωνήσει μαζί σας ή να σας προσθέσει σε ομαδικές συνομιλίες.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Άρση αποκλεισμού",
   "modalUserUnblockHeadline": "Άρση αποκλεισμού",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Κάλεσε",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/en-US.json b/src/i18n/en-US.json
index f36c51a4641..5b809043404 100644
--- a/src/i18n/en-US.json
+++ b/src/i18n/en-US.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -701,12 +756,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -718,6 +773,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -885,10 +941,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -949,9 +1007,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -997,16 +1060,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1126,6 +1189,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/es-ES.json b/src/i18n/es-ES.json
index ca1c7ab6918..1e519233a6f 100644
--- a/src/i18n/es-ES.json
+++ b/src/i18n/es-ES.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Revise sus datos e inténtelo de nuevo",
   "BackendError.LABEL.ALREADY_INVITED": "Este correo electrónico ya ha sido invitado",
-  "BackendError.LABEL.BAD_REQUEST": "Entrada inválida",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Esta dirección de correo electrónico no está permitida",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Este número de teléfono no está permitido",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Esta conversación ha alcanzado el límite de participantes",
   "BackendError.LABEL.EMAIL_EXISTS": "Esta dirección de correo electrónico ya está en uso.{supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Este usuario ya está tomado",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Proporcione un nombre de usuario de 2 caracteres como mínimo",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Este usuario no es válido",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "La invitación ha sido revocada o ha expirado",
   "BackendError.LABEL.INVALID_OPERATION": "Operación no válida",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Entrada inválida",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Este número de teléfono no es válido",
   "BackendError.LABEL.KEY_EXISTS": "La dirección de correo electrónico que nos proporcionó ya ha sido registrada.{supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Revise sus datos e inténtelo de nuevo",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Mensaje visto por {{readReceiptText}}, abrir detalle",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Siguiente",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Agregar",
   "addParticipantsHeader": "Agregar participantes",
   "addParticipantsHeaderWithCounter": "Añadir participantes ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Revise su buzón de correo electrónico y siga las instrucciones",
   "authPostedResendHeadline": "Tiene un correo electrónico.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Agregar",
   "authVerifyAccountDetail": "Esto le permite usar {{brandName}} en múltiples dispositivos.",
   "authVerifyAccountHeadline": "Agregar dirección de correo electrónico y contraseña.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Puede solicitar un nuevo código en {{expiration}}.",
   "authVerifyPasswordHeadline": "Introduzca su contraseña",
   "backupCancel": "Cancelar",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "El archivo no se ha podido guardar",
   "backupExportGenericErrorSecondary": "La copia de seguridad no se ha completado.",
   "backupExportProgressCompressing": "Preparando el archivo de respaldo",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Puedes utilizar esto para restaurar el historial de conversaciones si pierdes la computadora o cambias a una nueva.",
   "backupImportAccountErrorHeadline": "Copia de seguridad incorrecta",
   "backupImportAccountErrorSecondary": "No se puede restaurar el historial desde una cuenta diferente.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Algo salió mal",
   "backupImportGenericErrorSecondary": "Tu historial no pudo ser restaurado.",
   "backupImportIncompatibleErrorHeadline": "Copia de seguridad incorrecta",
   "backupImportIncompatibleErrorSecondary": "No se puede restaurar el historial desde una cuenta diferente.",
-  "backupImportOutdatedErrorHeadline": "Copia de seguridad incompatible",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparando…",
   "backupImportProgressSecondary": "Restaurando la copia de seguridad. {{processed}} de {{total}} - {{progress}}%",
   "backupImportSuccessHeadline": "Historia restaurada.",
   "backupImportVersionErrorHeadline": "Copia de seguridad incompatible",
   "backupImportVersionErrorSecondary": "Esta copia de seguridad fue creada por una versión antigua o más reciente de {{brandName}} y no se puede restaurar aquí.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Intentar de nuevo",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Aceptar",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verificar dispositivos",
   "conversationDeviceStartedUsingMany": " comenzó a utilizar",
   "conversationDeviceStartedUsingOne": " comenzó a utilizar",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " uno no verificado de",
   "conversationDeviceUserDevices": " {{user}} dispositivos",
   "conversationDeviceYourDevices": " tus dispositivos",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Invitado",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Abrir en {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Únase a la conversación",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "¿Ya tiene una cuenta?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Crear una cuenta",
-  "conversationJoin.invalidCreateAccountText": "para mensajería grupal y llamadas de conferencia.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Iniciar sesión",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Su nombre",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Abrir este enlace en el equipo.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} personas",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Abrir Mapa",
   "conversationMemberJoined": "[bold]{{name}}[/bold] añadió a {{users}} a la conversación",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] agregó a {{users}} y [showmore]{{count}} más[/showmore] a la conversación",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] ha removido a {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Tú[/bold] has removido a {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Entregado",
   "conversationMissedMessages": "No has utilizado este dispositivo durante un tiempo. Algunos mensajes no aparecerán aquí.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Buscar por nombre",
   "conversationParticipantsTitle": "Personas",
   "conversationPing": " ping",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " ping",
   "conversationPlaybackError": "Incapaz de reproducir",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} · vía giphy.com",
   "extensionsGiphyNoGifs": "Uups, no hay gifs",
   "extensionsGiphyRandom": "Aleatorio",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Demasiados caracteres",
   "groupCreationPreferencesErrorNameShort": "Por lo menos 1 caracter",
   "groupCreationPreferencesHeader": "Crear grupo",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Nombre del grupo",
   "groupParticipantActionBlock": "Bloquear…",
   "groupParticipantActionCancelRequest": "Cancelar solicitud",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Eliminar",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "¿Quitar?",
   "modalConversationRemoveMessage": "{{user}} no podrá enviar o recibir mensajes en esta conversación.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revocar enlace",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "¿Bloquear a {{user}}?",
   "modalUserBlockMessage": "{{user}} no podrá ponerse en contacto contigo o añadirte a chats de grupo.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Desbloquear",
   "modalUserUnblockHeadline": "¿Desbloquear?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Llamó",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Historia",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Sólo puede restaurar el historial desde una copia de seguridad de la misma plataforma. Su copia de seguridad sobrescribirá las conversaciones que pueda tener en este dispositivo.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Solución de problemas",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/et-EE.json b/src/i18n/et-EE.json
index d5ff592e60b..7e692621d01 100644
--- a/src/i18n/et-EE.json
+++ b/src/i18n/et-EE.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Palun kinnita oma andmed ja proovi uuesti",
   "BackendError.LABEL.ALREADY_INVITED": "See e-posti aadress on juba kutsutud",
-  "BackendError.LABEL.BAD_REQUEST": "Vigane sisend",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "See e-posti aadress pole lubatud",
   "BackendError.LABEL.BLACKLISTED_PHONE": "See telefoninumber pole lubatud",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "See vestlus on jõudnud liikmete piirini",
   "BackendError.LABEL.EMAIL_EXISTS": "See e-posti aadress on juba kasutusel. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "See kasutajanimi on juba kasutusel",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Palun sisesta vähemalt 2-tähemärgiline kasutajanimi",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "See kasutajanimi on sobimatu",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Kutse on tühistatud või aegunud",
   "BackendError.LABEL.INVALID_OPERATION": "Sobimatu toiming",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Vigane sisend",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "See telefoninumber on sobimatu",
   "BackendError.LABEL.KEY_EXISTS": "Sisestatud e-posti aadress on juba registreeritud. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Palun kinnita oma andmed ja proovi uuesti",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Järgmine",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Lisa",
   "addParticipantsHeader": "Lisa osalejaid",
   "addParticipantsHeaderWithCounter": "Lisa osalejaid ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Kontrolli oma e-postkasti ja järgi kirjas olevaid juhiseid.",
   "authPostedResendHeadline": "Sulle tuli kiri.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Lisa",
   "authVerifyAccountDetail": "See võimaldab kasutada {{brandName}}’i mitmes seadmes.",
   "authVerifyAccountHeadline": "Lisa meiliaadress ja parool.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Sa võid uue koodi tellida {{expiration}} pärast.",
   "authVerifyPasswordHeadline": "Sisesta oma parool",
   "backupCancel": "Tühista",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Faili ei saanud salvestada",
   "backupExportGenericErrorSecondary": "Varundust ei viidud lõpule.",
   "backupExportProgressCompressing": "Valmistan varundusfaili ette",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Sa saad seda kasutada, et taastada ajalugu, kui kaotad oma arvuti või hakkad kasutama uut.",
   "backupImportAccountErrorHeadline": "Vale varundus",
   "backupImportAccountErrorSecondary": "Sa ei saa taastada teise konto ajalugu.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Midagi läks valesti",
   "backupImportGenericErrorSecondary": "Sinu ajalugu ei saanud taastada.",
   "backupImportIncompatibleErrorHeadline": "Vale varundus",
   "backupImportIncompatibleErrorSecondary": "Sa ei saa taastada teise konto ajalugu.",
-  "backupImportOutdatedErrorHeadline": "Ühildumatu varundus",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Ettevalmistamine…",
   "backupImportProgressSecondary": "Taastan ajalugu · {{processed}} / {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Ajalugu taastatud.",
   "backupImportVersionErrorHeadline": "Ühildumatu varundus",
   "backupImportVersionErrorSecondary": "See varundus loodi uuema või aegunud Wire’i versiooni kaudu ja seda ei saa siin taastada.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Proovi uuesti",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Nõustu",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Kinnita seadmeid",
   "conversationDeviceStartedUsingMany": " hakkas kasutama",
   "conversationDeviceStartedUsingOne": " hakkas kasutama",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " eemaldasid kinnituse ühel",
   "conversationDeviceUserDevices": " kasutaja {{user}} seadmed",
   "conversationDeviceYourDevices": " oma seadmetest",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Külaline",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Ava {brandName}'is",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Ühine vestlusega",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Konto juba olemas?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Loo konto",
-  "conversationJoin.invalidCreateAccountText": "grupivestluse ja konverentskõnede tegemiseks.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Logi sisse",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Sinu nimi",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Ava see link oma arvutis.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} inimest",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Ava kaart",
   "conversationMemberJoined": "[bold]{{name}}[/bold] lisas vestlusesse {{users}}",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] lisas vestlusesse {{users}} ja [showmore]{{count}} teist[/showmore]",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] eemaldas {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Sina[/bold] eemaldasid {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Kohale toimetatud",
   "conversationMissedMessages": "Sa ei ole seda seadet mõnda aega kasutanud. Osad sõnumid ei pruugi siia ilmuda.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Otsi nime järgi",
   "conversationParticipantsTitle": "inimest",
   "conversationPing": " pingis",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingisid",
   "conversationPlaybackError": "Ei saa esitada",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • giphy.com kaudu",
   "extensionsGiphyNoGifs": "Ups, gif-e pole",
   "extensionsGiphyRandom": "Juhuslik",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Liiga palju tähemärke",
   "groupCreationPreferencesErrorNameShort": "Vähemalt 1 tähemärk",
   "groupCreationPreferencesHeader": "Uus grupp",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Grupi nimi",
   "groupParticipantActionBlock": "Blokeeri…",
   "groupParticipantActionCancelRequest": "Tühista taotlus…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Muudetud: {{edited}}",
-  "messageDetailsNoLikes": "Keegi pole seda sõnumit veel meeldivaks märkinud.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Keegi pole seda sõnumit veel lugenud.",
   "messageDetailsReceiptsOff": "Lugemiskinnitused ei olnud selle sõnumi saatmishetkel sees.",
   "messageDetailsSent": "Saadetud: {{sent}}",
   "messageDetailsTitle": "Üksikasjad",
-  "messageDetailsTitleLikes": "Meeldis{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Loetud{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Eemalda",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Eemaldad?",
   "modalConversationRemoveMessage": "{{user}} ei saa siin vestluses sõnumeid saata ega vastu võtta.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Tühista link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokeerid kasutaja {{user}}?",
   "modalUserBlockMessage": "{{user}} ei saa sulle sõnumeid saata ega sind grupivestlustesse lisada.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Eemalda blokeering",
   "modalUserUnblockHeadline": "Eemaldad blokeeringu?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "helistas",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Ajalugu",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Sa saad taastada ajalugu ainult sama platvormi varundusest. Sinu varundus kirjutab üle vestlused, mis sul võivad selles seadmes olla.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Veaotsing",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/fa-IR.json b/src/i18n/fa-IR.json
index 3cbed1e3151..fb24a96edc7 100644
--- a/src/i18n/fa-IR.json
+++ b/src/i18n/fa-IR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "اضافه کردن",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "صندوق ایمیل خود را بررسی و دستورالعمل‌های داخل ایمیل را دنبال کنید.",
   "authPostedResendHeadline": "شما ایمیل دریافت کردید.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "اضافه کردن",
   "authVerifyAccountDetail": "این به شما کمک می‌کند تا در دستگاه‌های مختلف از {{brandName}} استفاده کنید.",
   "authVerifyAccountHeadline": "ایمیل آدرس خود و رمز عبور جدیدی را وارد کنید.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "شما میتوانید یک کد {{expiration}} جدید درخواست کنید.",
   "authVerifyPasswordHeadline": "رمزعبوری انتخاب کنید",
   "backupCancel": "انصراف",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "میپذیرم",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " دستگاه ها را تایید کنید",
   "conversationDeviceStartedUsingMany": " شروع کردم به استفاده کردن",
   "conversationDeviceStartedUsingOne": " شروع کردم به استفاده کردن",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " یکی از تایید نشده‌ها",
   "conversationDeviceUserDevices": " دستگاه های {{user}}",
   "conversationDeviceYourDevices": " دستگاه‌های شما",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "مهمان",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} نفر",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "باز‌کردن نقشه",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "رسید",
   "conversationMissedMessages": "شما از این دستگاه مدتی است که استفاده نکرده‌اید. بعضی از پیام‌ها در اینجا ظاهر نمی‌شود.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "جستجو بر اساس نام",
   "conversationParticipantsTitle": "افراد",
   "conversationPing": " صدا زد",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " صدا زد",
   "conversationPlaybackError": "قادر به پخش نیست",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • به وسیله giphy.com",
   "extensionsGiphyNoGifs": "اووه، هیچ Gif موجود نیست",
   "extensionsGiphyRandom": "تصادفی",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "لغو درخواست",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "تایید",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "حذف",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "حذف؟",
   "modalConversationRemoveMessage": "{{user}} قادر به ارسال و دریافت پیام ها در این مکالمه نخواهد بود.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "آیا {{user}} مسدود شود?",
   "modalUserBlockMessage": "{{user}} قادر به تماس با شما یا افزودن شما به مکالمات گروهی نخواهد بود.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "خارج کردن از مسدود بودن",
   "modalUserUnblockHeadline": "خارج کردن از مسدود بودن",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "زنگ زد",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/fi-FI.json b/src/i18n/fi-FI.json
index 16e4c6a4d26..f7ac271e6b1 100644
--- a/src/i18n/fi-FI.json
+++ b/src/i18n/fi-FI.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Tarkista tiedot ja yritä uudelleen",
   "BackendError.LABEL.ALREADY_INVITED": "Tämä sähköpostiosoite on jo kutsuttu",
-  "BackendError.LABEL.BAD_REQUEST": "Virheellinen syöte",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Sähköpostiosoite ei ole sallittu",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Puhelinnumero ei ole sallittu",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Tämä keskustelu on saavuttanut osallistujien enimmäismäärän",
   "BackendError.LABEL.EMAIL_EXISTS": "Sähköpostiosoite jonka annoit on jo käytössä. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Käyttäjätunnus on jo käytössä",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Kirjoita käyttäjätunnus, jossa on vähintään 2 merkkiä",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Käyttäjätunnus on virheellinen",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Kutsu on peruttu tai vanhentunut",
   "BackendError.LABEL.INVALID_OPERATION": "Virheellinen operaatio",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Virheellinen syöte",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Puhelinnumero on virheellinen",
   "BackendError.LABEL.KEY_EXISTS": "Sähköpostiosoite jonka annoit on jo rekisteröity. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Vahvista tietosi ja yritä uudelleen",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Seuraava",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Lisää",
   "addParticipantsHeader": "Lisää osallistujia",
   "addParticipantsHeaderWithCounter": "Lisää osallistujia ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Tarkista sähköpostisi saapuneet-kansio ja seuraa ohjeita.",
   "authPostedResendHeadline": "Sinulle on sähköpostia.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Lisää",
   "authVerifyAccountDetail": "Tämä mahdollistaa Wiren käytön useilla laitteilla.",
   "authVerifyAccountHeadline": "Lisää sähköpostiosoitteesi ja salasanasi.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Voit pyytää uuden koodin {{expiration}} kuluttua.",
   "authVerifyPasswordHeadline": "Kirjoita salasanasi",
   "backupCancel": "Peruuta",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Tiedostoa ei voitu tallentaa",
   "backupExportGenericErrorSecondary": "Varmuuskopiointia ei päätetty.",
   "backupExportProgressCompressing": "Valmistellaan varmuuskopiointitiedostoa",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Voit käyttää tätä palauttamaan historian jos kadotat tietokoneesi tai vaihdat sen uuteen.",
   "backupImportAccountErrorHeadline": "Väärä varmuuskopio",
   "backupImportAccountErrorSecondary": "Et voi palauttaa historiaa toisesta tilistä.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Jotain meni pieleen",
   "backupImportGenericErrorSecondary": "Historiaa ei voitu palauttaa.",
   "backupImportIncompatibleErrorHeadline": "Väärä varmuuskopio",
   "backupImportIncompatibleErrorSecondary": "Et voi palauttaa historiaa toiselta tililtä.",
-  "backupImportOutdatedErrorHeadline": "Epäyhteensopiva varmuuskopio",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Valmistellaan…",
   "backupImportProgressSecondary": "Palautetaan historiaa · {{processed}} / {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Historia palautettu.",
   "backupImportVersionErrorHeadline": "Epäyhteensopiva varmuuskopio",
   "backupImportVersionErrorSecondary": "Varmuuskopio on luotu uudemmalla tai vanhentuneella {{brandName}}:llä ja sitä ei voida palauttaa.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Yritä uudelleen",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Hyväksy",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " vahvista laitteet",
   "conversationDeviceStartedUsingMany": " aloitti käyttämään",
   "conversationDeviceStartedUsingOne": " aloitti käyttämään",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " vahvistamattomia yksi",
   "conversationDeviceUserDevices": " {{user}} n laitteet",
   "conversationDeviceYourDevices": " sinun laitteet",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Vieras",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Kirjaudu sisään",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} henkeä",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Avaa kartta",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Toimitettu",
   "conversationMissedMessages": "Et ole käyttänyt tätä laitetta pitkään aikaan. Jotkut viestit eivät saata näkyä täällä.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Hae nimellä",
   "conversationParticipantsTitle": "Ihmiset",
   "conversationPing": " pinggasi",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinggasi",
   "conversationPlaybackError": "Toisto epäonnistui",
   "conversationPopoverFavorite": "Lisää suosikkeihin",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • giphy.com:in kautta",
   "extensionsGiphyNoGifs": "Upsista, ei giffejä",
   "extensionsGiphyRandom": "Satunnainen",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Peru pyyntö",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Lisätietoja",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Poista",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Poista?",
   "modalConversationRemoveMessage": "{{user}} ei pysty lähettämään tai vastaanottamaan viestejä tässä keskustelussa.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Estä {{user}}?",
   "modalUserBlockMessage": "{{user}} ei pysty ottamaan sinuun yhteyttä tai lisäämään sinua ryhmäkeskusteluihin.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Poista esto",
   "modalUserUnblockHeadline": "Poista esto?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Soitti",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/fr-FR.json b/src/i18n/fr-FR.json
index c7288270845..22db9a64526 100644
--- a/src/i18n/fr-FR.json
+++ b/src/i18n/fr-FR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Veuillez vérifier vos informations et réessayez",
   "BackendError.LABEL.ALREADY_INVITED": "Une invitation a déjà été envoyée à cette adresse",
-  "BackendError.LABEL.BAD_REQUEST": "Saisie non valide",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Cette adresse e-mail n'est pas autorisée",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Ce numéro de téléphone n'est pas autorisé",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "La conversation n'a pas été trouvée",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Cette conversation a atteint la limite de participants",
   "BackendError.LABEL.EMAIL_EXISTS": "Cette adresse e-mail est déjà utilisée. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Ce nom d'utilisateur est déjà utilisé",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Veuillez entrer un nom d'utilisateur composé d'au moins 2 caractères",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Ce nom d'utilisateur est invalide",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "L'invitation a été révoquée ou a expiré",
   "BackendError.LABEL.INVALID_OPERATION": "Opération invalide",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Saisie non valide",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Ce numéro de téléphone est invalide",
   "BackendError.LABEL.KEY_EXISTS": "Cette adresse e-mail est déjà enregistrée. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Veuillez vérifier vos informations et réessayez",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Suivant",
   "accountForm.terms": "J'accepte les <terms>termes d'utilisation</terms>",
   "accountForm.termsAndPrivacyPolicy": "J'accepte les <privacypolicy>la politique de confidentialité</privacypolicy> et <terms>conditions d'utilisation</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Ajouter",
   "addParticipantsHeader": "Ajouter des participants",
   "addParticipantsHeaderWithCounter": "Ajouter des participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Vérifiez votre boîte de réception et suivez les instructions.",
   "authPostedResendHeadline": "Vous avez du courrier.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Ajouter",
   "authVerifyAccountDetail": "Cela vous permet d’utiliser {{brandName}} sur plusieurs appareils.",
   "authVerifyAccountHeadline": "Ajouter une adresse e-mail et un mot de passe.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Vous pourrez demander un nouveau code {{expiration}}.",
   "authVerifyPasswordHeadline": "Saisissez votre mot de passe",
   "backupCancel": "Annuler",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Le fichier n’a pas pu être sauvegardé",
   "backupExportGenericErrorSecondary": "La sauvegarde a échoué.",
   "backupExportProgressCompressing": "Fichier de sauvegarde en préparation",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Vous pourrez utiliser cette sauvegarde si vous perdez votre ordinateur ou si vous basculez vers un nouvel appareil.",
   "backupImportAccountErrorHeadline": "Fichier de sauvegarde invalide",
   "backupImportAccountErrorSecondary": "Vous ne pouvez pas restaurer l'historique d’un autre compte.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Une erreur est survenue",
   "backupImportGenericErrorSecondary": "Votre historique n’a pas pu être restauré.",
   "backupImportIncompatibleErrorHeadline": "Fichier de sauvegarde invalide",
   "backupImportIncompatibleErrorSecondary": "Vous ne pouvez pas restaurer l'historique d’un autre compte.",
-  "backupImportOutdatedErrorHeadline": "Sauvegarde incompatible",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "En préparation…",
   "backupImportProgressSecondary": "Restauration en cours · {{processed}} sur {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "L’historique a été restauré.",
   "backupImportVersionErrorHeadline": "Sauvegarde incompatible",
   "backupImportVersionErrorSecondary": "Cette sauvegarde a été créée par une version plus récente ou expirée de {{brandName}} et ne peut pas être restaurée ici.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Réessayez",
   "buttonActionError": "Votre réponse ne peut pas être envoyée, veuillez réessayer",
   "callAccept": "Accepter",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Vérifier les appareils",
   "conversationDeviceStartedUsingMany": " utilise",
   "conversationDeviceStartedUsingOne": " utilise",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " a annulé la vérification d’un",
   "conversationDeviceUserDevices": " des appareils de {{user}}",
   "conversationDeviceYourDevices": " de vos appareils",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Contact externe",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Ouvrir dans {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Rejoignez la conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Vous avez déjà un compte ?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Créer un compte",
-  "conversationJoin.invalidCreateAccountText": "pour des messages de groupe et des appels.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Se connecter",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Votre nom",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Ouvrir ce lien sur votre ordinateur.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favoris",
   "conversationLabelGroups": "Groupes",
   "conversationLabelPeople": "Contacts",
-  "conversationLikesCaption": "{{number}} contacts",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Ouvrir la carte",
   "conversationMemberJoined": "[bold]{{name}}[/bold] a ajouté {{users}} à la conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] a ajouté {{users}}, et [showmore]{{count}} autres[/showmore] à la conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] a exclu {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Vous[/bold] avez exclu {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Distribué",
   "conversationMissedMessages": "Vous n’avez pas utilisé cet appareil depuis un moment. Il est possible que certains messages n’apparaissent pas ici.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Rechercher par nom",
   "conversationParticipantsTitle": "Contacts",
   "conversationPing": " a fait un signe",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " avez fait un signe",
   "conversationPlaybackError": "Lecture impossible",
   "conversationPopoverFavorite": "Ajouter aux favoris",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oups, pas de gif",
   "extensionsGiphyRandom": "Au hasard",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "Le fichier &nbsp;[bold]{{name}}[/bold]&nbsp;ne peut pas être ouvert",
   "fileTypeRestrictedOutgoing": "Le partage de fichiers avec l'extension {{fileExt}} n'est pas autorisé par votre organisation",
   "folderViewTooltip": "Dossiers",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Trop de caractères",
   "groupCreationPreferencesErrorNameShort": "Au moins un caractère",
   "groupCreationPreferencesHeader": "Nouveau groupe",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Nom du groupe",
   "groupParticipantActionBlock": "Bloquer…",
   "groupParticipantActionCancelRequest": "Annuler la demande",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Édité : {{edited}}",
-  "messageDetailsNoLikes": "Personne n’a encore aimé ce message.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Personne n’a encore lu ce message.",
   "messageDetailsReceiptsOff": "Les accusés de lecture n’étaient pas activés quand ce message a été envoyé.",
   "messageDetailsSent": "Envoyé : {{sent}}",
   "messageDetailsTitle": "Détails",
-  "messageDetailsTitleLikes": "Aimé{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Lu{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Exclure",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Exclure ?",
   "modalConversationRemoveMessage": "{{user}} ne pourra plus envoyer ou recevoir de messages dans cette conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Révoquer le lien",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Bloquer {{user}} ?",
   "modalUserBlockMessage": "{{user}} ne pourra plus vous contacter ou vous ajouter à des conversations de groupe.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Débloquer",
   "modalUserUnblockHeadline": "Débloquer ?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "A appelé",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Historique",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Vous pouvez uniquement restaurer l’historique depuis une sauvegarde provenant d’une plateforme identique. Ceci effacera les conversations que vous avez déjà sur cet appareil.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Appels",
   "preferencesOptionsCallLogs": "Résolution de problèmes",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ga-IE.json b/src/i18n/ga-IE.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/ga-IE.json
+++ b/src/i18n/ga-IE.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/he-IL.json b/src/i18n/he-IL.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/he-IL.json
+++ b/src/i18n/he-IL.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/hi-IN.json b/src/i18n/hi-IN.json
index 53439e1c484..1a73a114438 100644
--- a/src/i18n/hi-IN.json
+++ b/src/i18n/hi-IN.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "अपने ईमेल इनबॉक्स का जांच करें और निर्देशों का पालन करें।",
   "authPostedResendHeadline": "आपका ईमेल आया है|",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "यह आपको {{brandName}} का इस्तेमाल कई उपकरणों मैं करने देता है|",
   "authVerifyAccountHeadline": "ईमेल पता तथा पासवर्ड को जोड़े|",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "आप एक नया कोड {{expiration}} का अनुरोध कर सकते हैं|",
   "authVerifyPasswordHeadline": "अपने पासवर्ड को डालें",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "स्वीकार करें",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " सत्यापित करें उपकरणों को",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}} के यन्त्र",
   "conversationDeviceYourDevices": " आपके यन्त्र",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "मेहमान",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "आपने कुछ समय के लिए इस यंत्र का उपयोग नहीं किया है| कुछ संदेश शायद यहां दिखाई नहीं दे|",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • giphy.com द्वारा",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "हटाएं",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "हटाएँ?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} को ब्लॉक करें?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/hr-HR.json b/src/i18n/hr-HR.json
index 5da69c60386..4a566f65c29 100644
--- a/src/i18n/hr-HR.json
+++ b/src/i18n/hr-HR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Sljedeće",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Dodaj",
   "addParticipantsHeader": "Dodaj sudionike",
   "addParticipantsHeaderWithCounter": "Dodaj ({{number}}) sudionika",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Provjerite svoj email sandučić i slijedite upute.",
   "authPostedResendHeadline": "Imate poštu.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Dodaj",
   "authVerifyAccountDetail": "Ovo Vam omogućuje da koristite {{brandName}} na više uređaja.",
   "authVerifyAccountHeadline": "Dodajte email adresu i lozinku.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Možete zatražiti novi kod {{expiration}}.",
   "authVerifyPasswordHeadline": "Upišite Vašu šifru",
   "backupCancel": "Odustani",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Ne uspješno spremanje datoteke",
   "backupExportGenericErrorSecondary": "Neuspješno stvaranje sigurnosne kopije.",
   "backupExportProgressCompressing": "Priprema datoteke sigurnosne kopije",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Možete koristiti za vraćanje povijesti u slučaju da izgubite računalo ili se prebacite na novo.",
   "backupImportAccountErrorHeadline": "Kriva sig. kopija",
   "backupImportAccountErrorSecondary": "Ne možete vratiti povijest s drugog računa.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Nešto je pošlo po zlu",
   "backupImportGenericErrorSecondary": "Vašu povijest nije moguće vratiti.",
   "backupImportIncompatibleErrorHeadline": "Kriva sig. kopija",
   "backupImportIncompatibleErrorSecondary": "Ne možete vratiti povijest s drugog računa.",
-  "backupImportOutdatedErrorHeadline": "Ne kompatibilna sigurnosna kopija",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Priprema…",
   "backupImportProgressSecondary": "Vraćanje povijesti · {{processed}} od {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Povijest vraćena.",
   "backupImportVersionErrorHeadline": "Ne kompatibilna sigurnosna kopija",
   "backupImportVersionErrorSecondary": "Ova sigurnosna kopija je izrađena od novije ili starije verzije {{brandName}}-a i kao takva nemože se vratiti ovdje.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Pokušajte ponovno",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Prihvati",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Potvrdi uređaje",
   "conversationDeviceStartedUsingMany": " počela/o koristiti",
   "conversationDeviceStartedUsingOne": " počela/o koristiti",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " neverificirala/o je jedan od",
   "conversationDeviceUserDevices": " {{user}} uređaji",
   "conversationDeviceYourDevices": " tvojih uređaja",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gost",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Stvaranje računa",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Prijava",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} ljudi",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Otvori kartu",
   "conversationMemberJoined": "[bold]{{name}}[/bold] je dodao/la {{users}} u razgovor",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] je dodao {{users}}, i još [showmore]{{count}}[/showmore] u razgovor",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] je uklonio {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Vi[/bold] ste uklonili {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Dostavljeno",
   "conversationMissedMessages": "Niste upotrebljavali ovaj uređaj neko vrijeme. Neke poruke možda neće biti vidljive na njemu.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Traži po imenu",
   "conversationParticipantsTitle": "Kontakti",
   "conversationPing": " pingala/o",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingala/o",
   "conversationPlaybackError": "Reprodukcija neuspješna",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "• {{tag}} s giphy.com",
   "extensionsGiphyNoGifs": "Ups, nema Gif-ova",
   "extensionsGiphyRandom": "Nasumično",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Prevelik broj znakova",
   "groupCreationPreferencesErrorNameShort": "Najmanje 1 znak",
   "groupCreationPreferencesHeader": "Stvorite grupu",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Naziv grupe",
   "groupParticipantActionBlock": "Blokiraj…",
   "groupParticipantActionCancelRequest": "Poništi zahtjev…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Uređeno: {{edited}}",
-  "messageDetailsNoLikes": "Nikome se još nije svidjela poruka.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Nitko još nije pročitao ovu poruku.",
   "messageDetailsReceiptsOff": "Potvrda čitanja nije bila uključena kada je ova poruka poslana.",
   "messageDetailsSent": "Poslano: {{sent}}",
   "messageDetailsTitle": "Detalji",
-  "messageDetailsTitleLikes": "Sviđa{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Pročitano{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "U redu",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Ukloni",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Ukloniti?",
   "modalConversationRemoveMessage": "{{user}} neće moći slati ili primati poruke u ovom razgovoru.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Opozovi poveznicu",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokiraj {{user}}?",
   "modalUserBlockMessage": "{{user}} Vas neće moći kontaktirati niti dodati u grupne razgovore.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Odblokiraj",
   "modalUserUnblockHeadline": "Odblokirati?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Zvala/o",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Povijest",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Možete vratiti povijest samo iz sigurnosne kopije iste platforme. Vaša sigurnosna kopija će presnimiti razgovore koje ste imali na ovom uređaju.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Otklanjanje greške",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/hu-HU.json b/src/i18n/hu-HU.json
index 87c4bd4d220..3a612a4b054 100644
--- a/src/i18n/hu-HU.json
+++ b/src/i18n/hu-HU.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Kérjük, ellenőrizd az adataid, majd próbáld meg újra",
   "BackendError.LABEL.ALREADY_INVITED": "Ez az e-mail cím már meg lett hívva",
-  "BackendError.LABEL.BAD_REQUEST": "Hibás adat",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Ez az e-mail cím nem megengedett",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Ez a telefonszám nem megengedett",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "BESZÉLGETÉS_NEM_TALÁLHATÓ",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Ez a beszélgetés elérte a résztvevők maximális számát",
   "BackendError.LABEL.EMAIL_EXISTS": "A megadott e-mail cím már használatban van. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "A felhasználónév már foglalt",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Kérjük, legalább 2 karakterből álló nevet adj meg",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Ez a felhasználónév érvénytelen",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "A meghívót már visszavonták vagy lejárt",
   "BackendError.LABEL.INVALID_OPERATION": "Érvénytelen művelet",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Hibás adat",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Ez a telefonszám érvénytelen",
   "BackendError.LABEL.KEY_EXISTS": "A megadott e-mail cím már regisztrálva van. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Kérjük, ellenőrizd az adataid, majd próbáld meg újra",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Tovább",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Hozzáadás",
   "addParticipantsHeader": "Partnerek hozzáadása",
   "addParticipantsHeaderWithCounter": "Partnerek hozzáadása ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Ellenőrizd bejövő e-mailjeidet és kövesd az utasításokat.",
   "authPostedResendHeadline": "Leveled érkezett.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Hozzáadás",
   "authVerifyAccountDetail": "Ezáltal akár több eszközön is használhatod a {{brandName}}-t.",
   "authVerifyAccountHeadline": "E-mail cím és jelszó megadása.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Új kódot kérhetsz {{expiration}} múlva.",
   "authVerifyPasswordHeadline": "Add meg a jelszavad",
   "backupCancel": "Mégsem",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Nem sikerült a fájl mentése",
   "backupExportGenericErrorSecondary": "A mentés nem készült el.",
   "backupExportProgressCompressing": "Biztonsági másolat készítése",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Ennek segítségével vissza tudod állítani az előzményeket, ha elhagyod a számítógéped vagy elkezdesz egy újat használni.",
   "backupImportAccountErrorHeadline": "Rossz mentés",
   "backupImportAccountErrorSecondary": "Az előzményeket nem lehet másik felhasználói fiókból visszaállítani.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Valami nem stimmel",
   "backupImportGenericErrorSecondary": "Az előzmények visszaállítása nem sikerült.",
   "backupImportIncompatibleErrorHeadline": "Rossz mentés",
   "backupImportIncompatibleErrorSecondary": "Az előzményeket nem lehet másik felhasználói fiókból visszaállítani.",
-  "backupImportOutdatedErrorHeadline": "A mentés nem kompatibilis",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Előkészítés…",
   "backupImportProgressSecondary": "Visszaállítás folyamatban · {{processed}} / {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Az előzmények visszaállítva.",
   "backupImportVersionErrorHeadline": "A mentés nem kompatibilis",
   "backupImportVersionErrorSecondary": "Ez a mentés egy újabb vagy elavultabb {{brandName}} verzióval készült és nem lehet itt visszaállítani.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Próbáld újra",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Elfogadás",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " eszközök ellenőrzése",
   "conversationDeviceStartedUsingMany": " elkezdett használni",
   "conversationDeviceStartedUsingOne": " elkezdett használni",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " visszavontad az ellenőrzött státuszt",
   "conversationDeviceUserDevices": " {{user}} egyik eszköze",
   "conversationDeviceYourDevices": " az egyik eszközödről",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Vendég",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Megnyitás {brandName}-ön",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Csatlakozz a beszélgetéshez",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Már van fiókod?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Fiók létrehozása",
-  "conversationJoin.invalidCreateAccountText": "csoportos üzenetküldéshez és beszélgetésekhez.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Bejelentkezés",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Neved",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Hivatkozás megnyitása a számítógépeden.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Kedvencek",
   "conversationLabelGroups": "Csoportok",
   "conversationLabelPeople": "Partnerek",
-  "conversationLikesCaption": "{{number}} partner",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Térkép megnyitása",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] eltávolította: {{users}}\n",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Te[/bold] eltávolítottad {{users}} felhasználót\n",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Kézbesítve",
   "conversationMissedMessages": "Ezt a készüléket már nem használtad egy ideje, ezért nem biztos, hogy minden üzenet megjelenik itt.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Keresés név szerint",
   "conversationParticipantsTitle": "Partner",
   "conversationPing": " kopogott",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " kopogott",
   "conversationPlaybackError": "Nem lehet lejátszani",
   "conversationPopoverFavorite": "Hozzáadás a kedvencekhez",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • Forrás: giphy.com",
   "extensionsGiphyNoGifs": "Hoppá, nincs gif",
   "extensionsGiphyRandom": "Véletlenszerű",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Mappák",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Túl sok karakter",
   "groupCreationPreferencesErrorNameShort": "Legalább 1 karakter",
   "groupCreationPreferencesHeader": "Új csoport",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Csoportnév",
   "groupParticipantActionBlock": "Letilt…",
   "groupParticipantActionCancelRequest": "Kérelem visszavonása",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Szerkesztve: {{edited}}",
-  "messageDetailsNoLikes": "Még senkinek nem tetszett ez az üzenet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Még senki nem olvasta el az üzenetet.",
   "messageDetailsReceiptsOff": "Az olvasási visszaigazolás nem voltak bekapcsolva, amikor ezt az üzenetet elküldték.",
   "messageDetailsSent": "Küldött: {{sent}}",
   "messageDetailsTitle": "Részletek",
-  "messageDetailsTitleLikes": "Likeolt{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Olvasott{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Eltávolítás",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Törlöd?",
   "modalConversationRemoveMessage": "{{user}} nem fog tudni üzenetet küldeni és fogadni ebben a beszélgetésben.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Link visszavonása",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} tiltása?",
   "modalUserBlockMessage": "{{user}} nem tud majd kapcsolatba lépni veled, sem meghívni téged csoportos beszélgetésekbe.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Tiltás feloldása",
   "modalUserUnblockHeadline": "Feloldod a letiltást?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Hívta",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Előzmények",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Csak ugyanazon platformon készült mentést tudsz visszaállítani. A visszaállítás felülírja az eszközön jelenleg lévő beszélgetéseket.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Hibaelhárítás",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/id-ID.json b/src/i18n/id-ID.json
index e087cf9dff3..92bdfb524ee 100644
--- a/src/i18n/id-ID.json
+++ b/src/i18n/id-ID.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Mohon verifikasi data Anda dan coba lagi",
   "BackendError.LABEL.ALREADY_INVITED": "Alamat e-mail ini telah diundang",
-  "BackendError.LABEL.BAD_REQUEST": "Masukan tidak valid",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Alamat email ini tidak diperbolehkan",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Nomor telepon ini tidak diperbolehkan",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "PERCAKAPAN_TIDAK_DITEMUKAN",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Percakapan ini telah mencapai batas peserta",
   "BackendError.LABEL.EMAIL_EXISTS": "Alamat e-mail ini telah digunakan. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Nama pengguna ini sudah ada",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Harap masukan nama pengguna minimal 2 karakter",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Nama pengguna ini tidak valid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Undangan telah dicabut dan kadaluarsa",
   "BackendError.LABEL.INVALID_OPERATION": "Operasi tidak valid",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Masukan tidak valid",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Nomor telepon ini tidak valid",
   "BackendError.LABEL.KEY_EXISTS": "Alamat e-mail ini telah terdaftar. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Mohon verifikasi data Anda dan coba lagi",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Tambahkan",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Periksa kotak masuk email Anda dan ikuti petunjuk.",
   "authPostedResendHeadline": "Anda telah mendapatkan pesan.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Tambahkan",
   "authVerifyAccountDetail": "Ini memungkinkan Anda menggunakan {{brandName}} di beberapa perangkat.",
   "authVerifyAccountHeadline": "Tambahkan alamat email dan sandi.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Anda dapat meminta kode baru {{expiration}} .",
   "authVerifyPasswordHeadline": "Masukkan sandi Anda",
   "backupCancel": "Batal",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Terima",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verifikasi perangkat",
   "conversationDeviceStartedUsingMany": " mulai menggunakan",
   "conversationDeviceStartedUsingOne": " mulai menggunakan",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " tidak terverifikasi dari salah satu",
   "conversationDeviceUserDevices": " {{user}} ini perangkat",
   "conversationDeviceYourDevices": " perangkat Anda",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Tamu",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} orang",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Buka Peta",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Terkirim",
   "conversationMissedMessages": "Anda belum pernah menggunakan perangkat ini untuk sementara waktu. Beberapa pesan mungkin tidak muncul di sini.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Cari berdasarkan nama",
   "conversationParticipantsTitle": "Orang",
   "conversationPing": " diping",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " diping",
   "conversationPlaybackError": "Tidak dapat memutar",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Ups, tidak ada gif",
   "extensionsGiphyRandom": "Acak",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Batalkan permintaan",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Hapus",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Hapus?",
   "modalConversationRemoveMessage": "{{user}} tidak dapat mengirim atau menerima pesan dalam percakapan ini.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokir {{user}} ?",
   "modalUserBlockMessage": "{{user}} tidak dapat menghubungi Anda atau menambahkan Anda ke percakapan grup.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Buka blokir",
   "modalUserUnblockHeadline": "Buka blokir?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Dipanggil",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/is-IS.json b/src/i18n/is-IS.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/is-IS.json
+++ b/src/i18n/is-IS.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/it-IT.json b/src/i18n/it-IT.json
index 02cc6834e1e..b322efb18e8 100644
--- a/src/i18n/it-IT.json
+++ b/src/i18n/it-IT.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Verifica i tuoi dati e riprova",
   "BackendError.LABEL.ALREADY_INVITED": "Questa email è già stata invitata",
-  "BackendError.LABEL.BAD_REQUEST": "Inserimento non valido",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Questo indirizzo email non è consentito",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Questo numero di telefono non è consentito",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Questa conversazione ha raggiunto il limite di partecipanti",
   "BackendError.LABEL.EMAIL_EXISTS": "Questo indirizzo email è già in uso. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Questo nome utente è già in uso",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Inserisci un nome utente con almeno 2 caratteri",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Questo nome utente non è valido",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "L'invito è stato revocato o scaduto",
   "BackendError.LABEL.INVALID_OPERATION": "Operazione non valida",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Inserimento non valido",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Questo numero di telefono non è valido",
   "BackendError.LABEL.KEY_EXISTS": "Questo indirizzo email è già stato registrato. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Verifica i tuoi dati e riprova",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Aggiungi",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Verifica la tua casella di posta e segui le istruzioni.",
   "authPostedResendHeadline": "C’è posta per te.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Aggiungi",
   "authVerifyAccountDetail": "Questo ti consente di usare {{brandName}} su più dispositivi.",
   "authVerifyAccountHeadline": "Aggiungi indirizzo email e password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "È possibile richiedere un nuovo codice {{expiration}}.",
   "authVerifyPasswordHeadline": "Inserisci la tua password",
   "backupCancel": "Annulla",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accetta",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verifica i dispositivi",
   "conversationDeviceStartedUsingMany": " ha iniziato ad usare",
   "conversationDeviceStartedUsingOne": " ha iniziato ad usare",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " hai tolto la verifica di",
   "conversationDeviceUserDevices": " Dispositivi di {{user}}’s",
   "conversationDeviceYourDevices": " i tuoi dispositivi",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Ospite",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Accedi",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} persone",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Apri mappa",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Consegnato",
   "conversationMissedMessages": "È da un po’ di tempo che non utilizzi questo dispositivo. Alcuni messaggi potrebbero non apparire qui.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Cerca per nome",
   "conversationParticipantsTitle": "Persone",
   "conversationPing": " ha fatto un trillo",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " ha fatto un trillo",
   "conversationPlaybackError": "Impossibile riprodurre",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, nessuna gif",
   "extensionsGiphyRandom": "Scelta casuale",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Annulla richiesta",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Rimuovi",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Rimuovere?",
   "modalConversationRemoveMessage": "{{user}} non sarà in grado di inviare o ricevere messaggi in questa conversazione.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Bloccare {{user}}?",
   "modalUserBlockMessage": "{{user}} non sarà in grado di contattarti o aggiungerti alle conversazioni di gruppo.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Sblocca",
   "modalUserUnblockHeadline": "Sblocca?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Ha chamato",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ja-JP.json b/src/i18n/ja-JP.json
index 89d8a54f299..39b6c175c97 100644
--- a/src/i18n/ja-JP.json
+++ b/src/i18n/ja-JP.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "詳細を確認して、もう一度やり直してください。",
   "BackendError.LABEL.ALREADY_INVITED": "このメールアドレスは招待済みです",
-  "BackendError.LABEL.BAD_REQUEST": "無効な入力です",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "このメールアドレスは許可されていません",
   "BackendError.LABEL.BLACKLISTED_PHONE": "この電話番号は許可されていません",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "この会話は参加者の制限に達しています",
   "BackendError.LABEL.EMAIL_EXISTS": "このメールアドレスは既に使用されています。{supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "このユーザー名は既に使われています",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "ユーザー名は最低２文字の入力が必要です。",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "このユーザー名は無効です",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "招待状は取り消されたか、既に失効しています。",
   "BackendError.LABEL.INVALID_OPERATION": "無効な操作",
-  "BackendError.LABEL.INVALID_PAYLOAD": "無効な入力です",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "この電話番号は無効です",
   "BackendError.LABEL.KEY_EXISTS": "このメールアドレスは既に登録されています。{supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "詳細を確認して、もう一度やり直してください。",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "次へ",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "追加する",
   "addParticipantsHeader": "人を追加します",
   "addParticipantsHeaderWithCounter": "({{number}}) を追加します。",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "メールの受信トレイを確認して、手順に従ってください。",
   "authPostedResendHeadline": "メールを受信しました",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "追加する",
   "authVerifyAccountDetail": "これにより、複数のデバイスで {{brandName}} を使用できます。",
   "authVerifyAccountHeadline": "メールアドレスとパスワードを追加",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "新しいコード \"{{expiration}}\" を要求することができます。",
   "authVerifyPasswordHeadline": "パスワードを入力してください",
   "backupCancel": "キャンセル",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "ファイルを保存できませんでした",
   "backupExportGenericErrorSecondary": "バックアップが完了していません。",
   "backupExportProgressCompressing": "バックアップを準備中...",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "あなたがコンピュータを紛失したり、新しい機種に乗り換えた際にも、これを使用して履歴を復元することができます。",
   "backupImportAccountErrorHeadline": "バックアップに不備があります",
   "backupImportAccountErrorSecondary": "別のアカウントからの履歴はリストアできません。",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "何か問題があります",
   "backupImportGenericErrorSecondary": "あなたの履歴はリストアできませんでした。",
   "backupImportIncompatibleErrorHeadline": "バックアップに不備があります",
   "backupImportIncompatibleErrorSecondary": "別のアカウントからの履歴はリストアできません。",
-  "backupImportOutdatedErrorHeadline": "互換性のないバックアップ",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "準備中…",
   "backupImportProgressSecondary": "履歴復元中 · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "履歴がリストアされました。",
   "backupImportVersionErrorHeadline": "互換性のないバックアップ",
   "backupImportVersionErrorSecondary": "このバックアップデータは、新しいまたは古すぎる {{brandName}} で作成されたため、リストアできません。",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "再試行",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "承諾",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " デバイスを認証します",
   "conversationDeviceStartedUsingMany": " 使用を開始しました",
   "conversationDeviceStartedUsingOne": " 使用を開始しました",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " の一つを未認証にしました",
   "conversationDeviceUserDevices": " {{user}} のデバイス",
   "conversationDeviceYourDevices": " あなたのデバイス",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "ゲスト",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "{brandName} を開く",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "会話に参加します",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "既にアカウントをお持ちですか？",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "アカウントを作成",
-  "conversationJoin.invalidCreateAccountText": "グループ メッセージングおよび電話会議。",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "ログイン",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "あなたの名前",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "このリンクをお使いのコンピュータで開きます。",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "お気に入り",
   "conversationLabelGroups": "グループ",
   "conversationLabelPeople": "会話",
-  "conversationLikesCaption": "{{number}} 人",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "マップを開く",
   "conversationMemberJoined": "[bold]{{name}}[/bold] が {{users}} と会話を開始しました",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] が {{users}} と、[showmore]{{count}} 人[/showmore] を会話に追加しました",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] が {{users}} を削除しました",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]あなた[/bold] が {{users}} を削除しました",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "配信済み",
   "conversationMissedMessages": "しばらくの間、このデバイスでWireを利用していなかったため、いくつかのメッセージがここに表示されない可能性があります。",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "名前で検索する",
   "conversationParticipantsTitle": "メンバー",
   "conversationPing": " ping しました",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " ping しました",
   "conversationPlaybackError": "再生できません",
   "conversationPopoverFavorite": "お気に入りに追加",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} giphy.comから",
   "extensionsGiphyNoGifs": "Oops, gifがありません。",
   "extensionsGiphyRandom": "ランダム",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "フォルダ",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "文字が多すぎます",
   "groupCreationPreferencesErrorNameShort": "１文字以上",
   "groupCreationPreferencesHeader": "新規グループ",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "グループ名",
   "groupParticipantActionBlock": "連絡先をブロック...",
   "groupParticipantActionCancelRequest": "リクエストを取り消す",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "編集済: {{edited}}",
-  "messageDetailsNoLikes": "まだ、誰もこのメッセージにいいねしていません。",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "まだ、誰もこのメッセージを読んでいません。",
   "messageDetailsReceiptsOff": "このメッセージが送信された時、開封通知はオフでした。",
   "messageDetailsSent": "送信済: {{sent}}",
   "messageDetailsTitle": "詳細",
-  "messageDetailsTitleLikes": "いいね {{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "既読 {{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "削除",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "削除しますか?",
   "modalConversationRemoveMessage": "{{user}} は、この会話でメッセージの送受信をすることができません",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "リンクを取り消す",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} をブロックしますか？",
   "modalUserBlockMessage": "{{user}} は、あなたにコンタクトをすることやグループ会話にあなたを追加することができません。",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "ブロック解除",
   "modalUserUnblockHeadline": "ブロック解除？",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "着信",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "履歴",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "会話履歴は、同じプラットフォームのバックアップからのみ復元できます。あなたのバックアップは、このデバイス上の会話を上書きします。",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "トラブルシューティング",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/lt-LT.json b/src/i18n/lt-LT.json
index 07d0ac21a01..de6f6ffbb5d 100644
--- a/src/i18n/lt-LT.json
+++ b/src/i18n/lt-LT.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Patikrinkite duomenis ir bandykite dar kartą",
   "BackendError.LABEL.ALREADY_INVITED": "Šis el. paštas jau yra pakviestas",
-  "BackendError.LABEL.BAD_REQUEST": "Neteisinga įvestis",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Šis el. pašto adresas neleidžiamas",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Šis telefono numeris neleidžiamas",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Šiame pokalbyje jau pasiekta dalyvių riba",
   "BackendError.LABEL.EMAIL_EXISTS": "Šis el. pašto adresas jau užregistruotas. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Naudotojo vardas jau naudojamas",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Įrašykite bent 2 simbolių naudotojo vardą",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Naudotojo vardas neleistinas",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Pakvietimas buvo panaikintas arba baigė galioti",
   "BackendError.LABEL.INVALID_OPERATION": "Neteisinga operacija",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Neteisinga įvestis",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Šis telefono numeris yra neteisingas",
   "BackendError.LABEL.KEY_EXISTS": "Šis el. pašto adresas jau užregistruotas. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Patikrinkite duomenis ir bandykite dar kartą",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Kitas",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Pridėti",
   "addParticipantsHeader": "Pridėti žmonių",
   "addParticipantsHeaderWithCounter": "Pridėti žmonių ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Patikrinkite savo el. paštą ir sekite nurodymus.",
   "authPostedResendHeadline": "Jūs gavote laišką.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Pridėti",
   "authVerifyAccountDetail": "Tai leidžia jums naudoti „{{brandName}}“ keliuose įrenginiuose.",
   "authVerifyAccountHeadline": "Pridėkite el. pašto adresą ir slaptažodį.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Jūs galite užklausti naują kodą {{expiration}}.",
   "authVerifyPasswordHeadline": "Įveskite savo slaptažodį",
   "backupCancel": "Atsisakyti",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Failo išsaugoti nepavyko",
   "backupExportGenericErrorSecondary": "Atsarginės kopijos kūrimas nebuvo sėkmingas.",
   "backupExportProgressCompressing": "Ruošiamas atsarginės kopijos failas",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Jei prarasite savo kompiuterį arba pasikeisite nauju, kopiją galėsite panaudoti praeities atkūrimui.",
   "backupImportAccountErrorHeadline": "Netinkama atsarginė kopija",
   "backupImportAccountErrorSecondary": "Atkurti kitos paskyros atsarginės kopijos nepavyks.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Kažkas nutiko",
   "backupImportGenericErrorSecondary": "Praeities atkurti nepavyko.",
   "backupImportIncompatibleErrorHeadline": "Netinkama atsarginė kopija",
   "backupImportIncompatibleErrorSecondary": "Atkurti kitos paskyros atsarginės kopijos nepavyks.",
-  "backupImportOutdatedErrorHeadline": "Nesuderinama atsarginė kopija",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Ruošiama…",
   "backupImportProgressSecondary": "Atkuriama praeitis · {{processed}} iš {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Praeitis atkurta.",
   "backupImportVersionErrorHeadline": "Nesuderinama atsarginė kopija",
   "backupImportVersionErrorSecondary": "Ši atsarginė kopija buvo sukurta naudojant arba naujesnę arba senesnę „{{brandName}}“ versiją, ir negali būti naudojama atkūrimui.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Bandykite dar kartą",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Priimti",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " patvirtinkite įrenginius",
   "conversationDeviceStartedUsingMany": " pradėjo naudoti",
   "conversationDeviceStartedUsingOne": " pradėjo naudoti",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " panaikinote patvirtinimą vieno iš",
   "conversationDeviceUserDevices": " {{user}} įrenginių",
   "conversationDeviceYourDevices": " savo įrenginių",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Svečias",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Atverti programoje „{brandName}“",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Prisijungti prie susirašinėjimo",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Turite paskyrą?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Kurti paskyrą",
-  "conversationJoin.invalidCreateAccountText": "susirašinėjimams grupėje ir konferenciniams pokalbiams.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Prisijungti",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Jūsų vardas",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Atverkite šią nuorodą kompiuteryje.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Grupės",
   "conversationLabelPeople": "Žmonės",
-  "conversationLikesCaption": "{{number}} žmonėms",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Atverti žemėlapį",
   "conversationMemberJoined": "[bold]{{name}}[/bold] pridėjo {{users}} prie susirašinėjimo",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] pridėjo {{users}}, ir dar [showmore]{{count}}[/showmore] prie susirašinėjimo",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] pašalino {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Jūs[/bold] pašalinote {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Pristatyta",
   "conversationMissedMessages": "Jūs kurį laiką nenaudojote šio įrenginio. Kai kurios žinutės čia gali neatsirasti.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Ieškokite pagal vardą",
   "conversationParticipantsTitle": "Žmonės",
   "conversationPing": " patikrino ryšį",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " patikrinote ryšį",
   "conversationPlaybackError": "Nepavyko atkurti",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • per giphy.com",
   "extensionsGiphyNoGifs": "Oi, nėra gif",
   "extensionsGiphyRandom": "Atsitiktinis",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Aplankai",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Per daug simbolių",
   "groupCreationPreferencesErrorNameShort": "Bent 1 simbolis",
   "groupCreationPreferencesHeader": "Nauja grupė",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Grupės pavadinimas",
   "groupParticipantActionBlock": "Blokuoti kontaktą",
   "groupParticipantActionCancelRequest": "Atsisakyti užklausos…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Taisyta: {{edited}}",
-  "messageDetailsNoLikes": "Kol kas ši žinutė niekam nepatiko.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Kol kas niekas neperskaitė šios žinutės.",
   "messageDetailsReceiptsOff": "Pranešimai apie skaitymą nebuvo įjungti, kai ši žinutė buvo išsiųsta.",
   "messageDetailsSent": "Išsiųsta: {{sent}}",
   "messageDetailsTitle": "Išsamiau",
-  "messageDetailsTitleLikes": "{{count}} sako, kad patinka",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "{{count}} perskaitė",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "GERAI",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Šalinti",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Šalinti?",
   "modalConversationRemoveMessage": "{{user}} negalės siųsti ir gauti žinutes šiame pokalbyje.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Naikinti nuorodą",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Užblokuoti {{user}}?",
   "modalUserBlockMessage": "{{user}} negalės su jumis susisiekti ar pridėti jus į grupės pokalbius.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Atblokuoti",
   "modalUserUnblockHeadline": "Atblokuoti?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Skambino",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Praeitis",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Atkurti praeitį iš atsarginės kopijos galite tik toje pačioje platformoje. Atsarginė kopija pakeis visus susirašinėjimus, kuriuos šiame įrenginyje turite.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Trikčių šalinimas",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/lv-LV.json b/src/i18n/lv-LV.json
index 4f66efe45d4..fe4cf67fb2b 100644
--- a/src/i18n/lv-LV.json
+++ b/src/i18n/lv-LV.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Pievienot",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Pārbaudiet savu e-pasta iesūtni un sekojiet norādījumiem.",
   "authPostedResendHeadline": "Tev ir pienācis pasts.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Pievienot",
   "authVerifyAccountDetail": "Šis ļauj izmantot {{brandName}} uz vairākām ierīcēm.",
   "authVerifyAccountHeadline": "Pievienot e-pasta adresi un paroli.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Ievadiet savu paroli",
   "backupCancel": "Atcelt",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Pieņemt",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " pārbaudiet ierīces",
   "conversationDeviceStartedUsingMany": " sācis izmantot",
   "conversationDeviceStartedUsingOne": " sācis izmantot",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " neapstiprināts viens no",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " jūsu ierīces",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Atvērt Karti",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Piegādāts",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "Personas",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Nejaušus",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Atcelt pieprasījumu",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "Labi",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Atbloķēt?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ms-MY.json b/src/i18n/ms-MY.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/ms-MY.json
+++ b/src/i18n/ms-MY.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/nl-NL.json b/src/i18n/nl-NL.json
index 1221b33ad21..a50f9fca030 100644
--- a/src/i18n/nl-NL.json
+++ b/src/i18n/nl-NL.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Ongeldige invoer",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "Dit e-mailadres is al in gebruik. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Uitnodiging is ingetrokken of verlopen",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Ongeldige invoer",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Volgende",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Toevoegen",
   "addParticipantsHeader": "Personen toevoegen",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Controleer je inbox en volg de instructies.",
   "authPostedResendHeadline": "Je hebt e-mail ontvangen.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Toevoegen",
   "authVerifyAccountDetail": "Dit zorgt ervoor dat je {{brandName}} op meerdere apparaten kunt gebruiken.",
   "authVerifyAccountHeadline": "E-mailadres en wachtwoord toevoegen.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Je kunt een nieuwe code aanvragen {{expiration}}.",
   "authVerifyPasswordHeadline": "Voer je wachtwoord in",
   "backupCancel": "Annuleer",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Neem op",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " controleer apparaten",
   "conversationDeviceStartedUsingMany": " begon met het gebruik van",
   "conversationDeviceStartedUsingOne": " begon met het gebruik van",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified een van",
   "conversationDeviceUserDevices": "{{user}}´s apparaten",
   "conversationDeviceYourDevices": " jou apparaten",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gast",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Heeft u al een account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Een account aanmaken",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Inloggen",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Jouw naam",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} mensen",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open kaart",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Afgeleverd",
   "conversationMissedMessages": "Je hebt dit apparaat een tijdje niet gebruikt. Sommige berichten worden hier niet getoond.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Zoeken op naam",
   "conversationParticipantsTitle": "Deelnemers",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Niet in staat om te af te spelen",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oeps, geen gifjes",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Te veel tekens",
   "groupCreationPreferencesErrorNameShort": "Minimaal 1 teken",
   "groupCreationPreferencesHeader": "Nieuwe groep",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Groepsnaam",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Annuleer verzoek",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Verwijderen",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Verwijder?",
   "modalConversationRemoveMessage": "{{user}} zal geen berichten kunnen versturen of ontvangen in dit gesprek.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} blokkeren?",
   "modalUserBlockMessage": "{{user}} zal niet in staat zijn je te contacteren of toe te voegen aan een groepsgesprek.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Deblokkeer",
   "modalUserUnblockHeadline": "Deblokkeer?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Heeft gebeld",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/no-NO.json b/src/i18n/no-NO.json
index 0d2f4022fde..7c247a5a81f 100644
--- a/src/i18n/no-NO.json
+++ b/src/i18n/no-NO.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Kontroller dine detaljer og prøv på nytt",
   "BackendError.LABEL.ALREADY_INVITED": "Denne e-postadressen er allerede invitert",
-  "BackendError.LABEL.BAD_REQUEST": "Ugyldig inndata",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Denne e-postadressen er tillat",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Legg til",
   "addParticipantsHeader": "Legg til deltakere",
   "addParticipantsHeaderWithCounter": "Legg til deltakere ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Sjekk e-postboksen din og følg instruksjonene.",
   "authPostedResendHeadline": "Du har en ny e-post.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Legg til",
   "authVerifyAccountDetail": "Dette lar deg bruke {{brandName}} på flere enheter.",
   "authVerifyAccountHeadline": "Legg til e-postadresse og et passord.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Du kan be om en ny kode {{expiration}}.",
   "authVerifyPasswordHeadline": "Angi ditt passord",
   "backupCancel": "Avbryt",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Godta",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " bekreft enheter",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " dine enheter",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gjest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Åpne kart",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Levert",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Søk etter navn",
   "conversationParticipantsTitle": "Kontakter",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Kan ikke spille av",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, ingen gifs",
   "extensionsGiphyRandom": "Tilfeldig",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "For mange tegn",
   "groupCreationPreferencesErrorNameShort": "Minst 1 tegn",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Blokker…",
   "groupParticipantActionCancelRequest": "Avbryt forespørsel",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Fjern",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Fjern?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Opphev blokkering",
   "modalUserUnblockHeadline": "Opphev blokkering?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/pl-PL.json b/src/i18n/pl-PL.json
index bb599f38db9..0628cb9e637 100644
--- a/src/i18n/pl-PL.json
+++ b/src/i18n/pl-PL.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Sprawdź swoje dane i spróbuj ponownie",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Niepoprawne dane",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Wprowadź nazwę użytkownika zawierającą więcej niż 2 znaki",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Zaproszenia zostały wycofane lub wygasły",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Niepoprawne dane",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Sprawdź swoje dane i spróbuj ponownie",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Dalej",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Dodaj",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Sprawdź swoją skrzynkę e-mail i postępuj zgodnie z instrukcjami.",
   "authPostedResendHeadline": "Masz wiadomość.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Dodaj",
   "authVerifyAccountDetail": "To pozwala Ci używać {{brandName}} na więcej niż jednym urządzeniu.",
   "authVerifyAccountHeadline": "Dodaj adres e-mail i hasło.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Możesz poprosić o nowy kod {{expiration}}.",
   "authVerifyPasswordHeadline": "Wprowadź hasło",
   "backupCancel": "Anuluj",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Coś poszło nie tak",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Odbierz",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " sprawdzenie urządzenia",
   "conversationDeviceStartedUsingMany": " rozpoczęto korzystanie",
   "conversationDeviceStartedUsingOne": " rozpoczęto korzystanie",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " %@ nie zweryfikował jednego z %@",
   "conversationDeviceUserDevices": " urządzenia użytkownika {{user}}",
   "conversationDeviceYourDevices": " twoje urządzenia",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gość",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Masz już konto?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Utwórz konto",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Zaloguj się",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} uczestników",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Otwórz mapę",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Dostarczono",
   "conversationMissedMessages": "Dość długo nie używałeś tego urządzenia. Niektóre wiadomości mogą nie być widoczne.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Szukaj według nazwy",
   "conversationParticipantsTitle": "Osoby",
   "conversationPing": " zaczepił/a",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " zaczepił/a",
   "conversationPlaybackError": "Nie można odtworzyć",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Ups, nie ma plików Gif",
   "extensionsGiphyRandom": "Losowa kolejność",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Anuluj żądanie",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Usuń",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Usunąć?",
   "modalConversationRemoveMessage": "{{user}} nie będzie mógł wysyłać, ani odbierać wiadomości w tej rozmowie.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Zablokować {{user}}?",
   "modalUserBlockMessage": "{{user}} nie będzie mógł się z Tobą skontaktować, ani dodać do rozmowy grupowej.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Odblokuj",
   "modalUserUnblockHeadline": "Odblokować?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Dzwonił",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/pt-BR.json b/src/i18n/pt-BR.json
index 58cd9f263a1..2e4234308fa 100644
--- a/src/i18n/pt-BR.json
+++ b/src/i18n/pt-BR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Por favor, verifique seus dados e tente novamente",
   "BackendError.LABEL.ALREADY_INVITED": "Este e-mail já foi convidado",
-  "BackendError.LABEL.BAD_REQUEST": "Entrada inválida",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Este endereço de e-mail não é permitido",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Este número de telefone não é permitido",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Por favor, tente novamente ou solicite outro código.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Esta conversa atingiu o limite de participantes",
   "BackendError.LABEL.EMAIL_EXISTS": "Este endereço de e-mail já está em uso. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Este nome de usuário já está em uso",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Digite um nome de usuário com pelo menos 2 caracteres",
   "BackendError.LABEL.INVALID_CODE": "Por favor, tente novamente ou solicite outro código.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Este nome de usuário é inválido",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "O convite foi revogado ou expirou",
   "BackendError.LABEL.INVALID_OPERATION": "Operação inválida",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Entrada inválida",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Este número de telefone é inválido",
   "BackendError.LABEL.KEY_EXISTS": "Este endereço de e-mail já foi registrado. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Por favor, verifique seus dados e tente novamente",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Voltar para as informações da conversa",
   "accessibility.conversation.sectionLabel": "Lista de conversas",
   "accessibility.conversationAssetImageAlt": "Imagem de {{username}} de {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Abrir opções da mensagem",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Mostrar dispositivos",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Definir administrador do grupo",
   "accessibility.conversationDetailsActionNotificationsLabel": "Mostrar configurações de notificações",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Ping perdido",
   "accessibility.conversationStatusUnreadReply": "Resposta não lida",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Fechar a janela 'GIF'",
   "accessibility.giphyModal.loading": "Carregando giphy",
   "accessibility.giphyModal.selectGif": "Selecionar gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferências - dispositivos",
   "accessibility.headings.preferencesOptions": "Preferências - opções",
   "accessibility.headings.sidebar": "Navegação",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Mensagem visualizada por {{readReceiptText}}, detalhes abertos",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Curtir mensagem",
   "accessibility.messages.liked": "Descurtir mensagem",
   "accessibility.openConversation": "Abrir o perfil de {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Próximo",
   "accountForm.terms": "Eu aceito os <terms>termos e condições</terms>",
   "accountForm.termsAndPrivacyPolicy": "Eu aceito a <privacypolicy>política de privacidade</privacypolicy> e os <terms>termos e condições</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Adicionar",
   "addParticipantsHeader": "Adicionar participantes",
   "addParticipantsHeaderWithCounter": "Adicionar participantes ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Verifique sua caixa de entrada do e-mail e siga as instruções.",
   "authPostedResendHeadline": "Você recebeu um e-mail.",
   "authSSOLoginTitle": "Iniciar sessão com SSO",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Adicionar",
   "authVerifyAccountDetail": "Isso permite que você use o {{brandName}} em vários dispositivos.",
   "authVerifyAccountHeadline": "Adicionar o endereço de e-mail e senha.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Você pode solicitar um novo código {{expiration}}.",
   "authVerifyPasswordHeadline": "Digite sua senha",
   "backupCancel": "Cancelar",
+  "backupDecryptionModalAction": "Continuar",
+  "backupDecryptionModalMessage": "O backup está protegido por senha.",
+  "backupDecryptionModalPlaceholder": "Senha",
+  "backupDecryptionModalTitle": "Digite a senha",
+  "backupEncryptionModalAction": "Fazer backup agora",
+  "backupEncryptionModalCloseBtn": "Cancelar",
+  "backupEncryptionModalMessage": "O backup será compactado e você poderá criptografá-lo com uma senha.",
+  "backupEncryptionModalPlaceholder": "Senha (opcional)",
+  "backupEncryptionModalTitle": "Definir senha",
   "backupExportGenericErrorHeadline": "O arquivo não pôde ser salvo",
   "backupExportGenericErrorSecondary": "O backup não foi concluído.",
   "backupExportProgressCompressing": "Preparando arquivo de backup",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Você pode usar isso para restaurar o histórico se perder seu computador ou mudar para um novo.",
   "backupImportAccountErrorHeadline": "Backup errado",
   "backupImportAccountErrorSecondary": "Você não pode restaurar o histórico de uma conta diferente.",
+  "backupImportFormatErrorHeadline": "Backup incompatível",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Algo deu errado",
   "backupImportGenericErrorSecondary": "Seu histórico não pôde ser restaurado.",
   "backupImportIncompatibleErrorHeadline": "Backup errado",
   "backupImportIncompatibleErrorSecondary": "Você não pode restaurar o histórico de uma conta diferente.",
-  "backupImportOutdatedErrorHeadline": "Backup incompatível",
+  "backupImportPasswordErrorHeadline": "Senha incorreta",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparando…",
   "backupImportProgressSecondary": "Restaurando histórico · {{processed}} de {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Histórico restaurado.",
   "backupImportVersionErrorHeadline": "Backup incompatível",
   "backupImportVersionErrorSecondary": "Este backup foi criado por uma versão mais recente ou desatualizada do {{brandName}} e não pode ser restaurado aqui.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Tentar novamente",
   "buttonActionError": "Sua resposta não pode ser enviada, por favor tente novamente",
   "callAccept": "Aceitar",
@@ -254,8 +294,8 @@
   "callingRestrictedConferenceCallPersonalModalTitle": "Recurso indisponível",
   "callingRestrictedConferenceCallTeamMemberModalDescription": "Para iniciar uma chamada em conferência, sua equipe precisa ser atualizada para o plano Empresarial.",
   "callingRestrictedConferenceCallTeamMemberModalTitle": "Recurso indisponível",
-  "cameraStatusOff": "off",
-  "cameraStatusOn": "on",
+  "cameraStatusOff": "desligado",
+  "cameraStatusOn": "ligado",
   "chooseHandle.handlePlaceholder": "Nome de usuário",
   "chooseHandle.headline": "Definir nome de usuário",
   "chooseHandle.subhead": "Seu nome de usuário ajuda as pessoas a encontrá-lo.",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verificar dispositivos",
   "conversationDeviceStartedUsingMany": " começaram a usar",
   "conversationDeviceStartedUsingOne": " começou a usar",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " desautorizou um dos",
   "conversationDeviceUserDevices": " dispositivos de {{user}}",
   "conversationDeviceYourDevices": " seus dispositivos",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contatos",
   "conversationGuestIndicator": "Convidado",
   "conversationImageAssetRestricted": "Receber imagens é proibido",
-  "conversationJoin.buttonExistentAccountOpen": "Abrir em {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, você foi convidado para participar de uma conversa em {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Entrar na conversa",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} sem uma conta",
-  "conversationJoin.existentAccountSubhead": "Áudio e videoconferência, mensagens de texto, compartilhamento de arquivos e compartilhamento de tela, tudo criptografado de ponta a ponta.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Não foi possível entrar na conversa",
   "conversationJoin.fullConversationSubhead": "O número máximo de participantes nesta conversa foi atingido.",
   "conversationJoin.hasAccount": "Já possui uma conta?",
-  "conversationJoin.headline": "Você foi convidado para participar de uma conversa em {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Criar uma conta",
-  "conversationJoin.invalidCreateAccountText": "para mensagens em grupo e chamadas em conferência.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversa não encontrada",
   "conversationJoin.invalidSubhead": "O link para esta conversa em grupo expirou ou a conversa foi definida como privada.",
-  "conversationJoin.loginLink": "Iniciar sessão",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Seu nome",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Entre na conversa como convidado temporário (o acesso expira após 24 horas)",
   "conversationJoin.unsupportedJoinHeadline": "Você foi convidado para participar de uma conversa em {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Abra este link no seu computador.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favoritos",
   "conversationLabelGroups": "Grupos",
   "conversationLabelPeople": "Pessoas",
-  "conversationLikesCaption": "{{number}} pessoas",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Abrir mapa",
   "conversationMemberJoined": "[bold]{{name}}[/bold] adicionou {{users}} à conversa",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] adicionou {{users}}, e [showmore]mais {{count}}[/showmore] à conversa",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removeu {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} foi removido desta conversa porque a Retenção Legal foi ativada. [link]Saiba mais[/link]",
   "conversationMemberRemovedYou": "[bold]Você[/bold] removeu {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Entregue",
   "conversationMissedMessages": "Você não usa este dispositivo há algum tempo. Algumas mensagens podem não aparecer aqui.",
   "conversationModalRestrictedFileSharingDescription": "Este arquivo não pôde ser compartilhado devido às suas restrições de compartilhamento.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Pesquisar por nome",
   "conversationParticipantsTitle": "Pessoas",
   "conversationPing": " pingou",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingou",
   "conversationPlaybackError": "Falha ao reproduzir",
   "conversationPopoverFavorite": "Adicionar aos favoritos",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Ops, não há gifs",
   "extensionsGiphyRandom": "Aleatório",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "O bloqueio obrigatório do aplicativo agora está desativado. Você não precisa de senha ou autenticação biométrica ao retornar ao aplicativo.",
   "featureConfigChangeModalApplockHeadline": "As configurações da equipe foram alteradas",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "A câmera nas chamadas está desativada",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "A auto-exclusão de mensagens está habilitada. Você pode definir um temporizador antes de escrever uma mensagem.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "A auto-exclusão de mensagens agora é obrigatório. Novas mensagens serão excluídas automaticamente após {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "Houve uma mudança no {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "O arquivo de &nbsp;[bold]{{name}}[/bold]&nbsp; não pode ser aberto",
   "fileTypeRestrictedOutgoing": "O compartilhamento de arquivos com a extensão {{fileExt}} não é permitido por sua organização",
   "folderViewTooltip": "Pastas",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Muitos caracteres",
   "groupCreationPreferencesErrorNameShort": "Pelo menos 1 caractere",
   "groupCreationPreferencesHeader": "Criar grupo",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Nome do grupo",
   "groupParticipantActionBlock": "Bloquear…",
   "groupParticipantActionCancelRequest": "Cancelar solicitação…",
@@ -673,25 +728,26 @@
   "mediaBtnPlay": "Reproduzir",
   "messageCouldNotBeSentBackEndOffline": "Message could not be sent as the back-end of [bold]{{domain}}[/bold] could not be reached.",
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
-  "messageCouldNotBeSentRetry": "Retry",
+  "messageCouldNotBeSentRetry": "Tentar novamente",
   "messageDetailsEdited": "Editado: {{edited}}",
-  "messageDetailsNoLikes": "Ninguém curtiu esta mensagem ainda.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Ninguém leu esta mensagem ainda.",
   "messageDetailsReceiptsOff": "As confirmações de leitura não estavam ativadas quando esta mensagem foi enviada.",
   "messageDetailsSent": "Enviado: {{sent}}",
   "messageDetailsTitle": "Detalhes",
-  "messageDetailsTitleLikes": "Curtiu{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Lido{{count}}",
-  "messageFailedToSendHideDetails": "Hide details",
-  "messageFailedToSendParticipants": "{{count}} participants",
-  "messageFailedToSendParticipantsFromDomainPlural": "{{count}} participants from {{domain}}",
-  "messageFailedToSendParticipantsFromDomainSingular": "1 participant from {{domain}}",
-  "messageFailedToSendPlural": "didn't get your message.",
-  "messageFailedToSendShowDetails": "Show details",
-  "messageFailedToSendWillNotReceivePlural": "won't get your message.",
-  "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
-  "messageFailedToSendWillReceivePlural": "will get your message later.",
-  "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "messageFailedToSendHideDetails": "Ocultar detalhes",
+  "messageFailedToSendParticipants": "{{count}} participantes",
+  "messageFailedToSendParticipantsFromDomainPlural": "{{count}} participantes de {{domain}}",
+  "messageFailedToSendParticipantsFromDomainSingular": "1 participante de {{domain}}",
+  "messageFailedToSendPlural": "não recebeu a sua mensagem.",
+  "messageFailedToSendShowDetails": "Mostrar detalhes",
+  "messageFailedToSendWillNotReceivePlural": "não receberá a sua mensagem.",
+  "messageFailedToSendWillNotReceiveSingular": "não receberá a sua mensagem.",
+  "messageFailedToSendWillReceivePlural": "receberá a sua mensagem mais tarde.",
+  "messageFailedToSendWillReceiveSingular": "receberá a sua mensagem mais tarde.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "Quando ativado, a conversa usará o novo protocolo de segurança de camada de mensagens (MLS).",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Não foi possível alterar o estado dos serviços.",
   "modalConversationRemoveAction": "Remover",
   "modalConversationRemoveCloseBtn": "Fechar janela 'Remover'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Desabilitar o acesso?",
+  "modalConversationRemoveGuestsHeadline": "Desabilitar acesso de convidado?",
   "modalConversationRemoveGuestsMessage": "Os convidados atuais serão removidos da conversa. Novos convidados não serão permitidos.",
+  "modalConversationRemoveGuestsOrServicesAction": "Desabilitar",
   "modalConversationRemoveHeadline": "Remover?",
   "modalConversationRemoveMessage": "{{user}} não conseguirá enviar ou receber mensagens nesta conversa.",
+  "modalConversationRemoveServicesHeadline": "Desabilitar acesso de serviços?",
   "modalConversationRemoveServicesMessage": "Os serviços atuais serão removidos da conversa. Novos serviços não serão permitidos.",
   "modalConversationRevokeLinkAction": "Revogar link",
   "modalConversationRevokeLinkCloseBtn": "Fechar janela 'Revogar o link'",
@@ -918,10 +976,15 @@
   "modalUserBlockHeadline": "Bloquear {{user}}?",
   "modalUserBlockMessage": "{{user}} não conseguirá entrar em contato com você ou convidá-lo para uma conversa em grupo.",
   "modalUserBlockedForLegalHold": "Este usuário está bloqueado devido à Retenção Legal. [link]Saiba mais[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Os convidados não podem ser adicionados",
-  "modalUserCannotConnectLegalHoldHeadline": "Não é possível conectar a este usuário",
-  "modalUserCannotConnectLegalHoldMessage": "Você não pode se conectar a este usuário devido à Retenção Legal. [link]Saiba mais[/link] ",
-  "modalUserLearnMore": "Learn more",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
+  "modalUserLearnMore": "Saiba mais",
   "modalUserUnblockAction": "Desbloquear",
   "modalUserUnblockHeadline": "Desbloquear?",
   "modalUserUnblockMessage": "{{user}} poderá entrar em contato com você e adicioná-lo às conversas em grupo novamente.",
@@ -964,19 +1027,19 @@
   "notificationTitleGroup": "{{user}} em {{conversation}}",
   "notificationVoiceChannelActivate": "Chamando",
   "notificationVoiceChannelDeactivate": "Chamou",
-  "oauth.allow": "Allow",
-  "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.allow": "Permitir",
+  "oauth.cancel": "Não permitir",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
-  "offlineBackendLearnMore": "Learn more",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
+  "offlineBackendLearnMore": "Saiba mais",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
   "ongoingGroupVideoCall": "Ongoing video conference call with {{conversationName}}, your camera is {{cameraStatus}}.",
@@ -1049,12 +1112,12 @@
   "preferencesAccountReadReceiptsDetail": "Quando isso estiver desativado, você não poderá ver as confirmações de leitura de outras pessoas. Essa configuração não se aplica a conversas em grupo.",
   "preferencesAccountResetAppLockPassphrase": "Redefinir a senha de bloqueio do aplicativo",
   "preferencesAccountResetPassword": "Redefinir senha",
-  "preferencesAccountSelectedLabel": "Selected",
+  "preferencesAccountSelectedLabel": "Selecionado",
   "preferencesAccountSetAppLockPassphrase": "Definir a senha de bloqueio do aplicativo",
   "preferencesAccountTeam": "Equipe",
   "preferencesAccountTypingIndicatorCheckbox": "Indicador de digitação",
   "preferencesAccountTypingIndicatorsDetail": "Quando esta opção estiver desativada, você não poderá ver quando outras pessoas estiverem digitando e elas não verão quando você estiver digitando. Esta configuração se aplica a todas as conversas neste dispositivo.",
-  "preferencesAccountUpdateLabel": "Change your status to",
+  "preferencesAccountUpdateLabel": "Alterar seu status para",
   "preferencesAccountUsername": "Nome de usuário",
   "preferencesAccountUsernameAvailable": "Disponível",
   "preferencesAccountUsernameErrorTaken": "Já está sendo usado",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Histórico",
   "preferencesOptionsBackupImportHeadline": "Restaurar",
   "preferencesOptionsBackupImportSecondary": "Você só pode restaurar o histórico de um backup da mesma plataforma. Seu backup substituirá as conversas que você pode ter neste dispositivo.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Chamadas",
   "preferencesOptionsCallLogs": "Solução de problemas",
   "preferencesOptionsCallLogsDetail": "Salve o relatório de depuração de chamada. Essas informações ajudam o suporte do {{brandName}} a diagnosticar problemas com as chamadas.",
@@ -1110,9 +1174,9 @@
   "preferencesOptionsEnableSoundlessIncomingCallsDetails": "Ative para silenciar as chamadas recebidas quando você já estiver em uma chamada em andamento.",
   "preferencesOptionsEnableVbrCheckbox": "Codificação de taxa de bits variável",
   "preferencesOptionsEnableVbrDetails": "Isso faz com que as chamadas de áudio usem menos dados e funcionem melhor em redes mais lentas. Desligue para usar a codificação de taxa de bits constante (CBR). Essa configuração afeta apenas chamadas 1:1; as chamadas em conferência sempre usam a codificação CBR.",
-  "preferencesOptionsFontSizeDefault": "Default",
-  "preferencesOptionsFontSizeLarge": "Large",
-  "preferencesOptionsFontSizeSmall": "Small",
+  "preferencesOptionsFontSizeDefault": "Padrão",
+  "preferencesOptionsFontSizeLarge": "Grande",
+  "preferencesOptionsFontSizeSmall": "Pequeno",
   "preferencesOptionsInputLevelDetected": "Audio detected from microphone",
   "preferencesOptionsInputLevelNotDetected": "No audio detected from microphone",
   "preferencesOptionsNotifications": "Notificações",
@@ -1261,11 +1325,11 @@
   "tooltipPreferencesRename": "Altere seu nome",
   "tooltipPreferencesTabs": "Abas de preferências",
   "tooltipSearchClose": "Fechar (Esc)",
-  "unavailableUser": "Name not available",
+  "unavailableUser": "Nome indisponível",
   "unknownApplicationErrorDescription": "An unknown application error occurred. Please retry to get back to your recent action or reload Wire to get back to your last conversation.",
-  "unknownApplicationErrorReload": "Reload",
-  "unknownApplicationErrorTitle": "Something went wrong",
-  "unknownApplicationErrorTryAgain": "Try again",
+  "unknownApplicationErrorReload": "Recarregar",
+  "unknownApplicationErrorTitle": "Alguma coisa deu errado",
+  "unknownApplicationErrorTryAgain": "Tentar novamente",
   "unsupported.desktopOnlyMessage": "Em vez disso, use o aplicativo do {brandName} para desktop.",
   "unsupported.headlineBrowser": "Este navegador não é compatível.",
   "unsupported.headlineCookies": "Ativar cookies",
@@ -1282,11 +1346,11 @@
   "userAvailabilityAway": "Ausente",
   "userAvailabilityBusy": "Ocupado",
   "userAvailabilityNone": "Nenhum",
-  "userListContacts": "Contacts",
-  "userListSelectedContacts": "Selected ({{selectedContacts}})",
+  "userListContacts": "Contatos",
+  "userListSelectedContacts": "Selecionado ({{selectedContacts}})",
   "userNotFoundMessage": "Você pode não ter permissão com esta conta ou a pessoa pode não estar no {{brandName}}.",
   "userNotFoundTitle": "O {{brandName}} não consegue encontrar esta pessoa.",
-  "userNotVerified": "Get certainty about {{user}}’s identity before connecting.",
+  "userNotVerified": "Tenha certeza sobre a identidade de {{user}} antes de se conectar.",
   "userProfileButtonConnect": "Conectar",
   "userProfileButtonIgnore": "Ignorar",
   "userProfileButtonUnblock": "Desbloquear",
@@ -1306,7 +1370,7 @@
   "videoCallOverlayHangUp": "Encerrar",
   "videoCallOverlayMicrophone": "Microfone",
   "videoCallOverlayShareScreen": "Compartilhar tela",
-  "videoCallParticipantConnecting": "Connecting...",
+  "videoCallParticipantConnecting": "Conectando...",
   "videoCallPaused": "Vídeo pausado",
   "videoCallScreenShareNotSupported": "Seu navegador não oferece suporte a compartilhamento de tela",
   "videoSpeakersTabAll": "Todos ({{count}})",
diff --git a/src/i18n/pt-PT.json b/src/i18n/pt-PT.json
index 53df9dae2b7..9ab0a5ffd6f 100644
--- a/src/i18n/pt-PT.json
+++ b/src/i18n/pt-PT.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Entrada inválida",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "Este endereço de email já está em uso. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "O convite foi revogado ou expirou",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Entrada inválida",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Seguinte",
   "accountForm.terms": "Eu aceito os <terms>termos e condições</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Adicionar",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Verifique sua caixa de correio eletrónico e siga as instruções.",
   "authPostedResendHeadline": "Recebeu email.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Adicionar",
   "authVerifyAccountDetail": "Permite que use o {{brandName}} em vários dispositivos.",
   "authVerifyAccountHeadline": "Adicionar o endereço de e-mail e palavra-passe.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Pode solicitar um novo código {{expiration}}.",
   "authVerifyPasswordHeadline": "Insira a sua palavra-passe",
   "backupCancel": "Cancelar",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Aceitar",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verificar dispositivos",
   "conversationDeviceStartedUsingMany": " começou a usar",
   "conversationDeviceStartedUsingOne": " começou a usar",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " retirou a verificação de um de",
   "conversationDeviceUserDevices": " dispositivos de {{user}}",
   "conversationDeviceYourDevices": " seus dispositivos",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Convidado",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Criar uma conta",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Iniciar sessão",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} pessoas",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Abrir Mapa",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Entregue",
   "conversationMissedMessages": "Não usou este dispositivo durante algum tempo. Algumas mensagens podem não ser mostradas.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Pesquisar por nome",
   "conversationParticipantsTitle": "Pessoas",
   "conversationPing": " pingou",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingou",
   "conversationPlaybackError": "Incapaz de reproduzir",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "• {{tag}} através de giphy.com",
   "extensionsGiphyNoGifs": "Oops, sem gifs",
   "extensionsGiphyRandom": "Aleatório",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancelar pedido",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Remover",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remover?",
   "modalConversationRemoveMessage": "{{user}} não será capaz de enviar ou receber mensagens nesta conversa.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Bloquear {{user}}?",
   "modalUserBlockMessage": "{{user}} não será capaz de o contactar ou adicioná-lo para conversas em grupo.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Desbloquear",
   "modalUserUnblockHeadline": "Desbloquear?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Ligou",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ro-RO.json b/src/i18n/ro-RO.json
index c0cf8c294e8..cbd9c5810ab 100644
--- a/src/i18n/ro-RO.json
+++ b/src/i18n/ro-RO.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Conținut nevalid",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "Adresa de e-mail este deja folosită. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitația a fost revocată sau a expirat",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Conținut nevalid",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Mai departe",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Adaugă",
   "addParticipantsHeader": "Adaugă persoane",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Verifică e-mailul și urmează instrucțiunile.",
   "authPostedResendHeadline": "Ai primit un mesaj.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Adaugă",
   "authVerifyAccountDetail": "Aceasta îți permite să folosești {{brandName}} pe mai multe dispozitive.",
   "authVerifyAccountHeadline": "Adaugă o adresă de e-mail și o parolă.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Poți cere un nou cod de {{expiration}}.",
   "authVerifyPasswordHeadline": "Introdu parola ta",
   "backupCancel": "Renunță",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Ceva nu a mers bine",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Acceptă",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verifică dispozitivele",
   "conversationDeviceStartedUsingMany": " a început să folosească",
   "conversationDeviceStartedUsingOne": " a început să folosească",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unul dintre dispozitivele",
   "conversationDeviceUserDevices": " dispozitivele lui {{user}}",
   "conversationDeviceYourDevices": " tale neverificate",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Vizitator",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Autentificare",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} persoane",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Deschide harta",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Livrat",
   "conversationMissedMessages": "Nu ai folosit acest dispozitiv de ceva timp. Unele mesaje ar putea să nu apară aici.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Caută după nume",
   "conversationParticipantsTitle": "Persoane",
   "conversationPing": " pinguit",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinguit",
   "conversationPlaybackError": "Nu se poate reda",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Ups, nu sunt gif-uri",
   "extensionsGiphyRandom": "La întâmplare",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Prea multe caractere",
   "groupCreationPreferencesErrorNameShort": "Cel puțin un caracter",
   "groupCreationPreferencesHeader": "Grup nou",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Nume grup",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Anulează cererea",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Șterge",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Șterge?",
   "modalConversationRemoveMessage": "{{user}} nu va mai putea trimite sau primi mesaje în această conversație.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blochează pe {{user}}?",
   "modalUserBlockMessage": "{{user}} nu te va putea contacta sau adăuga la conversații de grup.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Deblochează",
   "modalUserUnblockHeadline": "Deblochează?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Apel în curs",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/ru-RU.json b/src/i18n/ru-RU.json
index f2bc4f72776..9687fbfd817 100644
--- a/src/i18n/ru-RU.json
+++ b/src/i18n/ru-RU.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Проверьте введенные данные и повторите попытку",
   "BackendError.LABEL.ALREADY_INVITED": "Этот email уже был приглашен ранее",
-  "BackendError.LABEL.BAD_REQUEST": "Неверный ввод",
+  "BackendError.LABEL.BAD_REQUEST": "Проверьте введенные данные и повторите попытку",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Этот адрес email не разрешен",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Этот номер телефона не разрешен",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Повторите попытку или запросите другой код.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Эта беседа достигла предела участников",
   "BackendError.LABEL.EMAIL_EXISTS": "Этот адрес email уже используется. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Вход с помощью адреса email требуется, если активирована двухфакторная аутентификация",
+  "BackendError.LABEL.EMAIL_REQUIRED": "Вы не можете использовать псевдоним, поскольку активирована двухфакторная аутентификация. Пожалуйста,  авторизуйтесь, используя свой адрес email.",
   "BackendError.LABEL.HANDLE_EXISTS": "Этот псевдоним уже занят",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Пожалуйста, введите псевдоним длиной не менее 2 символов",
   "BackendError.LABEL.INVALID_CODE": "Повторите попытку или запросите другой код.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Недопустимый псевдоним",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Приглашение отозвано или просрочено",
   "BackendError.LABEL.INVALID_OPERATION": "Неверная операция",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Неверный ввод",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Проверьте введенные данные и повторите попытку",
   "BackendError.LABEL.INVALID_PHONE": "Недопустимый номер телефона",
   "BackendError.LABEL.KEY_EXISTS": "Указанный вами адрес email уже зарегистрирован.{supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Проверьте введенные данные и повторите попытку",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Вернуться к информации о беседе",
   "accessibility.conversation.sectionLabel": "Список бесед",
   "accessibility.conversationAssetImageAlt": "Изображение от {{username}} дата {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Открыть параметры обмена сообщениями",
+  "accessibility.conversationContextMenuOpenLabel": "Открыть больше возможностей",
   "accessibility.conversationDetailsActionDevicesLabel": "Показать устройства",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Задать администратора группы",
   "accessibility.conversationDetailsActionNotificationsLabel": "Показать настройки уведомлений",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Пропущенный пинг",
   "accessibility.conversationStatusUnreadReply": "Непрочитанный ответ",
   "accessibility.conversationTitle": "{{username}} статус {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Поиск смайликов",
   "accessibility.giphyModal.close": "Закрыть окно GIF",
   "accessibility.giphyModal.loading": "Загрузка GIF",
   "accessibility.giphyModal.selectGif": "Выбрать GIF",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Настройки - устройства",
   "accessibility.headings.preferencesOptions": "Настройки - настройки",
   "accessibility.headings.sidebar": "Навигация",
+  "accessibility.messageActionsMenuEmoji": "Выбрать смайлик",
+  "accessibility.messageActionsMenuLabel": "Действия с сообщением",
+  "accessibility.messageActionsMenuLike": "Отреагировать сердечком",
+  "accessibility.messageActionsMenuThumbsUp": "Отреагировать пальцем вверх",
   "accessibility.messageDetailsReadReceipts": "Сообщение просмотрено {{readReceiptText}}, открыть подробности",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} реакций, реакция с {{emojiName}}",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} реакция, реакция с {{emojiName}}",
   "accessibility.messages.like": "Понравилось сообщение",
   "accessibility.messages.liked": "Не нравится",
   "accessibility.openConversation": "Открыть профиль {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Вперед",
   "accountForm.terms": "Я принимаю <terms>условия и положения</terms>",
   "accountForm.termsAndPrivacyPolicy": "Я принимаю <privacypolicy>политику конфиденциальности</privacypolicy> и <terms>условия и положения</terms>",
+  "acme.done.button": "OK",
+  "acme.done.button.close": "Закрыть окно 'Сертификат загружен'",
+  "acme.done.headline": "Сертификат загружен",
+  "acme.done.paragraph": "Теперь сертификат активен, и ваше устройство верифицировано. Более подробную информацию об этом сертификате можно найти в Настройках Wire в разделе Устройства.",
+  "acme.error.button.close": "Закрыть окно 'Что-то пошло не так'",
+  "acme.error.button.primary": "Повторить",
+  "acme.error.button.secondary": "Отмена",
+  "acme.error.headline": "Что-то пошло не так",
+  "acme.error.paragraph": "Сертификат загрузить не удалось <br/> <br/> Вы можете повторить попытку получения сертификата сейчас. Или система попытается сделать это автоматически в фоновом режиме в течение следующих 24 часов.",
+  "acme.inProgress.button.close": "Закрыть окно 'Получение сертификата'",
+  "acme.inProgress.headline": "Получить сертификат",
+  "acme.inProgress.paragraph.alt": "Загрузка...",
+  "acme.inProgress.paragraph.main": "Пожалуйста, перейдите в браузер и войдите в сервис сертификации. <br/> <br/> В случае если сайт не открывается, вы можете перейти на него вручную по следующему URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Закрыть окно 'Сертификат сквозной идентификации'",
+  "acme.settingsChanged.button.primary": "Получить сертификат",
+  "acme.settingsChanged.button.secondary": "Напомнить позже",
+  "acme.settingsChanged.headline.alt": "Сертификат сквозной идентификации",
+  "acme.settingsChanged.headline.main": "Настройки команды изменены",
+  "acme.settingsChanged.paragraph": "Для повышения безопасности использования Wire предусмотрена сквозная идентификация. Верификация устройства теперь происходит автоматически с использованием сертификата. <br/> <br/> Введите свои учетные данные Wire на внешней веб-странице, на которую мы вас перенаправим. При таком входе вы автоматически получаете сертификат верификации для данного устройства. При этом будет сохраняться история бесед. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">Узнайте больше о сквозной идентификации </a>.",
   "addParticipantsConfirmLabel": "Добавить",
   "addParticipantsHeader": "Добавить участников",
   "addParticipantsHeaderWithCounter": "Добавить участников ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Проверьте свой почтовый ящик и следуйте инструкциям.",
   "authPostedResendHeadline": "Вам письмо.",
   "authSSOLoginTitle": "Войти с помощью единого входа",
+  "authSetUsername": "Задать псевдоним",
   "authVerifyAccountAdd": "Добавить",
   "authVerifyAccountDetail": "Это позволит использовать {{brandName}} на нескольких устройствах.",
   "authVerifyAccountHeadline": "Добавить email и пароль.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Вы можете запросить новый код {{expiration}}.",
   "authVerifyPasswordHeadline": "Введите свой пароль",
   "backupCancel": "Отмена",
+  "backupDecryptionModalAction": "Продолжить",
+  "backupDecryptionModalMessage": "Резервная копия защищена паролем.",
+  "backupDecryptionModalPlaceholder": "Пароль",
+  "backupDecryptionModalTitle": "Введите пароль",
+  "backupEncryptionModalAction": "Создать резервную копию сейчас",
+  "backupEncryptionModalCloseBtn": "Отмена",
+  "backupEncryptionModalMessage": "Резервная копия будет сжата, и ее можно зашифровать с помощью пароля.",
+  "backupEncryptionModalPlaceholder": "Пароль (необязательно)",
+  "backupEncryptionModalTitle": "Установить пароль",
   "backupExportGenericErrorHeadline": "Не удалось сохранить файл",
   "backupExportGenericErrorSecondary": "Резервное копирование не завершено.",
   "backupExportProgressCompressing": "Подготовка файла резервной копии",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Она пригодится для восстановления истории в случае потери или замены компьютера.",
   "backupImportAccountErrorHeadline": "Некорректная резервная копия",
   "backupImportAccountErrorSecondary": "Вы не можете восстановить историю из другой учетной записи.",
+  "backupImportFormatErrorHeadline": "Несовместимая резервная копия",
+  "backupImportFormatErrorSecondary": "Этот формат резервной копии не поддерживается",
   "backupImportGenericErrorHeadline": "Что-то пошло не так",
   "backupImportGenericErrorSecondary": "Ваша история не может быть восстановлена.",
   "backupImportIncompatibleErrorHeadline": "Некорректная резервная копия",
   "backupImportIncompatibleErrorSecondary": "Вы не можете восстановить историю из другой учетной записи.",
-  "backupImportOutdatedErrorHeadline": "Несовместимая резервная копия",
+  "backupImportPasswordErrorHeadline": "Неверный пароль",
+  "backupImportPasswordErrorSecondary": "Пожалуйста, проверьте введенные данные и повторите попытку",
   "backupImportProgressHeadline": "Подготовка…",
   "backupImportProgressSecondary": "Восстановление истории · {{processed}} из {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "История восстановлена.",
   "backupImportVersionErrorHeadline": "Несовместимая резервная копия",
   "backupImportVersionErrorSecondary": "Эта резервная копия была создана в более новой или устаревшей версии {{brandName}} и не может быть восстановлена.",
+  "backupPasswordHint": "Используйте как минимум {{minPasswordLength}} символов, включая одну строчную букву, одну заглавную букву, цифру и специальный символ.",
   "backupTryAgain": "Повторить попытку",
   "buttonActionError": "Ваш ответ не может быть отправлен, пожалуйста, повторите попытку",
   "callAccept": "Принять",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Верифицируйте устройства",
   "conversationDeviceStartedUsingMany": " начали использовать",
   "conversationDeviceStartedUsingOne": " начал(-а) использовать",
+  "conversationDeviceStartedUsingYou": "  начали использовать",
   "conversationDeviceUnverified": " деверифицировали одно из",
   "conversationDeviceUserDevices": " устройства {{user}}",
   "conversationDeviceYourDevices": " ваши устройства",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Контакты",
   "conversationGuestIndicator": "Гость",
   "conversationImageAssetRestricted": "Получение изображений запрещено",
-  "conversationJoin.buttonExistentAccountOpen": "Открыть в {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, вас пригласили принять участие в беседе в {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Войти в браузере",
   "conversationJoin.existentAccountJoinWithoutLink": "Присоединиться к беседе",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} без аккаунта",
-  "conversationJoin.existentAccountSubhead": "Аудио- и видеоконференции, обмен текстовыми сообщениями, совместное использование файлов и демонстрация экрана - все это со сквозным шифрованием.",
+  "conversationJoin.existentAccountUserName": "Вы вошли как {selfName}",
   "conversationJoin.fullConversationHeadline": "Невозможно присоединиться к беседе",
   "conversationJoin.fullConversationSubhead": "Достигнуто максимальное количество участников в этой беседе.",
   "conversationJoin.hasAccount": "Уже зарегистрированы?",
-  "conversationJoin.headline": "Вас пригласили принять участие в беседе в {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Создать аккаунт",
-  "conversationJoin.invalidCreateAccountText": "для группового общения и вызовов.",
+  "conversationJoin.headline": "Эта беседа ведется в {domain}",
   "conversationJoin.invalidHeadline": "Беседа не найдена",
   "conversationJoin.invalidSubhead": "Срок действия ссылки на эту групповую беседу истек или беседа стала приватной.",
-  "conversationJoin.loginLink": "Вход",
+  "conversationJoin.join": "Присоединиться",
+  "conversationJoin.joinButton": "Присоединиться как временный гость",
+  "conversationJoin.joinWithOtherAccount": "Присоединиться с другим аккаунтом",
+  "conversationJoin.mainHeadline": "Присоединиться к беседе",
   "conversationJoin.namePlaceholder": "Ваше имя",
+  "conversationJoin.noAccountHead": "Нет аккаунта?",
   "conversationJoin.subhead": "Присоединяйтесь к беседе в качестве временного гостя (доступ истекает через 24 часа)",
   "conversationJoin.unsupportedJoinHeadline": "Вас пригласили принять участие в беседе в {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Откройте эту ссылку на своем компьютере.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Избранное",
   "conversationLabelGroups": "Группы",
   "conversationLabelPeople": "Контакты",
-  "conversationLikesCaption": "{{number}} участникам",
+  "conversationLikesCaptionPlural": "{{number}} участника(ов)",
+  "conversationLikesCaptionReactedPlural": "отреагировал {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "отреагировал {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} участник",
   "conversationLocationLink": "Открыть карту",
   "conversationMemberJoined": "[bold]{{name}}[/bold] добавлен(-а) {{users}} в беседу",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] добавил(-а) в беседу {{users}} и [showmore]{{count}} еще[/showmore]",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] удален(-а) {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} был(-а) удален(-а) из этой беседы, поскольку были активированы юридические ограничения. [link]Подробнее[/link]",
   "conversationMemberRemovedYou": "[bold]Вы[/bold] удалены {{users}}",
+  "conversationMemberWereRemoved": "{{users}} были удалены из беседы",
   "conversationMessageDelivered": "Доставлено",
   "conversationMissedMessages": "Вы не использовали это устройство продолжительное время. Некоторые сообщения могут не отображаться.",
   "conversationModalRestrictedFileSharingDescription": "Этим файлом нельзя поделиться из-за ограничений на совместное использование файлов.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Поиск по имени",
   "conversationParticipantsTitle": "Участники",
   "conversationPing": " отправил(-а) пинг",
+  "conversationPingConfirmTitle": "Вы действительно хотите отправить пинг {{memberCount}} пользователям?",
   "conversationPingYou": " отправили пинг",
   "conversationPlaybackError": "Невозможно воспроизвести",
   "conversationPopoverFavorite": "Добавить в избранное",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • через giphy.com",
   "extensionsGiphyNoGifs": "Упс, нет GIF-ок",
   "extensionsGiphyRandom": "Случайно",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] не может быть добавлен в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] не может быть добавлен в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
-  "failedToAddParticipants": "[bold]{{total}} участников[/bold] не удалось добавить в группу.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] и [bold]{{name}}[/bold] не могут быть добавлены в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] не могут быть добавлены в группу, поскольку их бэкэнд не взаимодействует с бэкэндами остальных участников группы.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] не может быть добавлен в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} участников[/bold] не удалось добавить в группу.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] и [bold]{{name}}[/bold] не могут быть добавлены в группу, поскольку их бэкенды не взаимодействуют друг с другом.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] и [bold]{{name}}[/bold] не могут быть добавлены в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] не могут быть добавлены в группу, поскольку их бэкенды не взаимодействуют друг с другом.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] не может быть добавлен в группу, поскольку бэкэнд [bold]{{domain}}[/bold] недоступен.",
   "featureConfigChangeModalApplock": "Обязательная блокировка приложения теперь отключена. При возвращении в приложение не требуется ввод пароля или биометрическая аутентификация.",
   "featureConfigChangeModalApplockHeadline": "Настройки команды изменены",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Камера во время вызовов отключена",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Самоудаляющиеся сообщения включены. Перед написанием сообщения можно установить таймер.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Самоудаляющиеся сообщения теперь обязательны. Новые сообщения будут самоудаляться спустя {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "В {{brandName}} произошли изменения",
+  "federationConnectionRemove": "Бэкэнды [bold]{{backendUrlOne}}[/bold] и [bold]{{backendUrlTwo}}[/bold] прекратили взаимодействие.",
+  "federationDelete": "[bold]Ваш бэкэнд[/bold] прекратил взаимодействие с [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "Файл от&nbsp;[bold]{{name}}[/bold]&nbsp; не может быть открыт",
   "fileTypeRestrictedOutgoing": "Совместное использование файлов с расширением {{fileExt}} запрещено вашей организацией",
   "folderViewTooltip": "Папки",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Слишком много символов",
   "groupCreationPreferencesErrorNameShort": "Не менее 1 символа",
   "groupCreationPreferencesHeader": "Создать группу",
+  "groupCreationPreferencesNonFederatingEditList": "Изменить список участников",
+  "groupCreationPreferencesNonFederatingHeadline": "Невозможно создать группу",
+  "groupCreationPreferencesNonFederatingLeave": "Отменить создание группы",
+  "groupCreationPreferencesNonFederatingMessage": "Пользователи бэкендов {{backends}} не могут присоединиться к общей групповой беседе, так как их бэкенды не могут взаимодействовать друг с другом. Для создания группы удалите затронутых пользователей. [link]Подробнее[/link]",
   "groupCreationPreferencesPlaceholder": "Название группы",
   "groupParticipantActionBlock": "Блокировать…",
   "groupParticipantActionCancelRequest": "Отменить запрос…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Не удалось отправить сообщение из-за проблем с подключением.",
   "messageCouldNotBeSentRetry": "Повторить",
   "messageDetailsEdited": "Изменено: {{edited}}",
-  "messageDetailsNoLikes": "Сообщение еще никому не понравилось.",
+  "messageDetailsNoReactions": "На сообщение еще никто не отреагировал",
   "messageDetailsNoReceipts": "Сообщение еще никем не прочитано.",
   "messageDetailsReceiptsOff": "Отчетов о прочтении не существовало, когда это сообщение было отправлено.",
   "messageDetailsSent": "Отправлено: {{sent}}",
   "messageDetailsTitle": "Детали",
-  "messageDetailsTitleLikes": "Понравилось{{count}}",
+  "messageDetailsTitleReactions": "Реакции{{count}}",
   "messageDetailsTitleReceipts": "Прочитано{{count}}",
   "messageFailedToSendHideDetails": "Скрыть детали",
   "messageFailedToSendParticipants": "{{count}} участников",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "не получит ваше сообщение.",
   "messageFailedToSendWillReceivePlural": "получит ваше сообщение позднее.",
   "messageFailedToSendWillReceiveSingular": "получит ваше сообщение позднее.",
+  "mlsConversationRecovered": "Вы давно не пользовались этим устройством, или возникла проблема. Некоторые старые сообщения могут не отображаться.",
   "mlsToggleInfo": "При включении в беседе будет использоваться новый протокол безопасности уровня обмена сообщениями (MLS).",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Не удалось изменить статус сервисов.",
   "modalConversationRemoveAction": "Удалить",
   "modalConversationRemoveCloseBtn": "Закрыть окно 'Удалить'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Отключить доступ?",
+  "modalConversationRemoveGuestsHeadline": "Отключить доступ гостей?",
   "modalConversationRemoveGuestsMessage": "Текущие гости будут удалены из беседы. Новые гости допущены не будут.",
+  "modalConversationRemoveGuestsOrServicesAction": "Отключить",
   "modalConversationRemoveHeadline": "Удалить?",
   "modalConversationRemoveMessage": "{{user}} больше не сможет отправлять и получать сообщения в этой беседе.",
+  "modalConversationRemoveServicesHeadline": "Отключить доступ сервисов?",
   "modalConversationRemoveServicesMessage": "Текущие сервисы будут удалены из беседы. Новые сервисы допущены не будут.",
   "modalConversationRevokeLinkAction": "Отозвать ссылку",
   "modalConversationRevokeLinkCloseBtn": "Закрыть окно 'Отозвать ссылку'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Заблокировать {{user}}?",
   "modalUserBlockMessage": "{{user}} больше не сможет связаться с вами или добавить вас в групповые беседы.",
   "modalUserBlockedForLegalHold": "Этот пользователь заблокирован из-за юридических ограничений. [link]Подробнее[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Запрос на добавление не может быть принят",
   "modalUserCannotBeAddedHeadline": "Гости не могут быть добавлены",
-  "modalUserCannotConnectLegalHoldHeadline": "Невозможно подключиться к этому пользователю",
-  "modalUserCannotConnectLegalHoldMessage": "Вы не можете подключиться к этому пользователю из-за юридических ограничений. [link]Подробнее[/link]",
+  "modalUserCannotCancelConnectionMessage": "Запрос на добавление не может быть отменен",
+  "modalUserCannotConnectHeadline": "Невозможно добавить",
+  "modalUserCannotIgnoreConnectionMessage": "Запрос на добавление не может быть проигнорирован",
+  "modalUserCannotSendConnectionLegalHoldMessage": "Вы не можете связаться с этим пользователем из-за юридических ограничений. [link]Подробнее[/link]",
+  "modalUserCannotSendConnectionMessage": "Не удалось отправить запрос на добавление",
+  "modalUserCannotSendConnectionNotFederatingMessage": "Вы не можете отправить запрос на подключение, поскольку ваш бэкэнд не объединен с бэкэндом {{username}}.",
   "modalUserLearnMore": "Подробнее",
   "modalUserUnblockAction": "Разблокировать",
   "modalUserUnblockHeadline": "Разблокировать?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Звонил(-а)",
   "oauth.allow": "Разрешить",
   "oauth.cancel": "Не разрешать",
-  "oauth.details": "Если вы примете перечисленные разрешения, Wire™ сможет подключаться к вашему календарю. Он не сможет видеть содержимое вашего календаря. Доступны будут только те события, которые происходят с Wire. Если вы не примете указанные разрешения, вы не сможете использовать это дополнение.",
+  "oauth.details": "Если вы подтвердите перечисленные выше разрешения, ваш Outlook Calendar сможет подключиться к Wire. В противном случае использовать эту надстройку будет невозможно.",
   "oauth.headline": "Разрешения",
-  "oauth.learnMore": "<learnMore>Узнать больше</learnMore> об этих разрешениях в настройках.",
+  "oauth.learnMore": "<learnMore>Узнать больше</learnMore> об этих разрешениях.",
   "oauth.logout": "Сменить аккаунт",
   "oauth.privacypolicy": "<privacypolicy>Политика конфиденциальности</privacypolicy> Wire",
-  "oauth.scope.read_feature_configs": "Доступ команда к возможностям конфигурации",
-  "oauth.scope.read_self": "Доступ к информации пользователя",
-  "oauth.scope.write_conversations": "Создать беседу",
-  "oauth.scope.write_conversations_code": "Создать гостевую ссылку на беседу",
-  "oauth.subhead": "{app} необходимы разрешения для:",
+  "oauth.scope.read_feature_configs": "Просмотр конфигурации возможностей вашей команды",
+  "oauth.scope.read_self": "Просмотр псевдонима Wire, названия профиля и email",
+  "oauth.scope.write_conversations": "Создать беседу в Wire",
+  "oauth.scope.write_conversations_code": "Создание гостевых ссылок на беседы в Wire",
+  "oauth.subhead": "Microsoft Outlook требует вашего разрешения для:",
   "offlineBackendLearnMore": "Подробнее",
   "ongoingAudioCall": "Текущий аудиовызов с {{conversationName}}.",
   "ongoingGroupAudioCall": "Текущий групповой вызов с {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "История",
   "preferencesOptionsBackupImportHeadline": "Восстановление",
   "preferencesOptionsBackupImportSecondary": "Восстановить историю можно только из резервной копии одной и той же платформы. Резервная копия перезапишет беседы на этом устройстве.",
+  "preferencesOptionsBackupTryAgain": "Повторить попытку",
   "preferencesOptionsCall": "Звонки",
   "preferencesOptionsCallLogs": "Устранение неполадок",
   "preferencesOptionsCallLogsDetail": "Сохранить отладочный отчет вызова.  Эта информация помогает службе поддержки {{brandName}} диагностировать проблемы со звонками.",
diff --git a/src/i18n/si-LK.json b/src/i18n/si-LK.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/si-LK.json
+++ b/src/i18n/si-LK.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/sk-SK.json b/src/i18n/sk-SK.json
index b543e9ad483..e55784af6ba 100644
--- a/src/i18n/sk-SK.json
+++ b/src/i18n/sk-SK.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Pridať",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Skontrolujte Vašu e-mailovú schránku a postupujte podľa pokynov.",
   "authPostedResendHeadline": "Máte e-mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Pridať",
   "authVerifyAccountDetail": "To vám umožní používať {{brandName}} na viacerých zariadeniach.",
   "authVerifyAccountHeadline": "Pridať e-mailovú adresu a heslo.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Môžete požiadať o nový kód {{expiration}}.",
   "authVerifyPasswordHeadline": "Zadajte Vaše heslo",
   "backupCancel": "Zrušiť",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Prijať",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " overiť zariadenia",
   "conversationDeviceStartedUsingMany": " začal používať",
   "conversationDeviceStartedUsingOne": " začal používať",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " neoverený jeden z",
   "conversationDeviceUserDevices": " {{user}}´s zariadenia",
   "conversationDeviceYourDevices": " Vaše zariadenia",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Hosť",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Prihlásenie",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} ľudí",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Otvoriť mapu",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Doručená",
   "conversationMissedMessages": "Na chvíľu ste nepoužili toto zariadenie. Niektoré správy sa nemusia zobraziť.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Vyhľadať podľa mena",
   "conversationParticipantsTitle": "Ľudia",
   "conversationPing": " pingol",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingol",
   "conversationPlaybackError": "Prehrávanie sa nepodarilo",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • cez giphy.com",
   "extensionsGiphyNoGifs": "Ej, žiadne gify",
   "extensionsGiphyRandom": "Náhodný",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Zrušiť požiadavku",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Odstrániť",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Odstrániť?",
   "modalConversationRemoveMessage": "{{user}} nebude môcť odosielať ani prijímať správy v tomto rozhovore.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokovať {{user}}?",
   "modalUserBlockMessage": "{{user}} Vás nebude môcť kontaktovať, alebo Vás pozvať do skupinového rozhovoru.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Odblokovať",
   "modalUserUnblockHeadline": "Odblokovať?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Volal",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/sl-SI.json b/src/i18n/sl-SI.json
index c9f8d6a2d61..9ff238e8c3f 100644
--- a/src/i18n/sl-SI.json
+++ b/src/i18n/sl-SI.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Dodaj",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Preverite vašo e-pošto in sledite navodilom.",
   "authPostedResendHeadline": "Imate pošto.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Dodaj",
   "authVerifyAccountDetail": "To vam omogoča uporabo {{brandName}} na večih napravah.",
   "authVerifyAccountHeadline": "Dodajte e-poštni naslov in geslo.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Lahko zahtevate novo kodo {{expiration}}.",
   "authVerifyPasswordHeadline": "Vnesite vaše geslo",
   "backupCancel": "Prekliči",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Sprejmi",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " preverite naprave",
   "conversationDeviceStartedUsingMany": " začel(-a) uporabljati",
   "conversationDeviceStartedUsingOne": " začel(-a) uporabljati",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " odstranil(-a) preveritev ene izmed",
   "conversationDeviceUserDevices": " Naprave od {{user}}",
   "conversationDeviceYourDevices": " vaših naprav",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Prijava",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} oseb",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Odpri zemljevid",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Dostavljeno",
   "conversationMissedMessages": "Te naprave nekaj časa niste uporabljali. Nekatera sporočila se morda tukaj ne bodo pojavila.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Iskanje po imenu",
   "conversationParticipantsTitle": "Osebe",
   "conversationPing": " je pingal(-a)",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " je pingal(-a)",
   "conversationPlaybackError": "Ni možno predvajati",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • preko giphy.com",
   "extensionsGiphyNoGifs": "Ups, ni najdenih gifov",
   "extensionsGiphyRandom": "Naključno",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Prekliči prošnjo",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "V redu",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Odstrani",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Odstrani?",
   "modalConversationRemoveMessage": "{{user}} ne bo mogel pošiljati ali prejeti sporočila v tem pogovoru.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blokiraj {{user}}?",
   "modalUserBlockMessage": "{{user}} vas ne bo mogel kontaktirati ali dodati v skupinske pogovore.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Odblokiraj",
   "modalUserUnblockHeadline": "Odblokiraj?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Je klical(-a)",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/sr-SP.json b/src/i18n/sr-SP.json
index f85d3be921b..26bfd3833d5 100644
--- a/src/i18n/sr-SP.json
+++ b/src/i18n/sr-SP.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Проверите своје податке и покушајте поново",
   "BackendError.LABEL.ALREADY_INVITED": "Ова адреса е-поште је већ позвана",
-  "BackendError.LABEL.BAD_REQUEST": "Нетачан унос",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Ова адреса е-поште није прихваћена",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Овај телефонски број није прихваћен",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "РАЗГОВОР НЕ ПОСТОЈИ",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Овај разговор је достигао максимум учесника",
   "BackendError.LABEL.EMAIL_EXISTS": "Ова е-маил адреса је већ у употреби. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Ово корисничко име је већ заузето",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Унесите корисничко име са најмање 2 карактера",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Ово корисничко име је неважеће",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Позив је опозван или је истекао",
   "BackendError.LABEL.INVALID_OPERATION": "Неважећа операција",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Нетачан унос",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Овај телефонски број није важећи",
   "BackendError.LABEL.KEY_EXISTS": "Ова имејл адреса је већ регистрована. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Провјерите своје податке и покушајте поново",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Следећe",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Додај",
   "addParticipantsHeader": "Додајте учеснике",
   "addParticipantsHeaderWithCounter": "Додајте учеснике ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Проверите сандуче е-поште и следите упутства.",
   "authPostedResendHeadline": "Стигла вам је пошта.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Додај",
   "authVerifyAccountDetail": "Ово омогућава коришћење Вајера на више уређаја.",
   "authVerifyAccountHeadline": "Додај адресу е-поште и лозинку.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Нови код можете затражити {{expiration}}.",
   "authVerifyPasswordHeadline": "Унесите своју лозинку",
   "backupCancel": "Откажи",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Није могуће сачувати датотеку",
   "backupExportGenericErrorSecondary": "Резервна копија није завршена.",
   "backupExportProgressCompressing": "Припрема датотеке сигурносне копије",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Ово можете да користите за враћање историје ако изгубите рачунар или пребаците на нови.",
   "backupImportAccountErrorHeadline": "Погрешно резервно копирање",
   "backupImportAccountErrorSecondary": "Не можете да вратите историју са другог налога.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Нешто није у реду",
   "backupImportGenericErrorSecondary": "Није могуће вратити историју.",
   "backupImportIncompatibleErrorHeadline": "Погрешно резервно копирање",
   "backupImportIncompatibleErrorSecondary": "Не можете да вратите историју са другог налога.",
-  "backupImportOutdatedErrorHeadline": "Некомпатибилна резервна копија",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Припрема…",
   "backupImportProgressSecondary": "Враћање историје · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Историја је враћена.",
   "backupImportVersionErrorHeadline": "Некомпатибилна резервна копија",
   "backupImportVersionErrorSecondary": "Ова резервна копија је креирана новијом или застарелом верзијом {{brandName}} и не може се овде обновити.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Покушајте поново",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Прихвати",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " овери уређаје",
   "conversationDeviceStartedUsingMany": " поче коришћење",
   "conversationDeviceStartedUsingOne": " поче коришћење",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " скину поузданост једног",
   "conversationDeviceUserDevices": " {{user}}´s уређаје\n",
   "conversationDeviceYourDevices": " ваши уређаји",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Гост",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Отвори у {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Придружите се разговору",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Већ имате налог?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Направи налог",
-  "conversationJoin.invalidCreateAccountText": "за групно размењивање порука и конференцијске позиве.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Пријавите се",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Твоје име",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Отворите ову везу на рачунару.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Фаворити",
   "conversationLabelGroups": "Групе",
   "conversationLabelPeople": "Људи",
-  "conversationLikesCaption": "{{number}} људи",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Отвори мапу",
   "conversationMemberJoined": "[bold]{{name}}[/bold] додао је {{users}} у разговор",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] додао је {{users}}, и [showmore]{{count}} више[/showmore] у разговор",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] уклоњено је {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]ви[/bold] сте уклонили {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "испоручено",
   "conversationMissedMessages": "Овај уређај нисте користили неко време. Неке поруке се можда неће приказати овде.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Претрага по имену",
   "conversationParticipantsTitle": "Особе",
   "conversationPing": " пингова",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " пингова",
   "conversationPlaybackError": "Не могу да пустим",
   "conversationPopoverFavorite": "Додај у фаворите",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Упс, нема гифова",
   "extensionsGiphyRandom": "Насумице",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Фолдери",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Превише карактера",
   "groupCreationPreferencesErrorNameShort": "Барем 1 знак",
   "groupCreationPreferencesHeader": "Створити групу",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Назив групе",
   "groupParticipantActionBlock": "Блокирати…",
   "groupParticipantActionCancelRequest": "Откажи захтев",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Измењено: {{edited}}",
-  "messageDetailsNoLikes": "Нико још није лајковао ову поруку",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Још нико није прочитао ову поруку.",
   "messageDetailsReceiptsOff": "потврде читања нису биле укључене када је та порука послана.",
   "messageDetailsSent": "Послано: {{sent}}",
   "messageDetailsTitle": "Детаљи",
-  "messageDetailsTitleLikes": "Свиђа ми се{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Прочитајте {{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "У реду",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Уклони",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Уклонити?",
   "modalConversationRemoveMessage": "{{user}} неће моћи да шаље или прима поруке у овом разговору.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Опозови везу",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Блокирај {{user}}?",
   "modalUserBlockMessage": "{{user}} неће бити у могућности да вас контактира или да вас дода у групне разговоре.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Одблокирај",
   "modalUserUnblockHeadline": "Одблокирати?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "позва",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Историја",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Историју можете да вратите само из резервне копије исте платформе. Резервна копија ће пребрисати разговоре које можете водити на овом уређају.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Решавање проблема",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/sv-SE.json b/src/i18n/sv-SE.json
index 507db65666d..cc440dda7aa 100644
--- a/src/i18n/sv-SE.json
+++ b/src/i18n/sv-SE.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Lägg till",
   "addParticipantsHeader": "Lägg till människor",
   "addParticipantsHeaderWithCounter": "Lägg till ({{number}}) människor",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Kontrollera din inkorg och följ instruktionerna.",
   "authPostedResendHeadline": "Du har fått mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Lägg till",
   "authVerifyAccountDetail": "Detta gör så du kan använda {{brandName}} på flera enheter.",
   "authVerifyAccountHeadline": "Lägg till e-postadress och lösenord.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Du kan begära en ny kod inom {{expiration}}.",
   "authVerifyPasswordHeadline": "Ange ditt lösenord",
   "backupCancel": "Avbryt",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Filen kunde inte sparas",
   "backupExportGenericErrorSecondary": "Säkerhetskopieringen slutfördes inte.",
   "backupExportProgressCompressing": "Förbereder filen för säkerhetskopiering",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Fel säkerhetskopia",
   "backupImportAccountErrorSecondary": "Du kan inte återställa historik från ett annorlunda konto.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Någonting gick fel",
   "backupImportGenericErrorSecondary": "Din historik kunde inte återställas.",
   "backupImportIncompatibleErrorHeadline": "Fel säkerhetskopia",
   "backupImportIncompatibleErrorSecondary": "Du kan inte återställa historik från ett annorlunda konto.",
-  "backupImportOutdatedErrorHeadline": "Inkompatibel säkerhetskopia",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Förbereder…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Historiken återställdes.",
   "backupImportVersionErrorHeadline": "Inkompatibel säkerhetskopia",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Försök igen",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Acceptera",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " verifiera enheter",
   "conversationDeviceStartedUsingMany": " började använda",
   "conversationDeviceStartedUsingOne": " började använda",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}\"s enheter",
   "conversationDeviceYourDevices": " dina enheter",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Gäst",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} personer",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Öppna karta",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] tog bort {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Du[/bold] tog bort {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Levererat",
   "conversationMissedMessages": "Du har inte använt denna enhet på ett tag. Några meddelanden kanske inte dyker upp här.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Sök efter namn",
   "conversationParticipantsTitle": "Personer",
   "conversationPing": " pingade",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingade",
   "conversationPlaybackError": "Kunde inte spela upp",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, inga giffar",
   "extensionsGiphyRandom": "Slumpad",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "För många tecken",
   "groupCreationPreferencesErrorNameShort": "Åtminstone 1 tecken",
   "groupCreationPreferencesHeader": "Ny grupp",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Gruppens namn",
   "groupParticipantActionBlock": "Blockera kontakt…",
   "groupParticipantActionCancelRequest": "Avbryt begäran",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Detaljer",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Ta bort",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Ta bort?",
   "modalConversationRemoveMessage": "{{user}} kommer inte att kunna skicka eller ta emot meddelanden i den här konversationen.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Återkalla länk",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Blockera {{user}}?",
   "modalUserBlockMessage": "{{user}} kommer inte kunna kontakta dig eller lägga till dig till gruppkonversationer.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Avblockera",
   "modalUserUnblockHeadline": "Avblockera?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Ringt",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Historik",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Felsökning",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/th-TH.json b/src/i18n/th-TH.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/th-TH.json
+++ b/src/i18n/th-TH.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/tr-TR.json b/src/i18n/tr-TR.json
index 9884aa3aa90..900c6fe821c 100644
--- a/src/i18n/tr-TR.json
+++ b/src/i18n/tr-TR.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Lütfen bilgilerinizi doğrulayın ve tekrar deneyin",
   "BackendError.LABEL.ALREADY_INVITED": "Bu e-posta zaten davet edildi",
-  "BackendError.LABEL.BAD_REQUEST": "Geçersiz girdi",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Bu e-posta adresi kabul edilemiyor",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Bu telefon numarası kabul edilemiyor",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "SOHBET BULUNAMADI",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Bu sohbet katılımcıların sınırına ulaştı",
   "BackendError.LABEL.EMAIL_EXISTS": "E-posta zaten kullanılıyor. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Bu kullanıcı adı zaten alınmış",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Lütfen en az 2 karakterden oluşan bir kullanıcı adı girin",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Bu kullanıcı adı geçersiz",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Davet geri çevrildi veya geçerliliğini yitirdi",
   "BackendError.LABEL.INVALID_OPERATION": "Geçersiz işlem",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Geçersiz girdi",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Bu telefon numarası geçersiz",
   "BackendError.LABEL.KEY_EXISTS": "E-posta zaten kaydedilmiş. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Lütfen bilgilerinizi doğrulayın ve yeniden deneyin",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "İleri",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Ekle",
   "addParticipantsHeader": "Katılımcıları ekle",
   "addParticipantsHeaderWithCounter": "({{number}}) Katılımcı ekle",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "E-posta gelen kutunuzu kontrol edin ve talimatları izleyin.",
   "authPostedResendHeadline": "E-posta geldi.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Ekle",
   "authVerifyAccountDetail": "Bu sizin {{brandName}}’ı birden fazla cihazda kullanmanıza olanak sağlar.",
   "authVerifyAccountHeadline": "Bir e-posta adresi ve şifre ekleyin.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "{{expiration}} içerisinde yeni bir kod isteyebilirsiniz.",
   "authVerifyPasswordHeadline": "Şifrenizi girin",
   "backupCancel": "İptal",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Dosya kaydedilemedi",
   "backupExportGenericErrorSecondary": "Yedekleme tamamlanmadı.",
   "backupExportProgressCompressing": "Yedekleme dosyası hazırlanıyor",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Bilgisayarınızı kaybederseniz veya yenisine geçerseniz, geçmişi geri yüklemek için bunu kullanabilirsiniz.",
   "backupImportAccountErrorHeadline": "Yanlış yedek",
   "backupImportAccountErrorSecondary": "Geçmişi farklı bir hesaptan geri yükleyemezsiniz.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Bir şeyler yanlış gitti",
   "backupImportGenericErrorSecondary": "Geçmişiniz geri yüklenemedi.",
   "backupImportIncompatibleErrorHeadline": "Yanlış yedek",
   "backupImportIncompatibleErrorSecondary": "Geçmişi farklı bir hesaptan geri yükleyemezsiniz.",
-  "backupImportOutdatedErrorHeadline": "Uyumsuz yedek",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Hazırlanıyor…",
   "backupImportProgressSecondary": "Geri yükleme geçmişi · {{processed}} / {{total}} - %{{progress}}",
   "backupImportSuccessHeadline": "Geçmiş geri yüklendi.",
   "backupImportVersionErrorHeadline": "Uyumsuz yedek",
   "backupImportVersionErrorSecondary": "Bu yedekleme, {{brandName}} adlı kullanıcının daha yeni veya eski bir sürümü tarafından oluşturuldu ve burada geri yüklenemez.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Tekrar Deneyin",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Kabul et",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " cihazları doğrula",
   "conversationDeviceStartedUsingMany": " kullanmaya başladı",
   "conversationDeviceStartedUsingOne": " kullanmaya başladı",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " doğrulanmamışlardan bir tane",
   "conversationDeviceUserDevices": " {{user}} ’in cihazları",
   "conversationDeviceYourDevices": " cihazların",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Misafir",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "{brandName} 'de aç",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Sohbete katılın",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Zaten bir hesabınız var mı?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Bir hesap oluştur",
-  "conversationJoin.invalidCreateAccountText": "grup mesajlaşma ve konferans aramaları için.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Giriş yap",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "İsminiz",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Bilgisayarınızda bu bağlantıyı açın.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} kişi",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Haritayı Aç",
   "conversationMemberJoined": "[bold]{{name}}[/bold]] sohbete {{users}} kullanıcısını ekledi",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold], sohbete {{users}} ve [showmore]{{count}} daha fazla [/showmore] kişi ekledi",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] {{users}} kullanıcısını çıkardı",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Siz[/bold] {{users}} kullanıcısını çıkardınız",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Teslim edildi",
   "conversationMissedMessages": "Bir süredir bu cihazı kullanmıyorsun. Bazı mesajlar gösterilmeyebilir.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "İsme göre ara",
   "conversationParticipantsTitle": "İnsanlar",
   "conversationPing": " pingledi",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pingledi",
   "conversationPlaybackError": "Oynatılamıyor",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • giphy.com aracılığıyla",
   "extensionsGiphyNoGifs": "Olamaz, hiç Gif yok",
   "extensionsGiphyRandom": "Rastgele",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Çok fazla karakter",
   "groupCreationPreferencesErrorNameShort": "En az 1 karakter",
   "groupCreationPreferencesHeader": "Grup oluştur",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Grup adı",
   "groupParticipantActionBlock": "Engelle…",
   "groupParticipantActionCancelRequest": "İsteği iptal et",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "{{edited}}’da düzenlenmiş",
-  "messageDetailsNoLikes": "Bu mesajı henüz kimse beğenmemiş.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Bu mesajı henüz kimse okumamış.",
   "messageDetailsReceiptsOff": "Bu mesaj gönderildiğinde okuma bilgisi açık değildi.",
   "messageDetailsSent": "{{sent}}'de gönderildi",
   "messageDetailsTitle": "Ayrıntılar",
-  "messageDetailsTitleLikes": "{{count}} Beğeni",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "{{count}} Okunan",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "TAMAM",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Çıkart",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Çıkar?",
   "modalConversationRemoveMessage": "{{user}} bu konuşmaya mesaj gönderemeyecek ve bu konuşmadan mesaj alamayacak.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Bağlantıyı kaldır",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "{{user}} engellensin mi?",
   "modalUserBlockMessage": "{{user}} sizinle iletişim kuramayacak ve sizi grup konuşmalarına ekleyemeyecek.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Engeli kaldır",
   "modalUserUnblockHeadline": "Engeli kaldır?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Aradı",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Geçmiş",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Geçmişi yalnızca aynı platformun yedeğinden geri yükleyebilirsiniz. Yedeklemeniz, bu cihazda olabilecek görüşmelerin üzerine yazacaktır.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Sorun Giderme",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/uk-UA.json b/src/i18n/uk-UA.json
index 28b358c3f97..07fd45cf502 100644
--- a/src/i18n/uk-UA.json
+++ b/src/i18n/uk-UA.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Будь ласка, перевірте ваші дані та повторіть спробу",
   "BackendError.LABEL.ALREADY_INVITED": "Користувача з цією емейл-адресою вже запрошено",
-  "BackendError.LABEL.BAD_REQUEST": "Неприпустимий ввід",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "Дана email-адреса неприпустима",
   "BackendError.LABEL.BLACKLISTED_PHONE": "Неприпустимий номер телефону",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "Дана розмова переповнена",
   "BackendError.LABEL.EMAIL_EXISTS": "Ця адреса електронної пошти вже використовується. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "Даний нік вже використовується",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Будь ласка, введіть ім'я користувача, яке містить принаймні 2 символи",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "Даний нік невалідний",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Запрошення було відкликане через закінчення терміну його дії",
   "BackendError.LABEL.INVALID_OPERATION": "Неприпустима операція",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Неприпустимий ввід",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "Неприпустимий номер телефону",
   "BackendError.LABEL.KEY_EXISTS": "Ця електронна адреса вже зареєстрована. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Будь ласка, перевірте ваші дані та повторіть спробу",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Далі",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Додати",
   "addParticipantsHeader": "Додати учасників",
   "addParticipantsHeaderWithCounter": "Додати учасників ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Перевірте вашу поштову скриньку і дотримуйтесь надісланих інструкцій.",
   "authPostedResendHeadline": "Ви отримали нового листа.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Додати",
   "authVerifyAccountDetail": "Це дасть змогу використовувати {{brandName}} на різних пристроях.",
   "authVerifyAccountHeadline": "Додайте email та пароль.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "Ви можете надіслати запит запит на новий код {{expiration}}.",
   "authVerifyPasswordHeadline": "Введіть свій пароль",
   "backupCancel": "Скасувати",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "Не вдалося зберегти файл",
   "backupExportGenericErrorSecondary": "Резервне копіювання не завершено.",
   "backupExportProgressCompressing": "Підготовка файлу резевної копії",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "Даний функціонал може бути корисним, якщо ваш комп’ютер вийде з ладу або ви почнете використовувати новий.",
   "backupImportAccountErrorHeadline": "Несумісна резервна копія",
   "backupImportAccountErrorSecondary": "Ви не можете відновити історію з іншого акаунту.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Щось пішло не так",
   "backupImportGenericErrorSecondary": "Ваша історія не може бути відновлена.",
   "backupImportIncompatibleErrorHeadline": "Несумісна резервна копія",
   "backupImportIncompatibleErrorSecondary": "Ви не можете відновити історію з іншого акаунту.",
-  "backupImportOutdatedErrorHeadline": "Несумісний файл резервної копії",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Підготовка…",
   "backupImportProgressSecondary": "Відновлення історії розмов · {{processed}} з {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "Історію розмов відновлено.",
   "backupImportVersionErrorHeadline": "Несумісний файл резервної копії",
   "backupImportVersionErrorSecondary": "Цю резервну копію було створено новішою або застарілою версією {{brandName}}, тому її неможливо відновити.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Спробувати ще раз",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Прийняти",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Верифікувати пристрої",
   "conversationDeviceStartedUsingMany": " почав(-ла) використовувати",
   "conversationDeviceStartedUsingOne": " почав(-ла) використовувати",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " скасував(-ла) верифікацію одного з",
   "conversationDeviceUserDevices": " пристрої {{user}}",
   "conversationDeviceYourDevices": " ваші пристрої",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Гість",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Відкрити в {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Приєднатися до розмови",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Вже зареєстровані?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Створити акаунт",
-  "conversationJoin.invalidCreateAccountText": "для групових повідомлень і конференц-зв'язку.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Увійти",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Ваше ім’я",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Відкрийте цей лінк на вашому комп'ютері.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Вподобання",
   "conversationLabelGroups": "Групи",
   "conversationLabelPeople": "Учасники",
-  "conversationLikesCaption": "{{number}} учасників",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Відкрити карту",
   "conversationMemberJoined": "[bold]{{name}}[/bold] додав(-ла) до розмови {{users}}",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] додали до розмови {{users}} та ще [showmore]{{count}}[/showmore]",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] видалив(-ла) {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]Ви[/bold] видалили {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Доставлене",
   "conversationMissedMessages": "Ви не користувались цим простроєм протягом певного часу. Деякі повідомлення можуть не відображатися тут.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Пошук за іменем",
   "conversationParticipantsTitle": "Список контактів",
   "conversationPing": " відправив(-ла) пінг",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " відправив(-ла) пінг",
   "conversationPlaybackError": "Неможливо відтворити",
   "conversationPopoverFavorite": "Додати до вподобань",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • через giphy.com",
   "extensionsGiphyNoGifs": "Упс, анімацій не знайдено",
   "extensionsGiphyRandom": "Випадкова",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Теки",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Занадто багато символів",
   "groupCreationPreferencesErrorNameShort": "Не менше 1 символу",
   "groupCreationPreferencesHeader": "Нова група",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Ім’я групи",
   "groupParticipantActionBlock": "Заблокувати…",
   "groupParticipantActionCancelRequest": "Скасувати запит…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Відредаговане: {{edited}}",
-  "messageDetailsNoLikes": "Це повідомлення поки що ніхто не лайкнув.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "Це повідомлення поки що ніхто не переглянув.",
   "messageDetailsReceiptsOff": "Звіти про перегляд були вимкнені, коли це повідомлення було надіслано.",
   "messageDetailsSent": "Відправлене: {{sent}}",
   "messageDetailsTitle": "Подробиці",
-  "messageDetailsTitleLikes": "Сподобалось{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Переглянуте{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "Видалити",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Видалити?",
   "modalConversationRemoveMessage": "{{user}} більше не зможе надсилати або отримувати повідомлення в цій розмові.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Відкликати лінк",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Заблокувати {{user}}?",
   "modalUserBlockMessage": "{{user}} не буде мати можливості зв’язатися з вами або додати вас до групових розмов.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Розблокувати",
   "modalUserUnblockHeadline": "Розблокувати?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Дзвонив(-ла)",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "Історія",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "Історію розмов можна відновити тільки з резервної копії, зробленої на тій же платформі. Резервна копія перезапише розмови, які ви, можливо, уже маєте на цьому пристрої.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Усунення проблем",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/uz-UZ.json b/src/i18n/uz-UZ.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/uz-UZ.json
+++ b/src/i18n/uz-UZ.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/vi-VN.json b/src/i18n/vi-VN.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/vi-VN.json
+++ b/src/i18n/vi-VN.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json
index 34ffab7c6a5..755fe515b73 100644
--- a/src/i18n/zh-CN.json
+++ b/src/i18n/zh-CN.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "请检查您提供的资料然后重试。",
   "BackendError.LABEL.ALREADY_INVITED": "已发出邀请到此电子邮件",
-  "BackendError.LABEL.BAD_REQUEST": "输入内容无效",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "不允许使用此电子邮件地址",
   "BackendError.LABEL.BLACKLISTED_PHONE": "不允许使用此号码",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "未找到会话",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "此对话参与者人数已达到限制",
   "BackendError.LABEL.EMAIL_EXISTS": "此电子邮件地址已经注册。{supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "此用户名已被使用",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "请输入至少2个字符的用户名",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "用户名无效",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "请求已撤销或过期。",
   "BackendError.LABEL.INVALID_OPERATION": "操作无效",
-  "BackendError.LABEL.INVALID_PAYLOAD": "输入内容无效",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "此电话号码无效",
   "BackendError.LABEL.KEY_EXISTS": "此电子邮件地址已被注册。{supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "请验证您的详细信息并重试",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "继续",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "新增",
   "addParticipantsHeader": "新增好友",
   "addParticipantsHeaderWithCounter": "添加人员（{{number}}）",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "检查您的收件箱并按照说明进行操作。",
   "authPostedResendHeadline": "您有新邮件",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "新增",
   "authVerifyAccountDetail": "允许您在不同设备上使用{{brandName}}。",
   "authVerifyAccountHeadline": "添加电子邮件地址和密码。",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "您可以在 {{expiration}} 后请求新的验证码。",
   "authVerifyPasswordHeadline": "输入密码",
   "backupCancel": "取消",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "无法保存文件",
   "backupExportGenericErrorSecondary": "备份尚未完成。",
   "backupExportProgressCompressing": "准备备份文件",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "如果您丢失了电脑或者转移到新设备，可以用这个恢复历史记录。",
   "backupImportAccountErrorHeadline": "错误的备份",
   "backupImportAccountErrorSecondary": "你不能恢复其他帐号的历史记录。",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "好像出了点问题。",
   "backupImportGenericErrorSecondary": "您的历史无法恢复。",
   "backupImportIncompatibleErrorHeadline": "错误的备份",
   "backupImportIncompatibleErrorSecondary": "您不能恢复不同帐户的历史。",
-  "backupImportOutdatedErrorHeadline": "不兼容的备份",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "准备中...",
   "backupImportProgressSecondary": "恢复进度：{{processed}} 了 {{total}} 中的 {{progress}}%",
   "backupImportSuccessHeadline": "历史恢复。",
   "backupImportVersionErrorHeadline": "不兼容的备份",
   "backupImportVersionErrorSecondary": "此备份是由较新的或已过期的版本 {{brandName}} 生成，所以不能恢复记录。",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "请重试",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "接受",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " 设备验证",
   "conversationDeviceStartedUsingMany": " 已开始使用",
   "conversationDeviceStartedUsingOne": " 已开始使用",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " 取消信任了",
   "conversationDeviceUserDevices": " {{user}} 的设备",
   "conversationDeviceYourDevices": " 您的设备",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "访客",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "在 {brandName} 中打开",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "加入会话",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "已有帐户？",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "新增帐户",
-  "conversationJoin.invalidCreateAccountText": "用于群组消息和电话会议。",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "登录",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "您的名字",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "在您的计算机上打开此链接。",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "收藏",
   "conversationLabelGroups": "群组",
   "conversationLabelPeople": "联系人",
-  "conversationLikesCaption": "{{number}} 人",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "打开地图",
   "conversationMemberJoined": "[bold]{{name}}[/bold] 添加了 {{users}} 到对话中",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] 添加了 {{users}}, 并 [showmore]{{count}} 更多[/showmore]",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] 移除了{{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]你[/bold] 移除了{{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "已送达",
   "conversationMissedMessages": "您已经有一段时间没有使用此设备, 一些信息可能不会在这里出现。",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "按名字搜索",
   "conversationParticipantsTitle": "联系人",
   "conversationPing": " ping了一下",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " ping了一下",
   "conversationPlaybackError": "无法播放",
   "conversationPopoverFavorite": "添加到收藏",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • 来自 giphy.com",
   "extensionsGiphyNoGifs": "哎呀，没有GIF图像。",
   "extensionsGiphyRandom": "随机",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "字符太多",
   "groupCreationPreferencesErrorNameShort": "至少1个字符",
   "groupCreationPreferencesHeader": "创建组",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "团队名字",
   "groupParticipantActionBlock": "拉黑联系人",
   "groupParticipantActionCancelRequest": "取消请求",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "没有人喜欢这个消息。",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "确定",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "移除",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "移除？",
   "modalConversationRemoveMessage": "{{user}} 将不能够在此对话中发送或接收消息。",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "撤消链接",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "屏蔽 {{user}} 吗？",
   "modalUserBlockMessage": "{{user}} 将不能联系您或将您加入到任何对话中。",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "取消屏蔽",
   "modalUserUnblockHeadline": "解除屏蔽？",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "呼叫过您",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "疑难排解",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/zh-HK.json b/src/i18n/zh-HK.json
index ac2d491a683..2d912e9f5cb 100644
--- a/src/i18n/zh-HK.json
+++ b/src/i18n/zh-HK.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "Check your email inbox and follow the instructions.",
   "authPostedResendHeadline": "You’ve got mail.",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "Add",
   "authVerifyAccountDetail": "This lets you use {{brandName}} on multiple devices.",
   "authVerifyAccountHeadline": "Add email address and password.",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "You can request a new code {{expiration}}.",
   "authVerifyPasswordHeadline": "Enter your password",
   "backupCancel": "Cancel",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "Accept",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": "Verify devices",
   "conversationDeviceStartedUsingMany": " started using",
   "conversationDeviceStartedUsingOne": " started using",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " unverified one of",
   "conversationDeviceUserDevices": " {{user}}´s devices",
   "conversationDeviceYourDevices": " your devices",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "Guest",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} people",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "Open Map",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "Search by name",
   "conversationParticipantsTitle": "People",
   "conversationPing": " pinged",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " pinged",
   "conversationPlaybackError": "Unable to play",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "{{tag}} • via giphy.com",
   "extensionsGiphyNoGifs": "Oops, no gifs",
   "extensionsGiphyRandom": "Random",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "Cancel request…",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "OK",
@@ -854,10 +910,12 @@
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
   "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "Remove?",
   "modalConversationRemoveMessage": "{{user}} won’t be able to send or receive messages in this conversation.",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "Block {{user}}?",
   "modalUserBlockMessage": "{{user}} won’t be able to contact you or add you to group conversations.",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "Unblock",
   "modalUserUnblockHeadline": "Unblock?",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "Called",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/i18n/zh-TW.json b/src/i18n/zh-TW.json
index d5a7feee252..429e40c0bd2 100644
--- a/src/i18n/zh-TW.json
+++ b/src/i18n/zh-TW.json
@@ -1,7 +1,7 @@
 {
   "BackendError.LABEL.ACCESS_DENIED": "Please verify your details and try again",
   "BackendError.LABEL.ALREADY_INVITED": "This email has already been invited",
-  "BackendError.LABEL.BAD_REQUEST": "Invalid input",
+  "BackendError.LABEL.BAD_REQUEST": "Please verify your details and try again",
   "BackendError.LABEL.BLACKLISTED_EMAIL": "This email address is not allowed",
   "BackendError.LABEL.BLACKLISTED_PHONE": "This phone number is not allowed",
   "BackendError.LABEL.CODE_AUTHENTICATION_FAILED": "Please retry, or request another code.",
@@ -9,7 +9,7 @@
   "BackendError.LABEL.CONVERSATION_NOT_FOUND": "CONVERSATION_NOT_FOUND",
   "BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS": "This conversation has reached the limit of participants",
   "BackendError.LABEL.EMAIL_EXISTS": "This email address is already in use. {supportEmailExistsLink}",
-  "BackendError.LABEL.EMAIL_REQUIRED": "Log in with an email address is required when two-factor authentication is activated",
+  "BackendError.LABEL.EMAIL_REQUIRED": "You can’t use your username as two-factor authentication is activated. Please log in with your email instead.",
   "BackendError.LABEL.HANDLE_EXISTS": "This username is already taken",
   "BackendError.LABEL.HANDLE_TOO_SHORT": "Please enter a username with at least 2 characters",
   "BackendError.LABEL.INVALID_CODE": "Please retry, or request another code.",
@@ -18,7 +18,7 @@
   "BackendError.LABEL.INVALID_HANDLE": "This username is invalid",
   "BackendError.LABEL.INVALID_INVITATION_CODE": "Invitation has been revoked or expired",
   "BackendError.LABEL.INVALID_OPERATION": "Invalid operation",
-  "BackendError.LABEL.INVALID_PAYLOAD": "Invalid input",
+  "BackendError.LABEL.INVALID_PAYLOAD": "Please verify your details and try again",
   "BackendError.LABEL.INVALID_PHONE": "This phone number is invalid",
   "BackendError.LABEL.KEY_EXISTS": "This email address has already been registered. {supportEmailExistsLink}",
   "BackendError.LABEL.MISSING_AUTH": "Please verify your details and try again",
@@ -76,7 +76,7 @@
   "accessibility.conversation.goBack": "Go back to conversation info",
   "accessibility.conversation.sectionLabel": "Conversation List",
   "accessibility.conversationAssetImageAlt": "Image from {{username}} from {{messageDate}}",
-  "accessibility.conversationContextMenuOpenLabel": "Open messaging options",
+  "accessibility.conversationContextMenuOpenLabel": "Open more options",
   "accessibility.conversationDetailsActionDevicesLabel": "Show Devices",
   "accessibility.conversationDetailsActionGroupAdminLabel": "Set group admin",
   "accessibility.conversationDetailsActionNotificationsLabel": "Show notifications settings",
@@ -90,6 +90,7 @@
   "accessibility.conversationStatusUnreadPing": "Missed ping",
   "accessibility.conversationStatusUnreadReply": "Unread reply",
   "accessibility.conversationTitle": "{{username}} status {{status}}",
+  "accessibility.emojiPickerSearchPlaceholder": "Search for emoji",
   "accessibility.giphyModal.close": "Close 'GIF' window",
   "accessibility.giphyModal.loading": "Loading giphy",
   "accessibility.giphyModal.selectGif": "Select gif",
@@ -112,7 +113,13 @@
   "accessibility.headings.preferencesDevices": "Preferences - devices",
   "accessibility.headings.preferencesOptions": "Preferences - options",
   "accessibility.headings.sidebar": "Navigation",
+  "accessibility.messageActionsMenuEmoji": "Select emoji",
+  "accessibility.messageActionsMenuLabel": "Message actions",
+  "accessibility.messageActionsMenuLike": "React with heart",
+  "accessibility.messageActionsMenuThumbsUp": "React with thumbs up",
   "accessibility.messageDetailsReadReceipts": "Message viewed by {{readReceiptText}}, open details",
+  "accessibility.messageReactionDetailsPlural": "{{emojiCount}} reactions, react with {{emojiName}} emoji",
+  "accessibility.messageReactionDetailsSingular": "{{emojiCount}} reaction, react with {{emojiName}} emoji",
   "accessibility.messages.like": "Like message",
   "accessibility.messages.liked": "Unlike message",
   "accessibility.openConversation": "Open profile of {{name}}",
@@ -129,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
+  "acme.done.button": "Ok",
+  "acme.done.button.close": "Close window 'Certificate Downloaded'",
+  "acme.done.headline": "Certificate Downloaded",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.error.button.close": "Close window 'Something went wrong'",
+  "acme.error.button.primary": "Retry",
+  "acme.error.button.secondary": "Cancel",
+  "acme.error.headline": "Something went wrong",
+  "acme.error.paragraph": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window 'Getting Certificate'",
+  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.paragraph.alt": "Downloading...",
+  "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. <br/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "加入",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -193,6 +219,7 @@
   "authPostedResendDetail": "請查收您的電子郵件信箱並依照指示進行操作。",
   "authPostedResendHeadline": "您收到了新郵件",
   "authSSOLoginTitle": "Log in with single sign-on",
+  "authSetUsername": "Set username",
   "authVerifyAccountAdd": "加入",
   "authVerifyAccountDetail": "這樣可以讓您在多個設備上使用 {{brandName}}。",
   "authVerifyAccountHeadline": "加入電子郵件信箱位址以及密碼。",
@@ -204,6 +231,15 @@
   "authVerifyCodeResendTimer": "您可以在 {{expiration}} 後索取新的驗證碼。",
   "authVerifyPasswordHeadline": "輸入您的密碼",
   "backupCancel": "取消",
+  "backupDecryptionModalAction": "Continue",
+  "backupDecryptionModalMessage": "The backup is password protected.",
+  "backupDecryptionModalPlaceholder": "Password",
+  "backupDecryptionModalTitle": "Enter Password",
+  "backupEncryptionModalAction": "Back Up Now",
+  "backupEncryptionModalCloseBtn": "Cancel",
+  "backupEncryptionModalMessage": "The backup will be compressed, and you can encrypt it with a password.",
+  "backupEncryptionModalPlaceholder": "Password (Optional)",
+  "backupEncryptionModalTitle": "Set Password",
   "backupExportGenericErrorHeadline": "The file could not be saved",
   "backupExportGenericErrorSecondary": "The backup was not completed.",
   "backupExportProgressCompressing": "Preparing backup file",
@@ -214,16 +250,20 @@
   "backupExportSuccessSecondary": "You can use this to restore history if you lose your computer or switch to a new one.",
   "backupImportAccountErrorHeadline": "Wrong backup",
   "backupImportAccountErrorSecondary": "You cannot restore history from a different account.",
+  "backupImportFormatErrorHeadline": "Incompatible backup",
+  "backupImportFormatErrorSecondary": "The provided backup format is not supported",
   "backupImportGenericErrorHeadline": "Something went wrong",
   "backupImportGenericErrorSecondary": "Your history could not be restored.",
   "backupImportIncompatibleErrorHeadline": "Wrong backup",
   "backupImportIncompatibleErrorSecondary": "You cannot restore history from a different account.",
-  "backupImportOutdatedErrorHeadline": "Incompatible backup",
+  "backupImportPasswordErrorHeadline": "Wrong Password",
+  "backupImportPasswordErrorSecondary": "Please verify your input and try again",
   "backupImportProgressHeadline": "Preparing…",
   "backupImportProgressSecondary": "Restoring history · {{processed}} of {{total}} — {{progress}}%",
   "backupImportSuccessHeadline": "History restored.",
   "backupImportVersionErrorHeadline": "Incompatible backup",
   "backupImportVersionErrorSecondary": "This backup was created by a newer or outdated version of {{brandName}} and cannot be restored here.",
+  "backupPasswordHint": "Use at least {{minPasswordLength}} characters, with one lowercase letter, one capital letter, a number, and a special character.",
   "backupTryAgain": "Try Again",
   "buttonActionError": "Your answer can't be sent, please retry",
   "callAccept": "接聽",
@@ -343,6 +383,7 @@
   "conversationDeviceNewPeopleJoinedVerify": " 驗證設備",
   "conversationDeviceStartedUsingMany": " 已開始使用",
   "conversationDeviceStartedUsingOne": " 已開始使用",
+  "conversationDeviceStartedUsingYou": " started using",
   "conversationDeviceUnverified": " %@ 取消了 %@ 的某個設備之驗證",
   "conversationDeviceUserDevices": " {{user}} 的設備",
   "conversationDeviceYourDevices": " 您的設備",
@@ -353,21 +394,21 @@
   "conversationFooterContacts": "Contacts",
   "conversationGuestIndicator": "訪客",
   "conversationImageAssetRestricted": "Receiving images is prohibited",
-  "conversationJoin.buttonExistentAccountOpen": "Open in {brandName}",
-  "conversationJoin.existentAccountHeadline": "{name}, you have been invited to join a conversation in {brandName}",
+  "conversationJoin.existentAccountJoinInBrowser": "Join in the browser",
   "conversationJoin.existentAccountJoinWithoutLink": "Join the conversation",
-  "conversationJoin.existentAccountJoinWithoutText": "{existentAccountJoinWithoutLink} without an account",
-  "conversationJoin.existentAccountSubhead": "Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.",
+  "conversationJoin.existentAccountUserName": "You are logged in as {selfName}",
   "conversationJoin.fullConversationHeadline": "Unable to join conversation",
   "conversationJoin.fullConversationSubhead": "The maximum number of participants in this conversation has been reached.",
   "conversationJoin.hasAccount": "Already have an account?",
-  "conversationJoin.headline": "You have been invited to join a conversation in {brandName}",
-  "conversationJoin.invalidCreateAccountLink": "Create an account",
-  "conversationJoin.invalidCreateAccountText": "for group messaging and conference calls.",
+  "conversationJoin.headline": "The conversation takes place on {domain}",
   "conversationJoin.invalidHeadline": "Conversation not found",
   "conversationJoin.invalidSubhead": "The link to this group conversation expired or the conversation was set to private.",
-  "conversationJoin.loginLink": "Log in",
+  "conversationJoin.join": "Join",
+  "conversationJoin.joinButton": "Join as Temporary Guest",
+  "conversationJoin.joinWithOtherAccount": "Join with another account",
+  "conversationJoin.mainHeadline": "Join Conversation",
   "conversationJoin.namePlaceholder": "Your name",
+  "conversationJoin.noAccountHead": "Don't have an account?",
   "conversationJoin.subhead": "Join conversation as temporary guest (access expires after 24 hours)",
   "conversationJoin.unsupportedJoinHeadline": "You have been invited to join a conversation in {brandName}",
   "conversationJoin.unsupportedJoinMobileSubhead": "Open this link on your computer.",
@@ -375,7 +416,10 @@
   "conversationLabelFavorites": "Favorites",
   "conversationLabelGroups": "Groups",
   "conversationLabelPeople": "People",
-  "conversationLikesCaption": "{{number}} 人",
+  "conversationLikesCaptionPlural": "{{number}} people",
+  "conversationLikesCaptionReactedPlural": "reacted with {{emojiName}}",
+  "conversationLikesCaptionReactedSingular": "reacted with {{emojiName}}",
+  "conversationLikesCaptionSingular": "{{number}} person",
   "conversationLocationLink": "打開地圖",
   "conversationMemberJoined": "[bold]{{name}}[/bold] added {{users}} to the conversation",
   "conversationMemberJoinedMore": "[bold]{{name}}[/bold] added {{users}}, and [showmore]{{count}} more[/showmore] to the conversation",
@@ -388,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "已傳送",
   "conversationMissedMessages": "您已經有一段時間沒有使用此設備了，可能有部分訊息不會顯示出來。",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",
@@ -401,6 +446,7 @@
   "conversationParticipantsSearchPlaceholder": "按名稱搜尋",
   "conversationParticipantsTitle": "聯絡人",
   "conversationPing": " 打了聲招呼",
+  "conversationPingConfirmTitle": "Are you sure you want to ping {{memberCount}} people?",
   "conversationPingYou": " 打了聲招呼",
   "conversationPlaybackError": "無法撥放語音",
   "conversationPopoverFavorite": "Add to favorites",
@@ -514,10 +560,13 @@
   "extensionsGiphyMessage": "通過 giphy.com {{tag}}",
   "extensionsGiphyNoGifs": "哎呀，沒有 gif 圖片",
   "extensionsGiphyRandom": "隨機",
-  "failedToAddParticipant": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipantDetails": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
-  "failedToAddParticipants": "[bold]{{total}} participants[/bold] could not be added to the group.",
-  "failedToAddParticipantsDetails": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantSingularNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backend doesn't federate with the backends of all group participants.",
+  "failedToAddParticipantSingularOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsPlural": "[bold]{{total}} participants[/bold] could not be added to the group.",
+  "failedToAddParticipantsPluralDetailsNonFederatingBackends": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsPluralDetailsOfflineBackend": "[bold]{{names}}[/bold] and [bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
+  "failedToAddParticipantsSingularDetailsNonFederatingBackends": "[bold]{{name}}[/bold] could not be added to the group as their backends do not federate with each other.",
+  "failedToAddParticipantsSingularDetailsOfflineBackend": "[bold]{{name}}[/bold] could not be added to the group as the backend of [bold]{{domain}}[/bold] could not be reached.",
   "featureConfigChangeModalApplock": "Mandatory app lock is now disabled. You do not need a passcode or biometric authentication when returning to the app.",
   "featureConfigChangeModalApplockHeadline": "Team settings changed",
   "featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled": "Camera in calls is disabled",
@@ -535,6 +584,8 @@
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled": "Self-deleting messages are enabled. You can set a timer before writing a message.",
   "featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced": "Self-deleting messages are now mandatory. New messages will self-delete after {{timeout}}.",
   "featureConfigChangeModalSelfDeletingMessagesHeadline": "There has been a change in {{brandName}}",
+  "federationConnectionRemove": "The backends [bold]{{backendUrlOne}}[/bold] and [bold]{{backendUrlTwo}}[/bold] stopped federating.",
+  "federationDelete": "[bold]Your backend[/bold] stopped federating with [bold]{{backendUrl}}.[/bold]",
   "fileTypeRestrictedIncoming": "File from&nbsp;[bold]{{name}}[/bold]&nbsp;can’t be opened",
   "fileTypeRestrictedOutgoing": "Sharing files with the {{fileExt}} extension is not permitted by your organization",
   "folderViewTooltip": "Folders",
@@ -557,6 +608,10 @@
   "groupCreationPreferencesErrorNameLong": "Too many characters",
   "groupCreationPreferencesErrorNameShort": "At least 1 character",
   "groupCreationPreferencesHeader": "Create group",
+  "groupCreationPreferencesNonFederatingEditList": "Edit Participants List",
+  "groupCreationPreferencesNonFederatingHeadline": "Group can’t be created",
+  "groupCreationPreferencesNonFederatingLeave": "Discard Group Creation",
+  "groupCreationPreferencesNonFederatingMessage": "People from backends {{backends}} can’t join the same group conversation, as their backends can’t communicate with each other. To create the group, remove affected participants. [link]Learn more[/link]",
   "groupCreationPreferencesPlaceholder": "Group name",
   "groupParticipantActionBlock": "Block…",
   "groupParticipantActionCancelRequest": "取消請求",
@@ -675,12 +730,12 @@
   "messageCouldNotBeSentConnectivityIssues": "Message could not be sent due to connectivity issues.",
   "messageCouldNotBeSentRetry": "Retry",
   "messageDetailsEdited": "Edited: {{edited}}",
-  "messageDetailsNoLikes": "No one has liked this message yet.",
+  "messageDetailsNoReactions": "No one has reacted to this message yet.",
   "messageDetailsNoReceipts": "No one has read this message yet.",
   "messageDetailsReceiptsOff": "Read receipts were not on when this message was sent.",
   "messageDetailsSent": "Sent: {{sent}}",
   "messageDetailsTitle": "Details",
-  "messageDetailsTitleLikes": "Liked{{count}}",
+  "messageDetailsTitleReactions": "Reactions{{count}}",
   "messageDetailsTitleReceipts": "Read{{count}}",
   "messageFailedToSendHideDetails": "Hide details",
   "messageFailedToSendParticipants": "{{count}} participants",
@@ -692,6 +747,7 @@
   "messageFailedToSendWillNotReceiveSingular": "won't get your message.",
   "messageFailedToSendWillReceivePlural": "will get your message later.",
   "messageFailedToSendWillReceiveSingular": "will get your message later.",
+  "mlsConversationRecovered": "You haven’t used this device for a while, or an issue has occurred. Some older messages may not appear here.",
   "mlsToggleInfo": "When this is on, conversation will use the new messaging layer security (MLS) protocol.",
   "mlsToggleName": "MLS",
   "modalAccountCreateAction": "確認",
@@ -852,12 +908,14 @@
   "modalConversationOptionsDisableServiceMessage": "Could not remove services. Please try again.",
   "modalConversationOptionsToggleGuestMessage": "Could not change guests state.",
   "modalConversationOptionsToggleServiceMessage": "Could not change services state.",
-  "modalConversationRemoveAction": "移除",
+  "modalConversationRemoveAction": "Remove",
   "modalConversationRemoveCloseBtn": "Close window 'Remove'",
-  "modalConversationRemoveGuestsAndServicesHeadline": "Disable access?",
+  "modalConversationRemoveGuestsHeadline": "Disable guest access?",
   "modalConversationRemoveGuestsMessage": "Current guests will be removed from the conversation. New guests will not be allowed.",
+  "modalConversationRemoveGuestsOrServicesAction": "Disable",
   "modalConversationRemoveHeadline": "確定移除？",
   "modalConversationRemoveMessage": "{{user}} 將無法在此對話中發送或接收訊息。",
+  "modalConversationRemoveServicesHeadline": "Disable services access?",
   "modalConversationRemoveServicesMessage": "Current services will be removed from the conversation. New services will not be allowed.",
   "modalConversationRevokeLinkAction": "Revoke link",
   "modalConversationRevokeLinkCloseBtn": "Close window 'Revoke the link'",
@@ -918,9 +976,14 @@
   "modalUserBlockHeadline": "確定要封鎖 {{user}} 嗎？",
   "modalUserBlockMessage": "{{user}} 將無法與您聯繫或將您添加到對話群組。",
   "modalUserBlockedForLegalHold": "This user is blocked due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotAcceptConnectionMessage": "Connection request could not be accepted",
   "modalUserCannotBeAddedHeadline": "Guests cannot be added",
-  "modalUserCannotConnectLegalHoldHeadline": "Cannot connect to this user",
-  "modalUserCannotConnectLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotCancelConnectionMessage": "Connection request could not be canceled",
+  "modalUserCannotConnectHeadline": "Connecting not possible",
+  "modalUserCannotIgnoreConnectionMessage": "Connection request could not be ignored",
+  "modalUserCannotSendConnectionLegalHoldMessage": "You cannot connect to this user due to legal hold. [link]Learn more[/link]",
+  "modalUserCannotSendConnectionMessage": "Connection request could not be sent",
+  "modalUserCannotSendConnectionNotFederatingMessage": "You can’t send a connection request as your backend doesn’t federate with the one of {{username}}.",
   "modalUserLearnMore": "Learn more",
   "modalUserUnblockAction": "解除封鎖",
   "modalUserUnblockHeadline": "解除封鎖？",
@@ -966,16 +1029,16 @@
   "notificationVoiceChannelDeactivate": "有呼叫過",
   "oauth.allow": "Allow",
   "oauth.cancel": "Don't Allow",
-  "oauth.details": "If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.",
+  "oauth.details": "If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.",
   "oauth.headline": "Permissions",
-  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions in the settings.",
+  "oauth.learnMore": "<learnMore>Learn more</learnMore> about these permissions",
   "oauth.logout": "Switch account",
   "oauth.privacypolicy": "Wire's <privacypolicy>Privacy Policy</privacypolicy>",
-  "oauth.scope.read_feature_configs": "Access team feature configurations",
-  "oauth.scope.read_self": "Access user information",
-  "oauth.scope.write_conversations": "Create conversations",
-  "oauth.scope.write_conversations_code": "Create conversation guest links",
-  "oauth.subhead": "{app} requires your permission to:",
+  "oauth.scope.read_feature_configs": "View your team’s feature configurations",
+  "oauth.scope.read_self": "View your Wire username, profile name, and email",
+  "oauth.scope.write_conversations": "Create conversations in Wire",
+  "oauth.scope.write_conversations_code": "Create guest links to conversations in Wire",
+  "oauth.subhead": "Microsoft Outlook requires your permission to:",
   "offlineBackendLearnMore": "Learn more",
   "ongoingAudioCall": "Ongoing audio call with {{conversationName}}.",
   "ongoingGroupAudioCall": "Ongoing conference call with {{conversationName}}.",
@@ -1095,6 +1158,7 @@
   "preferencesOptionsBackupHeader": "History",
   "preferencesOptionsBackupImportHeadline": "Restore",
   "preferencesOptionsBackupImportSecondary": "You can only restore history from a backup of the same platform. Your backup will overwrite the conversations that you may have on this device.",
+  "preferencesOptionsBackupTryAgain": "Try Again",
   "preferencesOptionsCall": "Calls",
   "preferencesOptionsCallLogs": "Troubleshooting",
   "preferencesOptionsCallLogsDetail": "Save the calling debug report. This information helps {{brandName}} Support diagnose calling problems.",
diff --git a/src/script/Config.ts b/src/script/Config.ts
index 7b35fc98e3c..8e96a80b4b9 100644
--- a/src/script/Config.ts
+++ b/src/script/Config.ts
@@ -76,7 +76,7 @@ const config = {
   ALLOWED_IMAGE_TYPES: ['image/bmp', 'image/gif', 'image/jpeg', 'image/jpg', 'image/png'],
 
   /** Which min and max version of the backend api do we support */
-  SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 3],
+  SUPPORTED_API_RANGE: [1, env.ENABLE_DEV_BACKEND_API ? Infinity : 4],
 
   /** DataDog client api keys acces */
   dataDog: {
diff --git a/src/script/E2EIdentity/DelayTimer/DelayTimer.test.ts b/src/script/E2EIdentity/DelayTimer/DelayTimer.test.ts
new file mode 100644
index 00000000000..c5968de0ebe
--- /dev/null
+++ b/src/script/E2EIdentity/DelayTimer/DelayTimer.test.ts
@@ -0,0 +1,172 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FIFTEEN_MINUTES, FOUR_HOURS, ONE_HOUR, ONE_MINUTE} from './delay';
+import {DelayTimerService} from './DelayTimer'; // Update this with your module's actual path
+
+describe('createGracePeriodTimer', () => {
+  let timer: DelayTimerService | undefined;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest.useFakeTimers();
+    global.localStorage.clear();
+    timer = DelayTimerService?.getInstance({
+      gracePeriodInMS: 0,
+      gracePeriodExpiredCallback: jest.fn(),
+      delayPeriodExpiredCallback: jest.fn(),
+    });
+  });
+
+  afterEach(() => {
+    timer?.resetInstance();
+    timer = undefined;
+    jest.useRealTimers();
+  });
+
+  it('should call the gracePeriodExpiredCallback when the grace period is over', () => {
+    const gracePeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: 1000,
+      gracePeriodExpiredCallback,
+      delayPeriodExpiredCallback: jest.fn(),
+    });
+
+    jest.advanceTimersByTime(1000);
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled();
+  });
+
+  it('should call the gracePeriodExpiredCallback only after the delay time is over', () => {
+    const gracePeriodExpiredCallback = jest.fn();
+
+    timer?.updateParams({
+      gracePeriodInMS: ONE_HOUR,
+      gracePeriodExpiredCallback,
+      delayPeriodExpiredCallback: jest.fn(),
+    });
+
+    timer?.delayPrompt();
+
+    jest.advanceTimersByTime(FIFTEEN_MINUTES);
+    expect(gracePeriodExpiredCallback).not.toHaveBeenCalled();
+
+    jest.advanceTimersByTime(ONE_HOUR);
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled();
+  });
+
+  it('should not allow delaying the prompt if the grace period is already over', () => {
+    const gracePeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: 0,
+      gracePeriodExpiredCallback,
+      delayPeriodExpiredCallback: jest.fn(),
+    });
+    timer?.delayPrompt();
+
+    jest.advanceTimersByTime(500);
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled();
+  });
+
+  it('should allow delaying the prompt multiple times within the grace period', () => {
+    const gracePeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: 7200000,
+      gracePeriodExpiredCallback,
+      delayPeriodExpiredCallback: jest.fn(),
+    });
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(3600000);
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(3600000);
+
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled();
+  });
+
+  it('should call the delayPeriodExpiredCallback after a delay based on the grace period', () => {
+    const delayPeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: ONE_HOUR,
+      gracePeriodExpiredCallback: jest.fn(),
+      delayPeriodExpiredCallback,
+    });
+
+    timer?.delayPrompt();
+
+    // getDelayTime(ONE_HOUR) will return FIFTEEN_MINUTES according to the function provided.
+    jest.advanceTimersByTime(FIFTEEN_MINUTES);
+    expect(delayPeriodExpiredCallback).toHaveBeenCalled();
+  });
+
+  it('should not call delayPeriodExpiredCallback if grace period is over', () => {
+    const delayPeriodExpiredCallback = jest.fn();
+    const gracePeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: ONE_HOUR,
+      delayPeriodExpiredCallback,
+      gracePeriodExpiredCallback,
+    });
+
+    timer?.delayPrompt();
+
+    // Here, instead of advancing time by "ONE_HOUR + FIFTEEN_MINUTES", we advance by "ONE_HOUR", which is the end of the grace period.
+    jest.advanceTimersByTime(ONE_HOUR + FIFTEEN_MINUTES);
+    expect(delayPeriodExpiredCallback).toHaveBeenCalled(); // The delayPeriodExpiredCallback should be called after ONE_HOUR.
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled(); // The gracePeriodExpiredCallback should be called when the grace period ends, which is after ONE_HOUR.
+
+    timer?.delayPrompt(); // We try to delay after the grace period has ended.
+    jest.advanceTimersByTime(FIFTEEN_MINUTES);
+    expect(delayPeriodExpiredCallback).toHaveBeenCalledTimes(1); // The delayPeriodExpiredCallback should not be called again since we're now past the grace period.
+  });
+
+  it('should call delayPeriodExpiredCallback multiple times if delayPrompt is called multiple times within the grace period', () => {
+    const delayPeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: FOUR_HOURS,
+      gracePeriodExpiredCallback: jest.fn(),
+      delayPeriodExpiredCallback,
+    });
+
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(ONE_HOUR); // gracePeriod > delay, so delay = ONE_HOUR
+
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(ONE_HOUR);
+
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(ONE_HOUR);
+
+    expect(delayPeriodExpiredCallback).toHaveBeenCalledTimes(3);
+  });
+
+  it('should not execute the delayPrompt() if the grace period is over', () => {
+    const delayPeriodExpiredCallback = jest.fn();
+    const gracePeriodExpiredCallback = jest.fn();
+    timer?.updateParams({
+      gracePeriodInMS: ONE_MINUTE,
+      gracePeriodExpiredCallback,
+      delayPeriodExpiredCallback,
+    });
+
+    timer?.delayPrompt();
+    jest.advanceTimersByTime(ONE_MINUTE);
+
+    expect(delayPeriodExpiredCallback).not.toHaveBeenCalled();
+    expect(gracePeriodExpiredCallback).toHaveBeenCalled();
+  });
+});
diff --git a/src/script/E2EIdentity/DelayTimer/DelayTimer.ts b/src/script/E2EIdentity/DelayTimer/DelayTimer.ts
new file mode 100644
index 00000000000..6fd68e1a2fa
--- /dev/null
+++ b/src/script/E2EIdentity/DelayTimer/DelayTimer.ts
@@ -0,0 +1,287 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import logdown from 'logdown';
+
+import {util} from '@wireapp/core';
+
+import {getDelayTime} from './delay';
+import {DelayTimerStore} from './DelayTimerStorage';
+
+const {TaskScheduler} = util;
+
+interface CreateGracePeriodTimerParams {
+  gracePeriodInMS: number;
+  gracePeriodExpiredCallback: () => void;
+  delayPeriodExpiredCallback: () => void;
+}
+
+class DelayTimerService {
+  private static instance: DelayTimerService | null = null;
+  private gracePeriodInMS: number;
+  private gracePeriodExpiredCallback: () => void;
+  private delayPeriodExpiredCallback: () => void;
+  private readonly logger = logdown('@wireapp/core/DelayTimer');
+  private delayPeriodTimerKey: string = 'E2EIdentity_DelayTimer';
+  private gracePeriodTimerKey: string = 'E2EIdentity_GracePeriodTimer';
+
+  private constructor({
+    gracePeriodInMS,
+    gracePeriodExpiredCallback,
+    delayPeriodExpiredCallback,
+  }: CreateGracePeriodTimerParams) {
+    this.gracePeriodInMS = gracePeriodInMS;
+    this.gracePeriodExpiredCallback = gracePeriodExpiredCallback;
+    this.delayPeriodExpiredCallback = delayPeriodExpiredCallback;
+    this.initialize();
+  }
+
+  /**
+   * Get the singleton instance of GracePeriodTimer or create a new one
+   * For the first time, params are required to create the instance
+   * @param params The params to create the grace period timer
+   * @returns The singleton instance of GracePeriodTimer
+   */
+  public static getInstance(params?: CreateGracePeriodTimerParams) {
+    if (!DelayTimerService.instance) {
+      if (!params) {
+        throw new Error('DelayTimerService is not initialized. Please call getInstance with params.');
+      }
+      DelayTimerService.instance = new DelayTimerService(params);
+    }
+    return DelayTimerService.instance;
+  }
+
+  /**
+   * @param CreateGracePeriodTimerParams The params to create the grace period timer
+   */
+  public updateParams({
+    gracePeriodInMS,
+    gracePeriodExpiredCallback,
+    delayPeriodExpiredCallback,
+  }: CreateGracePeriodTimerParams) {
+    DelayTimerStore.clear.all();
+    this.clearGracePeriodTimer();
+    this.clearDelayPeriodTimer();
+    this.gracePeriodInMS = gracePeriodInMS;
+    this.gracePeriodExpiredCallback = gracePeriodExpiredCallback;
+    this.delayPeriodExpiredCallback = delayPeriodExpiredCallback;
+    this.initialize();
+  }
+
+  /**
+   * Initialize the grace period timer and load saved data from local storage if available
+   */
+  public initialize() {
+    if (this.gracePeriodInMS <= 0) {
+      return this.exit('Grace period is 0. No delays are allowed.');
+    }
+
+    // Check if grace period has changed
+    if (DelayTimerStore.get.gracePeriod() !== this.gracePeriodInMS) {
+      // Check if grace period is less than the time elapsed since the last prompt
+      if (this.gracePeriodInMS < this.getElapsedGracePeriod()) {
+        return this.exit(
+          'Grace period has changed and is less than the time elapsed since the last prompt. No more delays are allowed.',
+        );
+      }
+      this.updateGracePeriod();
+    }
+
+    // Load saved data from local storage
+    if (DelayTimerStore.get.firingDate()) {
+      const currentTime = Date.now();
+      if (DelayTimerStore.get.firingDate() <= currentTime) {
+        return this.exit('Grace period is already over. No more delays are allowed.');
+      }
+    } else {
+      const firingDate = Date.now() + this.gracePeriodInMS;
+      DelayTimerStore.store.firingDate(firingDate);
+      DelayTimerStore.store.gracePeriod(this.gracePeriodInMS);
+    }
+
+    // Start / restart the grace period timer
+    this.startGracePeriod(DelayTimerStore.get.firingDate());
+
+    // this will start the delay period timer if it was active before
+    this.continueDelayPeriodTimer();
+  }
+
+  /**
+   * Prompt the user to delay the enrollment
+   */
+  public delayPrompt() {
+    if (this.isDelayTimerActive()) {
+      return;
+    }
+    if (!this.isSnoozeTimeAvailable()) {
+      return this.exit('No more delays are allowed.');
+    }
+    const delayTimeInMS = getDelayTime(this.gracePeriodInMS);
+    if (delayTimeInMS <= 0) {
+      return this.exit('Delay period is 0. No more delays are allowed.');
+    }
+
+    if (DelayTimerStore.get.firingDate() <= Date.now()) {
+      return this.exit('Grace period is already over. No more delays are allowed.');
+    }
+
+    this.startDelayPeriod(Date.now() + delayTimeInMS);
+  }
+
+  /**
+   * Update the grace period
+   */
+  private updateGracePeriod() {
+    // Store the new grace period
+    DelayTimerStore.store.gracePeriod(this.gracePeriodInMS);
+    const elapsedGracePeriod = this.getElapsedGracePeriod();
+
+    // Check if grace period is already over
+    if (elapsedGracePeriod > this.gracePeriodInMS) {
+      return this.exit('Grace period is already over. No more delays are allowed.');
+    }
+
+    // Update the remaining grace period
+    this.gracePeriodInMS -= elapsedGracePeriod;
+    const startTime = Date.now();
+    // Calculate the new end time
+    const firingDate = startTime + this.gracePeriodInMS;
+    // Store the new end time
+    DelayTimerStore.store.firingDate(firingDate);
+
+    this.startGracePeriod(firingDate);
+  }
+
+  /**
+   * Exit the function
+   * @param exitMessage The exit message
+   * @returns Calls the gracePeriodExpiredCallback
+   */
+  private exit(exitMessage: string) {
+    this.logger.info(exitMessage);
+    this.clearDelayPeriodTimer();
+    this.clearGracePeriodTimer();
+    DelayTimerStore.clear.all();
+    return this.gracePeriodExpiredCallback();
+  }
+
+  /**
+   * Start the grace period timer and store the grace period
+   * @param gracePeriodInMS The grace period in ms
+   */
+  private startGracePeriod(firingDate: number) {
+    this.clearGracePeriodTimer();
+
+    const task = () => {
+      return this.exit('Grace period is over. No more delays are allowed.');
+    };
+
+    if (TaskScheduler.hasActiveTask(this.gracePeriodTimerKey)) {
+      TaskScheduler.continueTask({
+        key: this.gracePeriodTimerKey,
+        task,
+      });
+    } else {
+      TaskScheduler.addTask({
+        key: this.gracePeriodTimerKey,
+        task,
+        firingDate,
+        persist: true,
+      });
+    }
+  }
+
+  /**
+   * Start the delay period timer and store the delay time
+   * @param delayTimeInMS The delay time in ms
+   */
+  private startDelayPeriod(firingDate?: number) {
+    this.clearDelayPeriodTimer();
+
+    const task = () => {
+      this.logger.info('Delay time is over.');
+      return this.delayPeriodExpiredCallback();
+    };
+
+    if (TaskScheduler.hasActiveTask(this.delayPeriodTimerKey)) {
+      TaskScheduler.continueTask({
+        key: this.delayPeriodTimerKey,
+        task,
+      });
+    } else if (firingDate) {
+      TaskScheduler.addTask({
+        key: this.delayPeriodTimerKey,
+        task,
+        firingDate,
+        persist: true,
+      });
+    }
+  }
+
+  /**
+   * Clear the current grace period timer
+   */
+  private clearGracePeriodTimer() {
+    TaskScheduler.cancelTask(this.gracePeriodTimerKey);
+  }
+
+  /**
+   * Clear the current delay period timer
+   */
+  private clearDelayPeriodTimer() {
+    TaskScheduler.cancelTask(this.delayPeriodTimerKey);
+  }
+
+  private continueDelayPeriodTimer() {
+    this.startDelayPeriod();
+  }
+
+  /**
+   * Get the time elapsed since the last prompt
+   * @returns The time elapsed since the last prompt in ms
+   */
+  private getElapsedGracePeriod() {
+    return DelayTimerStore.get.firingDate()
+      ? Date.now() - (DelayTimerStore.get.firingDate() - this.gracePeriodInMS)
+      : 0;
+  }
+
+  /**
+   * Reset the instance
+   */
+  public resetInstance() {
+    DelayTimerStore.clear.all();
+    this.clearGracePeriodTimer();
+    this.clearDelayPeriodTimer();
+    DelayTimerService.instance = null;
+  }
+
+  public isDelayTimerActive() {
+    return TaskScheduler.hasActiveTask(this.delayPeriodTimerKey);
+  }
+
+  public isSnoozeTimeAvailable() {
+    const remainingTime = DelayTimerStore.get.firingDate() - Date.now();
+    const delayTime = getDelayTime(remainingTime);
+    return remainingTime - delayTime > 0;
+  }
+}
+
+export {DelayTimerService};
diff --git a/src/script/E2EIdentity/DelayTimer/DelayTimerStorage.ts b/src/script/E2EIdentity/DelayTimer/DelayTimerStorage.ts
new file mode 100644
index 00000000000..7c122af9975
--- /dev/null
+++ b/src/script/E2EIdentity/DelayTimer/DelayTimerStorage.ts
@@ -0,0 +1,42 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+const FiringDateKey = 'E2EIdentity_DelayTimer_FiringDate';
+const GracePeriodKey = 'E2EIdentity_DelayTimer_GracePeriod';
+
+const DelayTimerStore = {
+  store: {
+    firingDate: (firingDate: number) => localStorage.setItem(FiringDateKey, String(firingDate)),
+    gracePeriod: (gracePeriod: number) => localStorage.setItem(GracePeriodKey, String(gracePeriod)),
+  },
+  get: {
+    firingDate: () => Number(localStorage.getItem(FiringDateKey)),
+    gracePeriod: () => Number(localStorage.getItem(GracePeriodKey)),
+  },
+  clear: {
+    firingDate: () => localStorage.removeItem(FiringDateKey),
+    gracePeriod: () => localStorage.removeItem(GracePeriodKey),
+    all: () => {
+      DelayTimerStore.clear.firingDate();
+      DelayTimerStore.clear.gracePeriod();
+    },
+  },
+};
+
+export {DelayTimerStore};
diff --git a/src/script/E2EIdentity/DelayTimer/delay.ts b/src/script/E2EIdentity/DelayTimer/delay.ts
new file mode 100644
index 00000000000..7dbdc03a6fe
--- /dev/null
+++ b/src/script/E2EIdentity/DelayTimer/delay.ts
@@ -0,0 +1,52 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+/* eslint-disable no-magic-numbers */
+
+enum TIME_IN_MILLIS {
+  SECOND = 1000,
+  MINUTE = SECOND * 60,
+  HOUR = MINUTE * 60,
+  DAY = HOUR * 24,
+  WEEK = DAY * 7,
+  YEAR = DAY * 365,
+}
+
+export const ONE_MINUTE = TIME_IN_MILLIS.MINUTE;
+export const FIVE_MINUTES = TIME_IN_MILLIS.MINUTE * 5;
+export const FIFTEEN_MINUTES = TIME_IN_MILLIS.MINUTE * 15;
+export const ONE_HOUR = TIME_IN_MILLIS.HOUR;
+export const FOUR_HOURS = TIME_IN_MILLIS.HOUR * 4;
+export const ONE_DAY = TIME_IN_MILLIS.DAY;
+
+export function getDelayTime(gracePeriodInMs: number): number {
+  if (gracePeriodInMs > 0) {
+    if (gracePeriodInMs <= FIFTEEN_MINUTES) {
+      return Math.min(FIVE_MINUTES, gracePeriodInMs);
+    } else if (gracePeriodInMs <= ONE_HOUR) {
+      return Math.min(FIFTEEN_MINUTES, gracePeriodInMs);
+    } else if (gracePeriodInMs <= FOUR_HOURS) {
+      return Math.min(ONE_HOUR, gracePeriodInMs);
+    } else if (gracePeriodInMs <= ONE_DAY) {
+      return Math.min(FOUR_HOURS, gracePeriodInMs);
+    }
+    return Math.min(ONE_DAY, gracePeriodInMs);
+  }
+  return 0;
+}
diff --git a/src/script/E2EIdentity/E2EIdentity.test.ts b/src/script/E2EIdentity/E2EIdentity.test.ts
new file mode 100644
index 00000000000..55cf2f2fe54
--- /dev/null
+++ b/src/script/E2EIdentity/E2EIdentity.test.ts
@@ -0,0 +1,240 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {container} from 'tsyringe';
+
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {Config} from 'src/script/Config';
+import {Core} from 'src/script/service/CoreSingleton';
+import {UserState} from 'src/script/user/UserState';
+import * as util from 'Util/util';
+
+import {E2EIHandler, E2EIHandlerStep} from './E2EIdentity';
+import {getModalOptions, ModalType} from './Modals';
+import {OIDCService} from './OIDCService/OIDCService';
+
+jest.mock('./OIDCService', () => ({
+  getOIDCServiceInstance: jest.fn().mockReturnValue({
+    clearProgress: jest.fn(),
+  } as unknown as OIDCService),
+}));
+jest.mock('Util/util');
+jest.mock('src/script/Config');
+jest.mock('tsyringe');
+jest.mock('src/script/service/CoreSingleton', () => {
+  return {
+    Core: jest.fn().mockImplementation(() => {
+      return {enrollE2EI: jest.fn()};
+    }),
+  };
+});
+jest.mock('src/script/user/UserState', () => {
+  return {
+    UserState: jest.fn().mockImplementation(() => {
+      return {self: jest.fn()};
+    }),
+  };
+});
+jest.mock('Components/Modals/PrimaryModal');
+jest.mock('./Modals', () => ({
+  getModalOptions: jest.fn().mockReturnValue({
+    modalOptions: {},
+    modalType: 'someType',
+  }),
+  ModalType: {
+    LOADING: 'loading',
+    SUCCESS: 'success',
+    ERROR: 'error',
+    ENROLL: 'enroll',
+  },
+}));
+jest.mock('src/script/service/CoreSingleton', () => ({
+  Core: jest.fn().mockImplementation(() => ({
+    enrollE2EI: jest.fn(),
+  })),
+}));
+jest.mock('src/script/user/UserState', () => ({
+  UserState: jest.fn().mockImplementation(() => ({
+    self: jest.fn(),
+  })),
+}));
+
+describe('E2EIHandler', () => {
+  const params = {discoveryUrl: 'http://example.com', gracePeriodInMS: 30000};
+  const newParams = {discoveryUrl: 'http://new-example.com', gracePeriodInMS: 60000};
+  const user = {name: () => 'John Doe', username: () => 'johndoe'};
+  let coreMock: Core;
+  let userStateMock: UserState;
+
+  beforeEach(() => {
+    (util.supportsMLS as jest.Mock).mockReturnValue(true);
+    // Reset the singleton instance before each test
+    E2EIHandler.resetInstance();
+    // Clear all mocks before each test
+    jest.clearAllMocks();
+    // Setup the Core and UserState services mocks
+    coreMock = new Core();
+    userStateMock = new UserState();
+    (userStateMock.self as unknown as jest.Mock).mockReturnValue({name: () => 'John Doe', username: () => 'johndoe'});
+    (coreMock.enrollE2EI as jest.Mock).mockResolvedValue(true);
+
+    (container.resolve as jest.Mock).mockImplementation(service => {
+      if (service === Core) {
+        return coreMock;
+      }
+      if (service === UserState) {
+        return userStateMock;
+      }
+      return null;
+    });
+
+    // Mock the Config service to return true for ENABLE_E2EI
+    (util.supportsMLS as jest.Mock).mockReturnValue(true);
+    Config.getConfig = jest.fn().mockReturnValue({FEATURE: {ENABLE_E2EI: true}});
+
+    // Mock the PrimaryModal service to return a mock modal
+    (PrimaryModal.show as jest.Mock).mockClear();
+    (getModalOptions as jest.Mock).mockClear();
+  });
+
+  it('should create instance with valid params', () => {
+    const instance = E2EIHandler.getInstance(params);
+    expect(instance).toBeInstanceOf(E2EIHandler);
+  });
+
+  it('should throw error if no params provided', () => {
+    expect(() => E2EIHandler.getInstance()).toThrow(
+      'GracePeriodTimer is not initialized. Please call getInstance with params.',
+    );
+  });
+
+  it('should always return the same instance', () => {
+    const instance1 = E2EIHandler.getInstance(params);
+    const instance2 = E2EIHandler.getInstance(params);
+    expect(instance1).toBe(instance2);
+  });
+
+  it('should update parameters correctly', () => {
+    const instance = E2EIHandler.getInstance(params);
+
+    // Assuming that the instance exposes getters for discoveryUrl and gracePeriodInMS for testing purposes
+    expect(instance['discoveryUrl']).toEqual(params.discoveryUrl);
+    expect(instance['gracePeriodInMS']).toEqual(params.gracePeriodInMS);
+
+    instance.updateParams(newParams);
+    expect(instance['discoveryUrl']).toEqual(newParams.discoveryUrl);
+    expect(instance['gracePeriodInMS']).toEqual(newParams.gracePeriodInMS);
+  });
+
+  it('should return true when supportsMLS returns true and ENABLE_E2EI is true', () => {
+    const instance = E2EIHandler.getInstance(params);
+    expect(instance.isE2EIEnabled).toBe(true);
+  });
+
+  it('should return false when supportsMLS returns false', () => {
+    (util.supportsMLS as jest.Mock).mockReturnValue(false);
+
+    const instance = E2EIHandler.getInstance(params);
+    expect(instance.isE2EIEnabled).toBe(false);
+  });
+
+  it('should return false when ENABLE_E2EI is false', () => {
+    Config.getConfig = jest.fn().mockReturnValue({FEATURE: {ENABLE_E2EI: false}});
+
+    const instance = E2EIHandler.getInstance(params);
+    expect(instance.isE2EIEnabled).toBe(false);
+  });
+
+  it('should set currentStep to INITIALIZE after initialize is called', () => {
+    const instance = E2EIHandler.getInstance(params);
+    instance.initialize();
+    expect(instance['currentStep']).toBe(E2EIHandlerStep.INITIALIZED);
+  });
+
+  it('should set currentStep to ENROLL when enrollE2EI is called and enrollment succeeds', async () => {
+    const instance = E2EIHandler.getInstance(params);
+    await instance['enrollE2EI']();
+    expect(instance['currentStep']).toBe(E2EIHandlerStep.SUCCESS);
+  });
+
+  it('should set currentStep to ERROR when enrollE2EI is called and enrollment fails', async () => {
+    // Mock the Core service to return an error
+    (container.resolve as any) = jest.fn(service => {
+      if (service === Core) {
+        return {enrollE2EI: jest.fn(() => Promise.reject())};
+      }
+      return {self: () => user};
+    });
+
+    const instance = E2EIHandler.getInstance(params);
+    await instance['enrollE2EI']();
+    expect(instance['currentStep']).toBe(E2EIHandlerStep.ERROR);
+  });
+
+  it('should display user info message when initialized', async () => {
+    const handler = E2EIHandler.getInstance(params);
+    await handler.initialize();
+    expect(getModalOptions).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: ModalType.ENROLL,
+      }),
+    );
+  });
+
+  it('should display loading message when enrolled', async () => {
+    const handler = E2EIHandler.getInstance(params);
+    await handler['enrollE2EI']();
+    expect(getModalOptions).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: ModalType.LOADING,
+      }),
+    );
+  });
+
+  it('should display success message when enrollment is done', async () => {
+    const handler = E2EIHandler.getInstance(params);
+    handler['showLoadingMessage'] = jest.fn();
+    await handler['enrollE2EI']();
+    expect(getModalOptions).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: ModalType.SUCCESS,
+      }),
+    );
+  });
+
+  it('should display error message when enrollment fails', async () => {
+    (container.resolve as jest.Mock).mockImplementation(service => {
+      if (service === Core) {
+        return {startE2EIEnrollment: jest.fn(() => Promise.reject(false))};
+      }
+      if (service === UserState) {
+        return userStateMock;
+      }
+      return null;
+    });
+    const handler = E2EIHandler.getInstance(params);
+    handler['showLoadingMessage'] = jest.fn();
+    await handler['enrollE2EI']();
+    expect(getModalOptions).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: ModalType.ERROR,
+      }),
+    );
+  });
+});
diff --git a/src/script/E2EIdentity/E2EIdentity.ts b/src/script/E2EIdentity/E2EIdentity.ts
new file mode 100644
index 00000000000..f24986e5a0b
--- /dev/null
+++ b/src/script/E2EIdentity/E2EIdentity.ts
@@ -0,0 +1,275 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {container} from 'tsyringe';
+
+import {PrimaryModal, removeCurrentModal} from 'Components/Modals/PrimaryModal';
+import {Config} from 'src/script/Config';
+import {Core} from 'src/script/service/CoreSingleton';
+import {UserState} from 'src/script/user/UserState';
+import {removeUrlParameters} from 'Util/UrlUtil';
+import {supportsMLS} from 'Util/util';
+
+import {DelayTimerService} from './DelayTimer/DelayTimer';
+import {getModalOptions, ModalType} from './Modals';
+import {getOIDCServiceInstance} from './OIDCService';
+import {OIDCServiceStore} from './OIDCService/OIDCServiceStorage';
+
+export enum E2EIHandlerStep {
+  UNINITIALIZED = 'uninitialized',
+  INITIALIZED = 'initialized',
+  ENROLL = 'enroll',
+  SUCCESS = 'success',
+  ERROR = 'error',
+  SNOOZE = 'snooze',
+}
+
+interface E2EIHandlerParams {
+  discoveryUrl: string;
+  gracePeriodInMS: number;
+}
+
+class E2EIHandler {
+  private static instance: E2EIHandler | null = null;
+  private readonly core = container.resolve(Core);
+  private readonly userState = container.resolve(UserState);
+  private timer: DelayTimerService;
+  private discoveryUrl: string;
+  private gracePeriodInMS: number;
+  private currentStep: E2EIHandlerStep | null = E2EIHandlerStep.UNINITIALIZED;
+
+  private constructor({discoveryUrl, gracePeriodInMS}: E2EIHandlerParams) {
+    // ToDo: Do these values need to te able to be updated? Should we use a singleton with update fn?
+    this.discoveryUrl = discoveryUrl;
+    this.gracePeriodInMS = gracePeriodInMS;
+    this.timer = DelayTimerService.getInstance({
+      gracePeriodInMS,
+      gracePeriodExpiredCallback: () => null,
+      delayPeriodExpiredCallback: () => null,
+    });
+  }
+
+  /**
+   * Get the singleton instance of GracePeriodTimer or create a new one
+   * For the first time, params are required to create the instance
+   * After that, params are optional and can be used to update the grace period timer
+   * @param params The params to create the grace period timer
+   * @returns The singleton instance of GracePeriodTimer
+   */
+  public static getInstance(params?: E2EIHandlerParams) {
+    if (!E2EIHandler.instance) {
+      if (!params) {
+        throw new Error('GracePeriodTimer is not initialized. Please call getInstance with params.');
+      }
+      E2EIHandler.instance = new E2EIHandler(params);
+    }
+    return E2EIHandler.instance;
+  }
+
+  /**
+   * Reset the instance
+   */
+  public static resetInstance() {
+    E2EIHandler.instance = null;
+  }
+
+  /**
+   * @param E2EIHandlerParams The params to create the grace period timer
+   */
+  public updateParams({gracePeriodInMS, discoveryUrl}: E2EIHandlerParams) {
+    this.gracePeriodInMS = gracePeriodInMS;
+    this.discoveryUrl = discoveryUrl;
+    this.timer.updateParams({
+      gracePeriodInMS,
+      gracePeriodExpiredCallback: () => null,
+      delayPeriodExpiredCallback: () => null,
+    });
+    this.initialize();
+  }
+
+  public initialize(): void {
+    if (this.isE2EIEnabled) {
+      if (!this.core.service?.e2eIdentity?.hasActiveCertificate()) {
+        this.showE2EINotificationMessage();
+      }
+    }
+  }
+
+  get isE2EIEnabled(): boolean {
+    return supportsMLS() && Config.getConfig().FEATURE.ENABLE_E2EI;
+  }
+
+  private async storeRedirectTargetAndRedirect(targetURL: string): Promise<void> {
+    // store the target url in the persistent oidc service store, since the oidc service will be destroyed after the redirect
+    OIDCServiceStore.store.targetURL(targetURL);
+    const oidcService = getOIDCServiceInstance();
+    await oidcService.authenticate();
+  }
+
+  private async enrollE2EI() {
+    try {
+      // Notify user about E2EI enrollment in progress
+      this.currentStep = E2EIHandlerStep.ENROLL;
+      this.showLoadingMessage();
+      let oAuthIdToken: string | undefined;
+
+      // If the enrollment is in progress, we need to get the id token from the oidc service, since oauth should have already been completed
+      if (this.core.service?.e2eIdentity?.isEnrollmentInProgress()) {
+        const oidcService = getOIDCServiceInstance();
+        const userData = await oidcService.handleAuthentication();
+        if (!userData) {
+          throw new Error('Received no user data from OIDC service');
+        }
+        oAuthIdToken = userData?.id_token;
+      }
+
+      const data = await this.core.enrollE2EI(
+        this.userState.self().name(),
+        this.userState.self().username(),
+        this.discoveryUrl,
+        oAuthIdToken,
+      );
+
+      // If the data is false or we dont get the ACMEChallenge, enrollment failed
+      if (!data) {
+        throw new Error('E2EI enrollment failed');
+      }
+
+      // Check if the data is a boolean, if not, we need to handle the oauth redirect
+      if (typeof data !== 'boolean') {
+        await this.storeRedirectTargetAndRedirect(data.target);
+      }
+
+      // Notify user about E2EI enrollment success
+      // This setTimeout is needed because there was a timing with the success modal and the loading modal
+      setTimeout(() => {
+        removeCurrentModal();
+      }, 0);
+
+      this.currentStep = E2EIHandlerStep.SUCCESS;
+      this.showSuccessMessage();
+      // Remove the url parameters after enrollment
+      removeUrlParameters();
+    } catch (error) {
+      this.currentStep = E2EIHandlerStep.ERROR;
+      setTimeout(() => {
+        removeCurrentModal();
+      }, 0);
+      this.showErrorMessage();
+    }
+  }
+
+  private showLoadingMessage(): void {
+    if (this.currentStep !== E2EIHandlerStep.ENROLL) {
+      return;
+    }
+
+    const {modalOptions, modalType} = getModalOptions({
+      type: ModalType.LOADING,
+      hideClose: true,
+    });
+    PrimaryModal.show(modalType, modalOptions);
+  }
+
+  private showSuccessMessage(): void {
+    if (this.currentStep !== E2EIHandlerStep.SUCCESS) {
+      return;
+    }
+
+    const {modalOptions, modalType} = getModalOptions({
+      type: ModalType.SUCCESS,
+      hideSecondary: true,
+      hideClose: false,
+    });
+    PrimaryModal.show(modalType, modalOptions);
+  }
+
+  private async showErrorMessage(): Promise<void> {
+    if (this.currentStep !== E2EIHandlerStep.ERROR) {
+      return;
+    }
+
+    // Remove the url parameters of the failed enrollment
+    removeUrlParameters();
+    // Clear the oidc service progress
+    const oidcService = getOIDCServiceInstance();
+    await oidcService.clearProgress();
+    // Clear the e2e identity progress
+    this.core.service?.e2eIdentity?.clearAllProgress();
+
+    const {modalOptions, modalType} = getModalOptions({
+      type: ModalType.ERROR,
+      hideClose: true,
+      primaryActionFn: () => {
+        this.currentStep = E2EIHandlerStep.INITIALIZED;
+        void this.enrollE2EI();
+      },
+      secondaryActionFn: () => {
+        this.showE2EINotificationMessage();
+      },
+    });
+
+    PrimaryModal.show(modalType, modalOptions);
+  }
+
+  private showE2EINotificationMessage(): void {
+    // If the user has already started enrollment, don't show the notification. Instead, show the loading modal
+    // This will occur after the redirect from the oauth provider
+    if (this.core.service?.e2eIdentity?.isEnrollmentInProgress()) {
+      void this.enrollE2EI();
+      return;
+    }
+
+    // If the user has already snoozed the notification, don't show it again until the snooze period has expired
+    if (this.currentStep !== E2EIHandlerStep.UNINITIALIZED && this.currentStep !== E2EIHandlerStep.SNOOZE) {
+      return;
+    }
+
+    // Only initialize the timer when the it is uninitialized
+    if (this.currentStep === E2EIHandlerStep.UNINITIALIZED) {
+      this.timer.updateParams({
+        gracePeriodInMS: this.gracePeriodInMS,
+        gracePeriodExpiredCallback: () => {
+          this.showE2EINotificationMessage();
+        },
+        delayPeriodExpiredCallback: () => {
+          this.showE2EINotificationMessage();
+        },
+      });
+      this.currentStep = E2EIHandlerStep.INITIALIZED;
+    }
+
+    // If the timer is not active, show the notification
+    if (!this.timer.isDelayTimerActive()) {
+      const {modalOptions, modalType} = getModalOptions({
+        hideSecondary: !this.timer.isSnoozeTimeAvailable(),
+        primaryActionFn: () => this.enrollE2EI(),
+        secondaryActionFn: () => {
+          this.currentStep = E2EIHandlerStep.SNOOZE;
+          this.timer.delayPrompt();
+        },
+        type: ModalType.ENROLL,
+        hideClose: true,
+      });
+      PrimaryModal.show(modalType, modalOptions);
+    }
+  }
+}
+
+export {E2EIHandler};
diff --git a/src/script/E2EIdentity/Modals/Modals.test.ts b/src/script/E2EIdentity/Modals/Modals.test.ts
new file mode 100644
index 00000000000..f9f26971b61
--- /dev/null
+++ b/src/script/E2EIdentity/Modals/Modals.test.ts
@@ -0,0 +1,60 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+
+import {getModalOptions, ModalType} from './Modals';
+
+describe('getModalOptions', () => {
+  it('should return modal options with hidden secondary action when hideSecondary is true', () => {
+    const options = getModalOptions({type: ModalType.ENROLL, hideSecondary: true});
+
+    expect(options.modalOptions.secondaryAction).toBeUndefined();
+    expect(options.modalType).toEqual(PrimaryModal.type.ACKNOWLEDGE);
+  });
+
+  it('should return modal options with hidden secondary action when secondaryActionFn is not provided', () => {
+    const options = getModalOptions({type: ModalType.ENROLL, secondaryActionFn: undefined});
+
+    expect(options.modalOptions.secondaryAction).toBeUndefined();
+    expect(options.modalType).toEqual(PrimaryModal.type.ACKNOWLEDGE);
+  });
+
+  it('should return modal options with hidden primary action when hidePrimary is true', () => {
+    const options = getModalOptions({type: ModalType.ENROLL, hidePrimary: true});
+
+    expect(options.modalOptions.primaryAction).toBeUndefined();
+  });
+
+  it('should return modal options with hidden close button when hideClose is true', () => {
+    const options = getModalOptions({type: ModalType.ENROLL, hideClose: true});
+
+    expect(options.modalOptions.hideCloseBtn).toBeTruthy();
+    expect(options.modalOptions.preventClose).toBeTruthy();
+  });
+
+  it('should return modal options with hidden secondary and primary actions when both hideSecondary and hidePrimary are true', () => {
+    const options = getModalOptions({type: ModalType.ENROLL, hideSecondary: true, hidePrimary: true});
+
+    expect(options.modalOptions.secondaryAction).toBeUndefined();
+    expect(options.modalOptions.primaryAction).toBeUndefined();
+  });
+
+  // Add more test cases as needed to cover different combinations of hide functionality
+});
diff --git a/src/script/E2EIdentity/Modals/Modals.ts b/src/script/E2EIdentity/Modals/Modals.ts
new file mode 100644
index 00000000000..d422b592466
--- /dev/null
+++ b/src/script/E2EIdentity/Modals/Modals.ts
@@ -0,0 +1,144 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {ModalOptions, PrimaryModalType} from 'Components/Modals/PrimaryModal/PrimaryModalTypes';
+import {t} from 'Util/LocalizerUtil';
+
+const hideSecondaryBtn = {hideSecondary: true};
+const hideCloseBtn = {hideCloseBtn: true, preventClose: true};
+
+export enum ModalType {
+  ENROLL = 'enroll',
+  ERROR = 'error',
+  SUCCESS = 'success',
+  LOADING = 'loading',
+}
+
+interface GetModalOptions {
+  type: ModalType;
+  primaryActionFn?: () => void;
+  secondaryActionFn?: () => void;
+  hideSecondary?: boolean;
+  hidePrimary?: boolean;
+  hideClose?: boolean;
+}
+export const getModalOptions = ({
+  type,
+  primaryActionFn,
+  secondaryActionFn,
+  hidePrimary = false,
+  hideSecondary = false,
+  hideClose = true,
+}: GetModalOptions) => {
+  if (!secondaryActionFn) {
+    hideSecondary = true;
+  }
+  let options: ModalOptions = {};
+  let modalType: PrimaryModalType = PrimaryModal.type.CONFIRM;
+  switch (type) {
+    case ModalType.ENROLL:
+      options = {
+        text: {
+          closeBtnLabel: t('acme.settingsChanged.button.close'),
+          htmlMessage: t('acme.settingsChanged.paragraph'),
+          title: t('acme.settingsChanged.headline.alt'),
+        },
+        primaryAction: {
+          action: primaryActionFn,
+          text: t('acme.settingsChanged.button.primary'),
+        },
+        secondaryAction: {
+          action: secondaryActionFn,
+          text: t('acme.settingsChanged.button.secondary'),
+        },
+        ...hideCloseBtn,
+      };
+      modalType =
+        hideSecondary || secondaryActionFn === undefined ? PrimaryModal.type.ACKNOWLEDGE : PrimaryModal.type.CONFIRM;
+      break;
+
+    case ModalType.ERROR:
+      options = {
+        text: {
+          closeBtnLabel: t('acme.error.button.close'),
+          htmlMessage: t('acme.error.paragraph'),
+          title: t('acme.error.headline'),
+        },
+        primaryAction: {
+          action: primaryActionFn,
+          text: t('acme.error.button.primary'),
+        },
+        secondaryAction: {
+          action: secondaryActionFn,
+          text: t('acme.error.button.secondary'),
+        },
+      };
+      modalType =
+        hideSecondary || secondaryActionFn === undefined ? PrimaryModal.type.CONFIRM : PrimaryModal.type.ACKNOWLEDGE;
+      break;
+
+    case ModalType.LOADING:
+      options = {
+        text: {
+          title: t('acme.inProgress.headline'),
+        },
+        ...hideCloseBtn,
+      };
+      // Needs to be changed to Loading spinner Modal
+      modalType = PrimaryModalType.LOADING;
+      break;
+
+    case ModalType.SUCCESS:
+      options = {
+        text: {
+          closeBtnLabel: t('acme.done.button.close'),
+          htmlMessage: t('acme.done.paragraph'),
+          title: t('acme.done.headline'),
+        },
+        primaryAction: {
+          action: primaryActionFn,
+          text: t('acme.done.button'),
+        },
+      };
+      modalType = PrimaryModal.type.ACKNOWLEDGE;
+      break;
+  }
+
+  if (hideClose) {
+    options = {
+      ...options,
+      ...hideCloseBtn,
+    };
+  }
+
+  if (hideSecondary || secondaryActionFn === undefined) {
+    delete options.secondaryAction;
+    options = {
+      ...options,
+      ...hideSecondaryBtn,
+    };
+  }
+
+  if (hidePrimary) {
+    delete options.primaryAction;
+  }
+
+  return {modalOptions: options, modalType};
+};
diff --git a/src/script/components/InputBar/components/MentionSuggestions/index.ts b/src/script/E2EIdentity/Modals/index.ts
similarity index 89%
rename from src/script/components/InputBar/components/MentionSuggestions/index.ts
rename to src/script/E2EIdentity/Modals/index.ts
index cb36039b461..6d870d904f4 100644
--- a/src/script/components/InputBar/components/MentionSuggestions/index.ts
+++ b/src/script/E2EIdentity/Modals/index.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,4 +17,4 @@
  *
  */
 
-export * from './MentionSuggestions';
+export * from './Modals';
diff --git a/src/script/E2EIdentity/OIDCService/OIDCService.ts b/src/script/E2EIdentity/OIDCService/OIDCService.ts
new file mode 100644
index 00000000000..6f0aef805dd
--- /dev/null
+++ b/src/script/E2EIdentity/OIDCService/OIDCService.ts
@@ -0,0 +1,68 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {UserManager, User, UserManagerSettings} from 'oidc-client-ts';
+
+import {clearKeysStartingWith} from 'Util/localStorage';
+
+interface OIDCServiceConfig {
+  authorityUrl: string;
+  audience: string;
+  redirectUri: string;
+  clientSecret?: string;
+}
+
+export class OIDCService {
+  private userManager: UserManager;
+
+  constructor(config: OIDCServiceConfig) {
+    const {authorityUrl, audience, redirectUri, clientSecret = ''} = config;
+    const dexioConfig: UserManagerSettings = {
+      authority: authorityUrl,
+      client_id: audience,
+      redirect_uri: redirectUri,
+      response_type: 'code',
+      scope: 'openid profile email',
+      client_secret: clientSecret,
+    };
+
+    this.userManager = new UserManager(dexioConfig);
+  }
+
+  public async authenticate(): Promise<void> {
+    await this.userManager.signinRedirect();
+  }
+
+  public handleAuthentication(): Promise<User> {
+    // Remove the hash (hash router) from the url before processing
+    const url = window.location.href.replace('/#', '');
+
+    return this.userManager.signinRedirectCallback(url).then(user => {
+      return user;
+    });
+  }
+
+  public clearProgress(): Promise<void> {
+    const {localStorage, sessionStorage} = window;
+    // remove all oidc keys from local and session storage to prevent errors and stale state
+    clearKeysStartingWith('oidc.', localStorage);
+    clearKeysStartingWith('oidc.user:', sessionStorage);
+    return this.userManager.clearStaleState();
+  }
+}
diff --git a/src/script/E2EIdentity/OIDCService/OIDCServiceStorage.ts b/src/script/E2EIdentity/OIDCService/OIDCServiceStorage.ts
new file mode 100644
index 00000000000..da41033ad67
--- /dev/null
+++ b/src/script/E2EIdentity/OIDCService/OIDCServiceStorage.ts
@@ -0,0 +1,40 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+const TargetURLKey = 'E2EIdentity_OIDCService_TargetURL';
+
+const OIDCServiceStore = {
+  store: {
+    targetURL: (url: string) => localStorage.setItem(TargetURLKey, url),
+  },
+  get: {
+    targetURL: () => localStorage.getItem(TargetURLKey),
+  },
+  has: {
+    targetURL: () => localStorage.getItem(TargetURLKey) !== null,
+  },
+  clear: {
+    targetURL: () => localStorage.removeItem(TargetURLKey),
+    all: () => {
+      OIDCServiceStore.clear.targetURL();
+    },
+  },
+};
+
+export {OIDCServiceStore};
diff --git a/src/script/E2EIdentity/OIDCService/index.ts b/src/script/E2EIdentity/OIDCService/index.ts
new file mode 100644
index 00000000000..290e1343c8d
--- /dev/null
+++ b/src/script/E2EIdentity/OIDCService/index.ts
@@ -0,0 +1,37 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {OIDCService} from './OIDCService';
+import {OIDCServiceStore} from './OIDCServiceStorage';
+
+// lots of hardcoded values here, but this is just for testing until we have a proper OIDC service
+export const getOIDCServiceInstance = (): OIDCService => {
+  // if there is no targetURL, we cannot create an OIDCService
+  const targetURL = OIDCServiceStore.get.targetURL();
+  if (!targetURL) {
+    throw new Error('No targetURL found in OIDCServiceStore');
+  }
+  const oidcService = new OIDCService({
+    audience: '338888153072-ktbh66pv3mr0ua0dn64sphgimeo0p7ss.apps.googleusercontent.com',
+    authorityUrl: 'https://accounts.google.com' || targetURL,
+    redirectUri: 'https://local.elna.wire.link:8081/oidc',
+    clientSecret: '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',
+  });
+  return oidcService;
+};
diff --git a/src/script/mls/mlsConversationState/index.ts b/src/script/E2EIdentity/index.ts
similarity index 89%
rename from src/script/mls/mlsConversationState/index.ts
rename to src/script/E2EIdentity/index.ts
index a5cc6a67fc6..6092e227756 100644
--- a/src/script/mls/mlsConversationState/index.ts
+++ b/src/script/E2EIdentity/index.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,4 +17,4 @@
  *
  */
 
-export * from './mlsConversationState';
+export * from './E2EIdentity';
diff --git a/src/script/assets/AssetCrypto.ts b/src/script/assets/AssetCrypto.ts
index 067c7a376be..4b1f50d723b 100644
--- a/src/script/assets/AssetCrypto.ts
+++ b/src/script/assets/AssetCrypto.ts
@@ -17,7 +17,7 @@
  *
  */
 
-export interface EncryptedAsset {
+interface EncryptedAsset {
   cipherText: ArrayBuffer;
   keyBytes: ArrayBuffer;
   sha256: ArrayBuffer;
diff --git a/src/script/assets/AssetRemoteData.ts b/src/script/assets/AssetRemoteData.ts
index e88c634f36a..de372c7a46c 100644
--- a/src/script/assets/AssetRemoteData.ts
+++ b/src/script/assets/AssetRemoteData.ts
@@ -21,25 +21,25 @@ import ko from 'knockout';
 
 export type AssetUrlData = AssetUrlDataVersion1 | AssetUrlDataVersion2 | AssetUrlDataVersion3 | AssetUrlDataVersion4;
 
-export interface AssetUrlDataVersion3 {
+interface AssetUrlDataVersion3 {
   assetKey: string;
   assetToken: string;
   forceCaching: boolean;
   version: 3;
 }
-export interface AssetUrlDataVersion4 extends Omit<AssetUrlDataVersion3, 'version'> {
+interface AssetUrlDataVersion4 extends Omit<AssetUrlDataVersion3, 'version'> {
   assetDomain: string;
   version: 4;
 }
 
-export interface AssetUrlDataVersion2 {
+interface AssetUrlDataVersion2 {
   assetId: string;
   conversationId: string;
   forceCaching: boolean;
   version: 2;
 }
 
-export interface AssetUrlDataVersion1 {
+interface AssetUrlDataVersion1 {
   assetId: string;
   conversationId: string;
   forceCaching: boolean;
diff --git a/src/script/assets/AssetRepository.ts b/src/script/assets/AssetRepository.ts
index 1a7242421dc..92081ab626e 100644
--- a/src/script/assets/AssetRepository.ts
+++ b/src/script/assets/AssetRepository.ts
@@ -39,7 +39,7 @@ import {FileAsset} from '../entity/message/FileAsset';
 import type {User} from '../entity/User';
 import {Core} from '../service/CoreSingleton';
 
-export interface CompressedImage {
+interface CompressedImage {
   compressedBytes: Uint8Array;
   compressedImage: HTMLImageElement;
 }
@@ -50,7 +50,7 @@ export interface AssetUploadOptions extends AssetOptions {
   legalHoldStatus?: LegalHoldStatus;
 }
 
-export interface UploadStatus {
+interface UploadStatus {
   messageId: string;
   progress: ko.Observable<number>;
 }
diff --git a/src/script/audio/AudioRepository.ts b/src/script/audio/AudioRepository.ts
index 44f9f7433ce..bd14907e8d6 100644
--- a/src/script/audio/AudioRepository.ts
+++ b/src/script/audio/AudioRepository.ts
@@ -30,7 +30,8 @@ import {AudioState} from './AudioState';
 import {AudioType} from './AudioType';
 
 import {NOTIFICATION_HANDLING_STATE} from '../event/NotificationHandlingState';
-import {DeviceTypes, MediaDevicesHandler} from '../media/MediaDevicesHandler';
+import {MediaDevicesHandler} from '../media/MediaDevicesHandler';
+import {MediaDeviceType} from '../media/MediaDeviceType';
 
 enum AUDIO_PLAY_PERMISSION {
   ALLOWED = 0,
@@ -87,7 +88,7 @@ export class AudioRepository {
   }
 
   private updateSinkIds() {
-    const currentOutputDevice = this.devicesHandler?.currentDeviceId[DeviceTypes.AUDIO_OUTPUT]();
+    const currentOutputDevice = this.devicesHandler?.currentDeviceId[MediaDeviceType.AUDIO_OUTPUT]();
     if (!currentOutputDevice) {
       return;
     }
diff --git a/src/script/auth/component/AccountForm.tsx b/src/script/auth/component/AccountForm.tsx
index 5ca312ab676..d90aead77ed 100644
--- a/src/script/auth/component/AccountForm.tsx
+++ b/src/script/auth/component/AccountForm.tsx
@@ -52,7 +52,7 @@ const AccountFormComponent = ({account, ...props}: Props & ConnectedProps & Disp
   const {formatMessage: _} = useIntl();
 
   const [registrationData, setRegistrationData] = useState({
-    accent_id: AccentColor.random().id,
+    accent_id: AccentColor.STRONG_BLUE.id,
     email: '',
     name: '',
     password: '',
diff --git a/src/script/auth/component/JoinGuestLinkPasswordModal.test.tsx b/src/script/auth/component/JoinGuestLinkPasswordModal.test.tsx
index a5160517b50..66c09b6d6e4 100644
--- a/src/script/auth/component/JoinGuestLinkPasswordModal.test.tsx
+++ b/src/script/auth/component/JoinGuestLinkPasswordModal.test.tsx
@@ -27,6 +27,7 @@ describe('JoinGuestLinkPasswordModal', () => {
   const onSubmitPasswordMock = jest.fn();
   const props: JoinGuestLinkPasswordModalProps = {
     onSubmitPassword: onSubmitPasswordMock,
+    onClose: jest.fn(),
     conversationName: 'test group',
     error: null,
   };
diff --git a/src/script/auth/component/UnsupportedBrowser.tsx b/src/script/auth/component/UnsupportedBrowser.tsx
index 7d4a32ff434..c01fe3f37fb 100644
--- a/src/script/auth/component/UnsupportedBrowser.tsx
+++ b/src/script/auth/component/UnsupportedBrowser.tsx
@@ -50,11 +50,11 @@ const UnsupportedMessage: React.FC<UnsupportedProps> = ({headline, subhead}) =>
   );
 };
 
-export interface UnsupportedBrowserProps extends React.HTMLProps<HTMLDivElement> {
+interface UnsupportedBrowserProps extends React.HTMLProps<HTMLDivElement> {
   isTemporaryGuest?: boolean;
 }
 
-export const UnsupportedBrowserComponent = ({
+const UnsupportedBrowserComponent = ({
   children,
   hasCookieSupport,
   hasIndexedDbSupport,
@@ -128,6 +128,4 @@ const mapStateToProps = (state: RootState) => ({
   isSupportedBrowser: RuntimeSelector.isSupportedBrowser(state),
 });
 
-const UnsupportedBrowser = connect(mapStateToProps)(UnsupportedBrowserComponent);
-
-export {UnsupportedBrowser};
+export const UnsupportedBrowser = connect(mapStateToProps)(UnsupportedBrowserComponent);
diff --git a/src/script/auth/externalRoute.ts b/src/script/auth/externalRoute.ts
index 98138bdc376..aabb942a7bd 100644
--- a/src/script/auth/externalRoute.ts
+++ b/src/script/auth/externalRoute.ts
@@ -20,8 +20,6 @@
 import {Config} from '../Config';
 
 export const EXTERNAL_ROUTE = {
-  PWA: Config.getConfig().URL.MOBILE_BASE,
-  PWA_LOGIN: `${Config.getConfig().URL.MOBILE_BASE}/login/`,
   WEBAPP: '../',
   WIRE_ACCOUNT: Config.getConfig().URL.ACCOUNT_BASE,
   WIRE_ACCOUNT_PASSWORD_RESET: `${Config.getConfig().URL.ACCOUNT_BASE}/forgot/`,
diff --git a/src/script/auth/localeConfig.ts b/src/script/auth/localeConfig.ts
index 8afd7abb914..6269d07fdee 100644
--- a/src/script/auth/localeConfig.ts
+++ b/src/script/auth/localeConfig.ts
@@ -24,8 +24,8 @@ import {UrlUtil} from '@wireapp/commons';
 import {QUERY_KEY} from './route';
 import {supportedLocales as Locales} from './supportedLocales';
 
-export const DEFAULT_CURRENCY = SupportedCurrency.EUR;
-export const DEFAULT_LANGUAGE = 'en-US';
+const DEFAULT_CURRENCY = SupportedCurrency.EUR;
+const DEFAULT_LANGUAGE = 'en-US';
 
 function getLocale(): string {
   return mapLanguage(navigator.languages?.length ? navigator.languages[0] : navigator.language);
diff --git a/src/script/auth/module/action/RuntimeAction.ts b/src/script/auth/module/action/RuntimeAction.ts
index 48252dabde5..232ce193277 100644
--- a/src/script/auth/module/action/RuntimeAction.ts
+++ b/src/script/auth/module/action/RuntimeAction.ts
@@ -25,20 +25,30 @@ import {RuntimeActionCreator} from './creator/';
 
 import * as RuntimeSelector from '../../module/selector/RuntimeSelector';
 import {QUERY_KEY} from '../../route';
-import {hasURLParameter} from '../../util/urlUtil';
 import type {ThunkAction} from '../reducer';
 
+const androidBrowser = 'android browser';
+const chromeMobile = 'chrome mobile';
+const outlookBrowser = 'unknown';
+
 export class RuntimeAction {
   checkSupportedBrowser = (): ThunkAction<void> => {
     return (dispatch, getState, {getConfig}) => {
-      const isPwaSupportedBrowser = () => {
-        return Runtime.isMobileOS() || Runtime.isSafari();
+      const isMobileSupportedBrowser = () => {
+        return (
+          Runtime.isMobileOS() &&
+          (Runtime.isSafari() ||
+            Runtime.isChrome() ||
+            [androidBrowser, chromeMobile].includes(Runtime.getBrowserName()))
+        );
+      };
+      const isOutlookApp = () => {
+        return Runtime.getBrowserName() === outlookBrowser;
       };
-      const pwaAware = hasURLParameter(QUERY_KEY.PWA_AWARE);
-      const isPwaEnabled = getConfig().URL.MOBILE_BASE && pwaAware && isPwaSupportedBrowser();
+      const isAuthorizationFlow = () => location?.hash?.includes(QUERY_KEY.SCOPE) ?? false;
       if (
         (!RuntimeSelector.hasToUseDesktopApplication(getState()) && Runtime.isWebappSupportedBrowser()) ||
-        isPwaEnabled
+        ((isMobileSupportedBrowser() || isOutlookApp()) && isAuthorizationFlow())
       ) {
         dispatch(RuntimeActionCreator.confirmSupportedBrowser());
       }
diff --git a/src/script/auth/module/reducer/selfReducer.ts b/src/script/auth/module/reducer/selfReducer.ts
index 1f42ad0d3f3..f35512a4951 100644
--- a/src/script/auth/module/reducer/selfReducer.ts
+++ b/src/script/auth/module/reducer/selfReducer.ts
@@ -19,7 +19,7 @@
 
 import type {Self} from '@wireapp/api-client/lib/self/';
 
-import {AppActions, SELF_ACTION} from '../action/creator/';
+import {AUTH_ACTION, AppActions, SELF_ACTION} from '../action/creator/';
 
 export interface SelfState {
   consents: {[key: number]: number};
@@ -100,6 +100,11 @@ export function selfReducer(state: SelfState = initialSelfState, action: AppActi
         consents: {...state.consents, [action.payload.type]: action.payload.value},
       };
     }
+    case AUTH_ACTION.LOGOUT_SUCCESS: {
+      return {
+        ...initialSelfState,
+      };
+    }
     default: {
       return state;
     }
diff --git a/src/script/auth/page/ClientManager.tsx b/src/script/auth/page/ClientManager.tsx
index 96a6baebeec..7b9d083adc4 100644
--- a/src/script/auth/page/ClientManager.tsx
+++ b/src/script/auth/page/ClientManager.tsx
@@ -24,7 +24,7 @@ import {connect} from 'react-redux';
 import {AnyAction, Dispatch} from 'redux';
 
 import {UrlUtil, StringUtil, Runtime} from '@wireapp/commons';
-import {Button, ButtonVariant, ContainerXS, H1, Muted, useTimeout} from '@wireapp/react-ui-kit';
+import {Button, ButtonVariant, ContainerXS, H1, Muted, QUERY, useMatchMedia, useTimeout} from '@wireapp/react-ui-kit';
 
 import {Page} from './Page';
 
@@ -41,6 +41,8 @@ const ClientManagerComponent = ({doGetAllClients, doLogout}: Props & ConnectedPr
   const {formatMessage: _} = useIntl();
   const SFAcode = localStorage.getItem(QUERY_KEY.CONVERSATION_CODE);
   const isOauth = UrlUtil.hasURLParameter(QUERY_KEY.SCOPE);
+  const isMobile = useMatchMedia(QUERY.mobile);
+
   const device = StringUtil.capitalize(Runtime.getBrowserName());
 
   const timeRemaining = JSON.parse(localStorage.getItem(QUERY_KEY.JOIN_EXPIRES) ?? '{}')?.data ?? Date.now();
@@ -73,12 +75,24 @@ const ClientManagerComponent = ({doGetAllClients, doLogout}: Props & ConnectedPr
       <ContainerXS
         centerText
         verticalCenter
-        style={{display: 'flex', flexDirection: 'column', justifyContent: 'space-around', minHeight: 428}}
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          justifyContent: 'space-around',
+          minHeight: 428,
+          marginInline: isMobile ? '20px' : 'auto',
+        }}
       >
         <H1 center style={{marginTop: '140px'}}>
           {_(clientManagerStrings.headline)}
         </H1>
-        <Muted center style={{marginBottom: '42px'}} data-uie-name="status-device-limit-info">
+        <Muted
+          center
+          style={{
+            marginBottom: '42px',
+          }}
+          data-uie-name="status-device-limit-info"
+        >
           {isOauth
             ? _(clientManagerStrings.oauth, {device})
             : _(clientManagerStrings.subhead, {brandName: Config.getConfig().BRAND_NAME})}
diff --git a/src/script/auth/page/ConversationJoin.tsx b/src/script/auth/page/ConversationJoin.tsx
index 4f9ad54432f..679e693a431 100644
--- a/src/script/auth/page/ConversationJoin.tsx
+++ b/src/script/auth/page/ConversationJoin.tsx
@@ -20,43 +20,31 @@
 import React, {useEffect, useState} from 'react';
 
 import type {RegisterData} from '@wireapp/api-client/lib/auth';
-import {BackendError, BackendErrorLabel} from '@wireapp/api-client/lib/http';
-import {FormattedMessage, useIntl} from 'react-intl';
+import {BackendErrorLabel} from '@wireapp/api-client/lib/http';
+import {useIntl} from 'react-intl';
 import {connect} from 'react-redux';
-import {Navigate} from 'react-router-dom';
+import {Navigate} from 'react-router';
 import {AnyAction, Dispatch} from 'redux';
 
-import {Runtime, UrlUtil} from '@wireapp/commons';
-import {
-  ArrowIcon,
-  Button,
-  ContainerXS,
-  Form,
-  H2,
-  Input,
-  InputBlock,
-  InputSubmitCombo,
-  Link,
-  RoundIconButton,
-  Small,
-  Loading,
-  Text,
-} from '@wireapp/react-ui-kit';
+import {UrlUtil} from '@wireapp/commons';
+import {Column, Columns, H1, Muted} from '@wireapp/react-ui-kit';
 
-import {isBackendError} from 'Util/TypePredicateUtil';
 import {noop} from 'Util/util';
 
+import {GuestLoginColumn, IsLoggedInColumn, Separator} from './ConversationJoinComponents';
+import {ConversationJoinFull, ConversationJoinInvalid} from './ConversationJoinInvalid';
 import {EntropyContainer} from './EntropyContainer';
+import {Login} from './Login';
+import {Page} from './Page';
 
 import {Config} from '../../Config';
 import {conversationJoinStrings} from '../../strings';
 import {AppAlreadyOpen} from '../component/AppAlreadyOpen';
 import {JoinGuestLinkPasswordModal} from '../component/JoinGuestLinkPasswordModal';
-import {RouterLink} from '../component/RouterLink';
 import {UnsupportedBrowser} from '../component/UnsupportedBrowser';
 import {WirelessContainer} from '../component/WirelessContainer';
 import {EXTERNAL_ROUTE} from '../externalRoute';
-import {actionRoot as ROOT_ACTIONS} from '../module/action/';
+import {actionRoot as ROOT_ACTIONS} from '../module/action';
 import {ValidationError} from '../module/action/ValidationError';
 import {bindActionCreators, RootState} from '../module/reducer';
 import * as AuthSelector from '../module/selector/AuthSelector';
@@ -64,8 +52,6 @@ import * as ConversationSelector from '../module/selector/ConversationSelector';
 import * as SelfSelector from '../module/selector/SelfSelector';
 import {QUERY_KEY, ROUTE} from '../route';
 import * as AccentColor from '../util/AccentColor';
-import {parseError, parseValidationErrors} from '../util/errorUtil';
-import * as StringUtil from '../util/stringUtil';
 
 type Props = React.HTMLProps<HTMLDivElement>;
 
@@ -77,8 +63,6 @@ const ConversationJoinComponent = ({
   setLastEventDate,
   doLogout,
   doGetConversationInfoByCode,
-  isAuthenticated,
-  isTemporaryGuest,
   selfName,
   conversationError,
   isFetchingAuth,
@@ -92,28 +76,25 @@ const ConversationJoinComponent = ({
   const conversationHasPassword = conversationInfo?.has_password;
   const invalidConversationPassword =
     conversationError && conversationError.label === BackendErrorLabel.INVALID_CONVERSATION_PASSWORD;
-  const [accentColor] = useState(AccentColor.random());
-  const [isPwaEnabled, setIsPwaEnabled] = useState<boolean>();
+  const [accentColor] = useState(AccentColor.STRONG_BLUE);
   const [isJoinGuestLinkPasswordModalOpen, setIsJoinGuestLinkPasswordModalOpen] = useState<boolean>(
     !!conversationHasPassword || !!invalidConversationPassword,
   );
   const [conversationCode, setConversationCode] = useState<string>();
   const [conversationKey, setConversationKey] = useState<string>();
-  const [enteredName, setEnteredName] = useState<string>();
+  const [enteredName, setEnteredName] = useState<string>('');
   const [error, setError] = useState<any>();
   const [expiresIn, setExpiresIn] = useState<number>();
-  const [forceNewTemporaryGuestAccount, setForceNewTemporaryGuestAccount] = useState(false);
   const [isValidLink, setIsValidLink] = useState(true);
   const [isValidName, setIsValidName] = useState(true);
+  const [isSubmitingName, setIsSubmitingName] = useState(false);
   const [showCookiePolicyBanner, setShowCookiePolicyBanner] = useState(true);
   const [showEntropyForm, setShowEntropyForm] = useState(false);
   const isEntropyRequired = Config.getConfig().FEATURE.ENABLE_EXTRA_CLIENT_ENTROPY;
 
   const isFetching = isFetchingAuth || isFetchingConversation || conversationInfoFetching;
 
-  const isPwaSupportedBrowser = () => {
-    return Runtime.isMobileOS() || Runtime.isSafari();
-  };
+  const isWirePublicInstance = Config.getConfig().BRAND_NAME === 'Wire';
 
   useEffect(() => {
     setIsJoinGuestLinkPasswordModalOpen(!!conversationHasPassword || !!invalidConversationPassword);
@@ -141,48 +122,42 @@ const ConversationJoinComponent = ({
       });
   }, []);
 
-  useEffect(() => {
-    const isEnabled =
-      Config.getConfig().URL.MOBILE_BASE && UrlUtil.hasURLParameter(QUERY_KEY.PWA_AWARE) && isPwaSupportedBrowser();
-    setIsPwaEnabled(!!isEnabled);
-    if (isEnabled) {
-      setForceNewTemporaryGuestAccount(true);
-    }
-  }, []);
-
   const routeToApp = (conversation: string = '', domain: string = '') => {
-    const redirectLocation = isPwaEnabled
-      ? UrlUtil.pathWithParams(EXTERNAL_ROUTE.PWA_LOGIN, {[QUERY_KEY.IMMEDIATE_LOGIN]: 'true'})
-      : `${UrlUtil.pathWithParams(EXTERNAL_ROUTE.WEBAPP)}${
-          conversation && `#/conversation/${conversation}${domain && `/${domain}`}`
-        }`;
+    const redirectLocation = `${UrlUtil.pathWithParams(EXTERNAL_ROUTE.WEBAPP)}${
+      conversation && `#/conversation/${conversation}${domain && `/${domain}`}`
+    }`;
     window.location.replace(redirectLocation);
   };
 
-  const handleSubmitError = (error: BackendError) => {
-    switch (error.label) {
-      default: {
-        const isValidationError = Object.values(ValidationError.ERROR).some(errorType =>
-          (error as BackendError).label.endsWith(errorType),
-        );
-        if (!isValidationError) {
-          doLogout();
-          console.warn('Unable to create wireless account', error);
-          setShowEntropyForm(false);
-        }
+  const getConversationInfoAndJoin = async (password?: string) => {
+    try {
+      if (!conversationCode || !conversationKey) {
+        throw Error('Conversation code or key missing');
       }
+      const conversationEvent = await doJoinConversationByCode(conversationKey, conversationCode, undefined, password);
+      /* When we join a conversation, we create the join event before loading the webapp.
+       * That means that when the webapp loads and tries to fetch the notificationStream is will get the join event once again and will try to handle it
+       * Here we set the core's lastEventDate so that it knows that this duplicated event should be skipped
+       */
+      await setLastEventDate(new Date(conversationEvent.time));
+
+      routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? '');
+    } catch (error) {
+      console.warn('Unable to join conversation', error);
+      setShowEntropyForm(false);
     }
   };
 
   const handleSubmit = async (entropyData?: Uint8Array, password?: string) => {
-    if (!conversationKey || !conversationCode) {
-      return;
-    }
+    setIsSubmitingName(true);
     if (!isJoinGuestLinkPasswordModalOpen && !!conversationHasPassword) {
       setIsJoinGuestLinkPasswordModalOpen(true);
       return;
     }
     try {
+      if (!conversationCode || !conversationKey) {
+        throw Error('Conversation code or key missing');
+      }
       const name = enteredName?.trim();
       const registrationData = {
         accent_id: accentColor.id,
@@ -192,21 +167,26 @@ const ConversationJoinComponent = ({
       await doRegisterWireless(
         registrationData as RegisterData,
         {
-          shouldInitializeClient: !isPwaEnabled,
+          shouldInitializeClient: true,
         },
         entropyData,
       );
-      const conversationEvent = await doJoinConversationByCode(conversationKey, conversationCode, undefined, password);
-      /* When we join a conversation, we create the join event before loading the webapp.
-       * That means that when the webapp loads and tries to fetch the notificationStream is will get the join event once again and will try to handle it
-       * Here we set the core's lastEventDate so that it knows that this duplicated event should be skipped
-       */
-      await setLastEventDate(new Date(conversationEvent.time));
-
-      routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? '');
+      await getConversationInfoAndJoin(password);
     } catch (error) {
-      if (isBackendError(error)) {
-        handleSubmitError(error);
+      setIsSubmitingName(false);
+      if (error.label) {
+        switch (error.label) {
+          default: {
+            const isValidationError = Object.values(ValidationError.ERROR).some(errorType =>
+              error.label.endsWith(errorType),
+            );
+            if (!isValidationError) {
+              void doLogout();
+              console.warn('Unable to create wireless account', error);
+              setShowEntropyForm(false);
+            }
+          }
+        }
       } else {
         await doLogout();
         console.warn('Unable to create wireless account', error);
@@ -218,7 +198,7 @@ const ConversationJoinComponent = ({
     }
   };
 
-  const checkNameValidity = (event: React.FormEvent) => {
+  const checkNameValidity = async (event: React.FormEvent) => {
     event.preventDefault();
     if (!nameInput.current) {
       return;
@@ -230,7 +210,7 @@ const ConversationJoinComponent = ({
     } else if (isEntropyRequired) {
       setShowEntropyForm(true);
     } else {
-      handleSubmit();
+      await handleSubmit();
     }
   };
 
@@ -244,9 +224,12 @@ const ConversationJoinComponent = ({
     setEnteredName(event.target.value);
   };
 
+  if (!isValidLink) {
+    return <ConversationJoinInvalid />;
+  }
+
   const isFullConversation =
     conversationError && conversationError.label && conversationError.label === BackendErrorLabel.TOO_MANY_MEMBERS;
-  const renderTemporaryGuestAccountCreation = !isAuthenticated || isTemporaryGuest || forceNewTemporaryGuestAccount;
 
   const submitJoinCodeWithPassword = async (password: string) => {
     await handleSubmit(undefined, password);
@@ -255,6 +238,9 @@ const ConversationJoinComponent = ({
   if (!isValidLink) {
     return <Navigate to={ROUTE.CONVERSATION_JOIN_INVALID} replace />;
   }
+  if (isFullConversation) {
+    return <ConversationJoinFull />;
+  }
 
   return (
     <UnsupportedBrowser isTemporaryGuest>
@@ -271,129 +257,46 @@ const ConversationJoinComponent = ({
         showCookiePolicyBanner={showCookiePolicyBanner}
         onCookiePolicyBannerClose={() => setShowCookiePolicyBanner(false)}
       >
-        {isEntropyRequired && showEntropyForm ? (
-          <EntropyContainer onSetEntropy={handleSubmit} />
-        ) : isFullConversation ? (
-          <ContainerXS style={{margin: 'auto 0'}}>
-            <H2 style={{fontWeight: 500, marginBottom: '10px', marginTop: '0'}} data-uie-name="status-full-headline">
-              <FormattedMessage {...conversationJoinStrings.fullConversationHeadline} />
-            </H2>
-            <Text style={{fontSize: '1rem', marginTop: '10px'}} data-uie-name="status-full-text">
-              {_(conversationJoinStrings.fullConversationSubhead)}
-            </Text>
-          </ContainerXS>
-        ) : renderTemporaryGuestAccountCreation ? (
-          <div>
-            <ContainerXS style={{margin: 'auto 0'}}>
-              <AppAlreadyOpen fullscreen={isPwaEnabled} />
-              <H2 style={{fontWeight: 500, marginBottom: '10px', marginTop: '0'}}>
-                <FormattedMessage
-                  {...conversationJoinStrings.headline}
-                  values={{
-                    brandName: Config.getConfig().BRAND_NAME,
-                  }}
+        <AppAlreadyOpen />
+        <div style={{display: 'flex', alignItems: 'center', flexDirection: 'column', marginBottom: '2rem'}}>
+          <H1 style={{fontWeight: 500, marginTop: '0', marginBottom: '1rem'}} data-uie-name="status-join-headline">
+            {_(conversationJoinStrings.mainHeadline)}
+          </H1>
+          {!isWirePublicInstance && (
+            <Muted data-uie-name="status-join-subhead">
+              {_(conversationJoinStrings.headline, {domain: window.location.hostname})}
+            </Muted>
+          )}
+        </div>
+        <Columns style={{display: 'flex', gap: '2rem', alignSelf: 'center', maxWidth: '100%'}}>
+          <Column>
+            {selfName ? (
+              <IsLoggedInColumn selfName={selfName} handleLogout={doLogout} handleSubmit={getConversationInfoAndJoin} />
+            ) : (
+              <Login embedded />
+            )}
+          </Column>
+          <Separator />
+          <Column>
+            <Page>
+              {isEntropyRequired && showEntropyForm ? (
+                <EntropyContainer onSetEntropy={handleSubmit} />
+              ) : (
+                <GuestLoginColumn
+                  enteredName={enteredName}
+                  nameInput={nameInput}
+                  onNameChange={onNameChange}
+                  checkNameValidity={checkNameValidity}
+                  handleSubmit={handleSubmit}
+                  isSubmitingName={isSubmitingName}
+                  isValidName={isValidName}
+                  conversationError={conversationError}
+                  error={error}
                 />
-              </H2>
-              <Text style={{fontSize: '1rem', marginTop: '10px'}}>
-                <FormattedMessage {...conversationJoinStrings.subhead} />
-              </Text>
-              <Form style={{marginTop: 30}}>
-                <InputBlock>
-                  <InputSubmitCombo>
-                    <Input
-                      id="enter-name"
-                      name="name"
-                      autoComplete="username"
-                      value={enteredName}
-                      ref={nameInput}
-                      onChange={onNameChange}
-                      placeholder={_(conversationJoinStrings.namePlaceholder)}
-                      maxLength={64}
-                      minLength={2}
-                      pattern=".{2,64}"
-                      required
-                      data-uie-name="enter-name"
-                    />
-                    <RoundIconButton
-                      disabled={!enteredName || !isValidName}
-                      type="submit"
-                      formNoValidate
-                      onClick={checkNameValidity}
-                      data-uie-name="do-next"
-                    >
-                      {isFetching ? <Loading /> : <ArrowIcon />}
-                    </RoundIconButton>
-                  </InputSubmitCombo>
-                </InputBlock>
-                {!isJoinGuestLinkPasswordModalOpen &&
-                  (error ? parseValidationErrors(error) : parseError(conversationError))}
-              </Form>
-              {!isPwaEnabled && (
-                <Small block>
-                  {`${_(conversationJoinStrings.hasAccount)} `}
-                  <RouterLink
-                    to={`${ROUTE.LOGIN}/${conversationKey}/${conversationCode}`}
-                    textTransform={'none'}
-                    data-uie-name="go-login"
-                  >
-                    {_(conversationJoinStrings.loginLink)}
-                  </RouterLink>
-                </Small>
               )}
-            </ContainerXS>
-          </div>
-        ) : (
-          <ContainerXS style={{margin: 'auto 0'}}>
-            <AppAlreadyOpen fullscreen={isPwaEnabled} />
-            <H2 style={{fontWeight: 500, marginBottom: '10px', marginTop: '0'}} data-uie-name="status-join-headline">
-              {selfName
-                ? _(conversationJoinStrings.existentAccountHeadline, {
-                    brandName: Config.getConfig().BRAND_NAME,
-                    name: StringUtil.capitalize(selfName),
-                  })
-                : _(conversationJoinStrings.headline, {brandName: Config.getConfig().BRAND_NAME})}
-            </H2>
-            <Text block style={{fontSize: '1rem', marginTop: '10px'}}>
-              {_(conversationJoinStrings.existentAccountSubhead)}
-            </Text>
-            <Button
-              type="button"
-              style={{marginTop: 16}}
-              onClick={async () => {
-                if (!conversationKey || !conversationCode) {
-                  return;
-                }
-                try {
-                  const conversationEvent = await doJoinConversationByCode(conversationKey, conversationCode);
-                  routeToApp(conversationEvent.conversation, conversationEvent.qualified_conversation?.domain ?? '');
-                } catch (error) {
-                  console.warn('Unable to join conversation with existing account', error);
-                  if (isBackendError(error)) {
-                    handleSubmitError(error);
-                  }
-                }
-              }}
-              data-uie-name="do-open"
-            >
-              {_(conversationJoinStrings.existentAccountOpenButton, {brandName: Config.getConfig().BRAND_NAME})}
-            </Button>
-            {!isJoinGuestLinkPasswordModalOpen &&
-              (error ? parseValidationErrors(error) : parseError(conversationError))}
-            <Small block>
-              {_(conversationJoinStrings.existentAccountJoinWithoutText, {
-                existentAccountJoinWithoutLink: (
-                  <Link
-                    onClick={() => setForceNewTemporaryGuestAccount(true)}
-                    textTransform={'none'}
-                    data-uie-name="go-join"
-                  >
-                    {_(conversationJoinStrings.existentAccountJoinWithoutLink)}
-                  </Link>
-                ),
-              })}
-            </Small>
-          </ContainerXS>
-        )}
+            </Page>
+          </Column>
+        </Columns>
       </WirelessContainer>
     </UnsupportedBrowser>
   );
@@ -403,10 +306,10 @@ type ConnectedProps = ReturnType<typeof mapStateToProps>;
 const mapStateToProps = (state: RootState) => ({
   isFetchingAuth: AuthSelector.isFetching(state),
   isAuthenticated: AuthSelector.isAuthenticated(state),
-  selfName: SelfSelector.getSelfName(state),
+  isFetchingConversation: ConversationSelector.isFetching(state),
   isTemporaryGuest: SelfSelector.isTemporaryGuest(state),
+  selfName: !SelfSelector.isTemporaryGuest(state) && SelfSelector.getSelfName(state),
   conversationError: ConversationSelector.getError(state),
-  isFetchingConversation: ConversationSelector.isFetching(state),
   conversationInfo: ConversationSelector.conversationInfo(state),
   conversationInfoFetching: ConversationSelector.conversationInfoFetching(state),
 });
diff --git a/src/script/auth/page/ConversationJoinComponents.tsx b/src/script/auth/page/ConversationJoinComponents.tsx
new file mode 100644
index 00000000000..70ae3e47c1d
--- /dev/null
+++ b/src/script/auth/page/ConversationJoinComponents.tsx
@@ -0,0 +1,209 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React from 'react';
+
+import {useIntl} from 'react-intl';
+
+import {
+  useMatchMedia,
+  QUERY,
+  Button,
+  Column,
+  Columns,
+  Container,
+  ContainerXS,
+  H2,
+  Link,
+  LinkVariant,
+  Muted,
+  Form,
+  Input,
+  InputBlock,
+  Loading,
+} from '@wireapp/react-ui-kit';
+
+import {conversationJoinStrings} from '../../strings';
+import {parseValidationErrors, parseError} from '../util/errorUtil';
+
+interface IsLoggedInColumnProps {
+  selfName: string;
+  handleSubmit: () => void;
+  handleLogout: () => void;
+}
+
+interface GuestLoginColumnProps {
+  handleSubmit: () => void;
+  enteredName: string;
+  onNameChange: (e: React.ChangeEvent<HTMLInputElement>) => void;
+  checkNameValidity: (event: React.FormEvent) => Promise<void>;
+  isValidName: boolean;
+  isSubmitingName: boolean;
+  nameInput: React.RefObject<HTMLInputElement>;
+  conversationError: (Error & {label?: string | undefined}) | null;
+  error: any;
+}
+
+const Separator = () => {
+  const isMobile = useMatchMedia(QUERY.mobile);
+  const Line = () => (
+    <div
+      style={{
+        flex: 1,
+        height: '1px',
+        backgroundColor: '#696c6e',
+        minWidth: '20rem',
+      }}
+    ></div>
+  );
+  return (
+    <div
+      style={{
+        display: 'flex',
+        alignItems: 'center',
+        maxWidth: `${!isMobile ? '4rem' : '100%'}`,
+        justifyContent: 'center',
+        transform: `rotate(${!isMobile ? '90' : '0'}deg)`,
+        marginLeft: `${!isMobile ? '' : '16px'}`,
+      }}
+    >
+      <Line />
+    </div>
+  );
+};
+
+const IsLoggedInColumn = ({handleLogout, handleSubmit, selfName}: IsLoggedInColumnProps) => {
+  const {formatMessage: _} = useIntl();
+  return (
+    <Container centerText verticalCenter style={{width: '100%', display: 'flex'}}>
+      <Columns style={{justifyContent: 'center'}}>
+        <Column style={{flexBasis: 384, flexGrow: 0, padding: 0}}>
+          <ContainerXS
+            centerText
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+              justifyContent: 'space-between',
+              alignItems: 'center',
+            }}
+          >
+            <>
+              <H2 center>{_(conversationJoinStrings.existentAccountJoinInBrowser)}</H2>
+              <Muted style={{marginBottom: '1rem'}}>
+                {_(conversationJoinStrings.existentAccountUserName, {selfName})}
+              </Muted>
+
+              <Button
+                block
+                type="submit"
+                formNoValidate
+                onClick={() => handleSubmit()}
+                aria-label={_(conversationJoinStrings.join)}
+                data-uie-name="do-join-as-member"
+              >
+                {_(conversationJoinStrings.join)}
+              </Button>
+              <Link
+                variant={LinkVariant.PRIMARY}
+                block
+                onClick={handleLogout}
+                textTransform={'none'}
+                style={{fontSize: '1rem'}}
+                data-uie-name="go-logout"
+              >
+                {_(conversationJoinStrings.joinWithOtherAccount)}
+              </Link>
+            </>
+          </ContainerXS>
+        </Column>
+      </Columns>
+    </Container>
+  );
+};
+
+const GuestLoginColumn = ({
+  enteredName,
+  nameInput,
+  onNameChange,
+  isSubmitingName,
+  isValidName,
+  checkNameValidity,
+  conversationError,
+  error,
+}: GuestLoginColumnProps) => {
+  const {formatMessage: _} = useIntl();
+
+  return (
+    <Container centerText verticalCenter style={{width: '100%'}}>
+      <Columns style={{justifyContent: 'center'}}>
+        <Column style={{flexBasis: 384, flexGrow: 0, padding: 0}}>
+          <ContainerXS
+            centerText
+            style={{
+              display: 'flex',
+              flexDirection: 'column',
+              justifyContent: 'space-between',
+            }}
+          >
+            <>
+              <H2 center>{_(conversationJoinStrings.noAccountHead)}</H2>
+              <Muted>{_(conversationJoinStrings.subhead)}</Muted>
+              <Form style={{marginTop: 30}}>
+                <InputBlock>
+                  <Input
+                    id="enter-name"
+                    name="name"
+                    autoComplete="username"
+                    value={enteredName}
+                    ref={nameInput}
+                    onChange={onNameChange}
+                    placeholder={_(conversationJoinStrings.namePlaceholder)}
+                    maxLength={64}
+                    minLength={2}
+                    pattern=".{2,64}"
+                    required
+                    data-uie-name="enter-name"
+                  />
+                </InputBlock>
+                {error ? parseValidationErrors(error) : parseError(conversationError)}
+                {isSubmitingName ? (
+                  <Loading size={32} />
+                ) : (
+                  <Button
+                    block
+                    type="submit"
+                    disabled={!enteredName || !isValidName || isSubmitingName}
+                    formNoValidate
+                    onClick={checkNameValidity}
+                    aria-label={_(conversationJoinStrings.joinButton)}
+                    data-uie-name="do-join-as-guest"
+                  >
+                    {_(conversationJoinStrings.joinButton)}
+                  </Button>
+                )}
+              </Form>
+            </>
+          </ContainerXS>
+        </Column>
+      </Columns>
+    </Container>
+  );
+};
+
+export {IsLoggedInColumn, Separator, GuestLoginColumn};
diff --git a/src/script/auth/page/ConversationJoinInvalid.tsx b/src/script/auth/page/ConversationJoinInvalid.tsx
index 5216264efc1..4faf8b2dc5c 100644
--- a/src/script/auth/page/ConversationJoinInvalid.tsx
+++ b/src/script/auth/page/ConversationJoinInvalid.tsx
@@ -53,4 +53,22 @@ const ConversationJoinInvalid = ({}: Props) => {
   );
 };
 
-export {ConversationJoinInvalid};
+const ConversationJoinFull = ({}: Props) => {
+  const {formatMessage: _} = useIntl();
+  return (
+    <UnsupportedBrowser isTemporaryGuest>
+      <WirelessContainer>
+        <ContainerXS style={{margin: 'auto 0'}}>
+          <H2 style={{fontWeight: 500, marginBottom: '10px', marginTop: '0'}} data-uie-name="status-full-headline">
+            <FormattedMessage {...conversationJoinStrings.fullConversationHeadline} />
+          </H2>
+          <Text style={{fontSize: '1rem', marginTop: '10px'}} data-uie-name="status-full-text">
+            {_(conversationJoinStrings.fullConversationSubhead)}
+          </Text>
+        </ContainerXS>
+      </WirelessContainer>
+    </UnsupportedBrowser>
+  );
+};
+
+export {ConversationJoinInvalid, ConversationJoinFull};
diff --git a/src/script/auth/page/Login.tsx b/src/script/auth/page/Login.tsx
index 563f5b89cb9..f20e593fe21 100644
--- a/src/script/auth/page/Login.tsx
+++ b/src/script/auth/page/Login.tsx
@@ -43,8 +43,8 @@ import {
   ContainerXS,
   FlexBox,
   Form,
-  H1,
   H2,
+  Heading,
   IsMobile,
   Label,
   Link,
@@ -76,8 +76,11 @@ import * as AuthSelector from '../module/selector/AuthSelector';
 import * as ConversationSelector from '../module/selector/ConversationSelector';
 import {QUERY_KEY, ROUTE} from '../route';
 import {parseError, parseValidationErrors} from '../util/errorUtil';
+import {getOAuthQueryString} from '../util/oauthUtil';
 
-type Props = React.HTMLProps<HTMLDivElement>;
+type Props = React.HTMLProps<HTMLDivElement> & {
+  embedded?: boolean;
+};
 
 const LoginComponent = ({
   authError,
@@ -99,6 +102,7 @@ const LoginComponent = ({
   isSendingTwoFactorCode,
   conversationInfo,
   conversationInfoFetching,
+  embedded,
 }: Props & ConnectedProps & DispatchProps) => {
   const logger = getLogger('Login');
   const {formatMessage: _} = useIntl();
@@ -118,7 +122,7 @@ const LoginComponent = ({
   const [verificationCode, setVerificationCode] = useState('');
   const [twoFactorSubmitFailedOnce, setTwoFactorSubmitFailedOnce] = useState(false);
 
-  const isOauth = UrlUtil.hasURLParameter(QUERY_KEY.SCOPE);
+  const isOauth = UrlUtil.hasURLParameter(QUERY_KEY.SCOPE, window.location.hash);
 
   const [showEntropyForm, setShowEntropyForm] = useState(false);
   const isEntropyRequired = Config.getConfig().FEATURE.ENABLE_EXTRA_CLIENT_ENTROPY;
@@ -201,7 +205,8 @@ const LoginComponent = ({
       await doInitializeClient(ClientType.PERMANENT, undefined, undefined, entropyData);
 
       if (isOauth) {
-        return navigate(ROUTE.AUTHORIZE);
+        const queryString = getOAuthQueryString(window.location);
+        return navigate(`${ROUTE.AUTHORIZE}/${queryString}`);
       }
       return navigate(ROUTE.HISTORY_INFO);
     } catch (error) {
@@ -248,7 +253,9 @@ const LoginComponent = ({
       }
 
       if (isOauth) {
-        return navigate(ROUTE.AUTHORIZE);
+        const queryString = getOAuthQueryString(window.location);
+
+        return navigate(`${ROUTE.AUTHORIZE}/${queryString}`);
       }
       return navigate(ROUTE.HISTORY_INFO);
     } catch (error) {
@@ -321,7 +328,7 @@ const LoginComponent = ({
     setTwoFactorSubmitError('');
     // Do not auto submit if already failed once
     if (!twoFactorSubmitFailedOnce) {
-      handleSubmit({...twoFactorLoginData, verificationCode: code}, []);
+      void handleSubmit({...twoFactorLoginData, verificationCode: code}, []);
     }
   };
 
@@ -344,19 +351,20 @@ const LoginComponent = ({
 
   return (
     <Page>
-      {(Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY ||
-        Config.getConfig().FEATURE.ENABLE_SSO ||
-        Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION) && (
-        <IsMobile>
-          <div style={{margin: 16}}>{backArrow}</div>
-        </IsMobile>
-      )}
+      {!embedded &&
+        (Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY ||
+          Config.getConfig().FEATURE.ENABLE_SSO ||
+          Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION) && (
+          <IsMobile>
+            <div style={{margin: 16}}>{backArrow}</div>
+          </IsMobile>
+        )}
       {isEntropyRequired && showEntropyForm ? (
         <EntropyContainer onSetEntropy={storeEntropy} />
       ) : (
         <Container centerText verticalCenter style={{width: '100%'}}>
           {!isValidLink && <Navigate to={ROUTE.CONVERSATION_JOIN_INVALID} replace />}
-          <AppAlreadyOpen />
+          {!embedded && <AppAlreadyOpen />}
           {isLinkPasswordModalOpen && (
             <JoinGuestLinkPasswordModal
               onClose={() => setIsLinkPasswordModalOpen(false)}
@@ -367,19 +375,21 @@ const LoginComponent = ({
             />
           )}
           <Columns>
-            <IsMobile not>
-              <Column style={{display: 'flex'}}>
-                {(Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY ||
-                  Config.getConfig().FEATURE.ENABLE_SSO ||
-                  Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION) && (
-                  <div style={{margin: 'auto'}}>{backArrow}</div>
-                )}
-              </Column>
-            </IsMobile>
+            {!embedded && (
+              <IsMobile not>
+                <Column style={{display: 'flex'}}>
+                  {(Config.getConfig().FEATURE.ENABLE_DOMAIN_DISCOVERY ||
+                    Config.getConfig().FEATURE.ENABLE_SSO ||
+                    Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION) && (
+                    <div style={{margin: 'auto'}}>{backArrow}</div>
+                  )}
+                </Column>
+              </IsMobile>
+            )}
             <Column style={{flexBasis: 384, flexGrow: 0, padding: 0}}>
               <ContainerXS
                 centerText
-                style={{display: 'flex', flexDirection: 'column', height: 428, justifyContent: 'space-between'}}
+                style={{display: 'flex', flexDirection: 'column', justifyContent: 'space-between'}}
               >
                 {twoFactorLoginData ? (
                   <div>
@@ -421,7 +431,9 @@ const LoginComponent = ({
                 ) : (
                   <>
                     <div>
-                      <H1 center>{_(loginStrings.headline)}</H1>
+                      <Heading level={embedded ? '2' : '1'} center>
+                        {_(loginStrings.headline)}
+                      </Heading>
                       <Muted>{_(loginStrings.subhead)}</Muted>
                       <Form style={{marginTop: 30}} data-uie-name="login">
                         <LoginForm isFetching={isFetching} onSubmit={handleSubmit} />
@@ -435,7 +447,7 @@ const LoginComponent = ({
                         {!Runtime.isDesktopApp() && (
                           <Checkbox
                             onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                              pushLoginData({
+                              void pushLoginData({
                                 clientType: event.target.checked ? ClientType.TEMPORARY : ClientType.PERMANENT,
                               });
                             }}
@@ -460,7 +472,7 @@ const LoginComponent = ({
                     >
                       {_(loginStrings.forgotPassword)}
                     </Link>
-                    {Config.getConfig().FEATURE.ENABLE_PHONE_LOGIN && (
+                    {!embedded && Config.getConfig().FEATURE.ENABLE_PHONE_LOGIN && (
                       <RouterLink
                         variant={LinkVariant.PRIMARY}
                         style={{paddingTop: '12px', textAlign: 'center'}}
@@ -474,7 +486,7 @@ const LoginComponent = ({
                 )}
               </ContainerXS>
             </Column>
-            <Column />
+            {!embedded && <Column />}
           </Columns>
         </Container>
       )}
diff --git a/src/script/auth/page/OAuthPermissions.tsx b/src/script/auth/page/OAuthPermissions.tsx
index 996849560f3..b2c7b3a5bfc 100644
--- a/src/script/auth/page/OAuthPermissions.tsx
+++ b/src/script/auth/page/OAuthPermissions.tsx
@@ -36,6 +36,8 @@ import {
   LinkVariant,
   COLOR_V2,
   H2,
+  QUERY,
+  useMatchMedia,
 } from '@wireapp/react-ui-kit';
 
 import {Icon} from 'Components/Icon';
@@ -51,6 +53,9 @@ import {
   containerCSS,
   headerCSS,
   listCSS,
+  mobileButtonsCSS,
+  mobileButtonCSS,
+  mobileTextCSS,
   teamImageCSS,
   textCSS,
 } from './OauthPermissions.styles';
@@ -86,6 +91,7 @@ const OAuthPermissionsComponent = ({
 }: Props & ConnectedProps & DispatchProps) => {
   const {formatMessage: _} = useIntl();
   const [teamImage, setTeamImage] = React.useState<string | ArrayBuffer | undefined>(undefined);
+  const isMobile = useMatchMedia(QUERY.mobile);
 
   const [oAuthApp, setOAuthApp] = useState<OAuthClient | null>(null);
   const oauthParams = oAuthParams(window.location);
@@ -118,7 +124,11 @@ const OAuthPermissionsComponent = ({
           setTeamImage(teamImageBlob && (await loadDataUrl(teamImageBlob)));
         }
       }
-      setOAuthApp(!!oauthParams.client_id ? await getOAuthApp(oauthParams.client_id) : null);
+      if (oauthParams.client_id) {
+        setOAuthApp(!!oauthParams.client_id ? await getOAuthApp(oauthParams.client_id) : null);
+      } else {
+        throw Error('OAuth client not found');
+      }
     };
     getUserData().catch(error => {
       console.error(error);
@@ -183,7 +193,7 @@ const OAuthPermissionsComponent = ({
                           target="_blank"
                           rel="noopener noreferrer"
                           data-uie-name="go-learn-more"
-                          href="https://support.wire.com/hc/en-us/articles/9628065287965-Calendar-integration"
+                          href={Config.getConfig().URL.SUPPORT.OAUTH_LEARN_MORE}
                         >
                           {chunks}
                         </a>
@@ -193,13 +203,13 @@ const OAuthPermissionsComponent = ({
                 </Text>
               </Box>
             )}
-            <Text muted css={textCSS} data-uie-name="oauth-details">
+            <Text muted css={isMobile ? mobileTextCSS : textCSS} data-uie-name="oauth-details">
               {_(oauthStrings.details)}
             </Text>
-            <div css={buttonsCSS}>
+            <div css={isMobile ? mobileButtonsCSS : buttonsCSS}>
               <Button
                 variant={ButtonVariant.SECONDARY}
-                css={buttonCSS}
+                css={isMobile ? mobileButtonCSS : buttonCSS}
                 type="button"
                 onClick={onCancel}
                 data-uie-name="do-oauth-cancel"
@@ -212,7 +222,7 @@ const OAuthPermissionsComponent = ({
                 {_(oauthStrings.cancel)}
               </Button>
               <Button
-                css={buttonCSS}
+                css={isMobile ? mobileButtonCSS : buttonCSS}
                 type="button"
                 onClick={onContinue}
                 data-uie-name="do-oauth-allow"
diff --git a/src/script/auth/page/OauthPermissions.styles.ts b/src/script/auth/page/OauthPermissions.styles.ts
index 54b75fb9e50..ff17c8ee1d9 100644
--- a/src/script/auth/page/OauthPermissions.styles.ts
+++ b/src/script/auth/page/OauthPermissions.styles.ts
@@ -51,6 +51,13 @@ export const boxCSS: CSSObject = {
 };
 
 export const textCSS: CSSObject = {fontSize: '12px', lineHeight: '16px', display: 'block'};
+export const mobileTextCSS: CSSObject = {
+  fontSize: '12px',
+  lineHeight: '16px',
+  display: 'block',
+  marginLeft: '30px',
+  marginRight: '30px',
+};
 
 export const buttonsCSS: CSSObject = {
   display: 'flex',
@@ -60,7 +67,16 @@ export const buttonsCSS: CSSObject = {
   gap: '16px',
 };
 
+export const mobileButtonsCSS: CSSObject = {
+  display: 'flex',
+  flexDirection: 'column',
+  alignItems: 'center',
+  marginTop: '20px',
+  gap: '16px',
+};
+
 export const buttonCSS: CSSObject = {margin: 'auto', width: 200};
+export const mobileButtonCSS: CSSObject = {margin: 'auto', width: 300, height: 60};
 
 export const listCSS: CSSObject = {
   marginTop: 0,
diff --git a/src/script/auth/page/Root.tsx b/src/script/auth/page/Root.tsx
index 54082626c19..9d5dce05909 100644
--- a/src/script/auth/page/Root.tsx
+++ b/src/script/auth/page/Root.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, useEffect} from 'react';
+import {FC, ReactNode, useEffect} from 'react';
 
 import {pathWithParams} from '@wireapp/commons/lib/util/UrlUtil';
 import {IntlProvider} from 'react-intl';
@@ -60,10 +60,11 @@ import {bindActionCreators, RootState} from '../module/reducer';
 import * as AuthSelector from '../module/selector/AuthSelector';
 import * as LanguageSelector from '../module/selector/LanguageSelector';
 import {ROUTE} from '../route';
+import {getOAuthQueryString} from '../util/oauthUtil';
 
 interface RootProps {}
 
-const Title: FC<{title: string; children: React.ReactNode}> = ({title, children}) => {
+const Title: FC<{title: string; children: ReactNode}> = ({title, children}) => {
   useEffect(() => {
     document.title = title;
   }, [title]);
@@ -106,8 +107,20 @@ const RootComponent: FC<RootProps & ConnectedProps & DispatchProps> = ({
     return null;
   };
 
-  const isAuthenticatedCheck = (page: any): any => (page ? (isAuthenticated ? page : navigate('/auth')) : null);
-  const isOAuthCheck = (page: any): any => (page ? isAuthenticated ? page : <Navigate to={ROUTE.LOGIN} /> : null);
+  const isAuthenticatedCheck = (page: ReactNode): ReactNode =>
+    page ? (isAuthenticated ? page : navigate('/auth')) : null;
+
+  const isOAuthCheck = (page: ReactNode): ReactNode => {
+    if (page) {
+      if (isAuthenticated) {
+        return page;
+      }
+
+      const queryString = getOAuthQueryString(window.location);
+      return queryString ? <Navigate to={`${ROUTE.LOGIN}/${queryString}`} /> : <Navigate to={ROUTE.LOGIN} />;
+    }
+    return null;
+  };
 
   const ProtectedHistoryInfo = () => isAuthenticatedCheck(<HistoryInfo />);
   const ProtectedInitialInvite = () => isAuthenticatedCheck(<InitialInvite />);
@@ -118,6 +131,13 @@ const RootComponent: FC<RootProps & ConnectedProps & DispatchProps> = ({
   const ProtectedSetPassword = () => isAuthenticatedCheck(<SetPassword />);
   const ProtectedOAuthPermissions = () => isOAuthCheck(<OAuthPermissions />);
 
+  // Send user back to index page after e2ei oauth redirect
+  // This is needed because the oauth redirect is only done by logged in users
+  // and the user would otherwise be stuck on login page without getting logged in
+  if (window.location.hash.includes(ROUTE.E2EI_OAUTH_REDIRECT)) {
+    navigate(ROUTE.INDEX);
+  }
+
   const brandName = Config.getConfig().BRAND_NAME;
   return (
     <IntlProvider locale={normalizeLanguage(language)} messages={loadLanguage(language)}>
@@ -165,7 +185,14 @@ const RootComponent: FC<RootProps & ConnectedProps & DispatchProps> = ({
                 }
               />
               <Route path={ROUTE.SET_EMAIL} element={<ProtectedSetEmail />} />
-              <Route path={ROUTE.SET_HANDLE} element={<ProtectedSetHandle />} />
+              <Route
+                path={ROUTE.SET_HANDLE}
+                element={
+                  <Title title={`${t('authSetUsername')} . ${brandName}`}>
+                    <ProtectedSetHandle />
+                  </Title>
+                }
+              />
               <Route
                 path={ROUTE.SET_PASSWORD}
                 element={
diff --git a/src/script/auth/route.ts b/src/script/auth/route.ts
index dbcc41b724c..b38d4129a4c 100644
--- a/src/script/auth/route.ts
+++ b/src/script/auth/route.ts
@@ -31,19 +31,35 @@ export const QUERY_KEY = {
   LOCALE: 'hl',
   LOGOUT_REASON: 'reason',
   PERSIST_TEMPORARY_CLIENTS: 'persist_temporary_clients',
-  PWA_AWARE: 'pwa_aware',
   SSO_AUTO_LOGIN: 'sso_auto_login',
   SCOPE: 'scope',
   TRACKING: 'tracking',
   TWO_FACTOR: '2fa',
 };
 
+// These are the query keys that are in the redirect link from the OAuth server
+export const OAUTH_QUERY_KEYS = {
+  CLIENT_ID: 'client_id',
+  REDIRECT_URI: 'redirect_uri',
+  RESPONSE_TYPE: 'response_type',
+  SCOPE: 'scope',
+  STATE: 'state',
+  CODE_CHALLENGE: 'code_challenge',
+  CODE_CHALLENGE_METHOD: 'code_challenge_method',
+  RESPONSE_MODE: 'response_mode',
+  CODE: 'code',
+  AUTH_USER: 'authuser',
+  PROMPT: 'prompt',
+  HD: 'hd',
+};
+
 export const FORWARDED_QUERY_KEYS = [
   QUERY_KEY.ACCOUNT_ID,
   QUERY_KEY.ENVIRONMENT,
   QUERY_KEY.LOCALE,
   QUERY_KEY.PERSIST_TEMPORARY_CLIENTS,
   QUERY_KEY.TRACKING,
+  ...Object.values(OAUTH_QUERY_KEYS),
 ];
 
 export const LOGOUT_REASON = {
@@ -77,4 +93,5 @@ export const ROUTE = {
   VERIFY_EMAIL_CODE: '/verifyemailcode',
   VERIFY_EMAIL_LINK: '/verifyemaillink',
   VERIFY_PHONE_CODE: '/verifyphonecode',
+  E2EI_OAUTH_REDIRECT: '/e2ei-redirect',
 };
diff --git a/src/script/auth/supportedLocales.ts b/src/script/auth/supportedLocales.ts
index 205d1e35d96..76f0ca4bc82 100644
--- a/src/script/auth/supportedLocales.ts
+++ b/src/script/auth/supportedLocales.ts
@@ -18,6 +18,7 @@
  */
 
 export const supportedLocales: string[] = [
+  'ar-SA',
   'cs-CZ',
   'da-DK',
   'de-DE',
@@ -25,19 +26,31 @@ export const supportedLocales: string[] = [
   'en-US',
   'es-ES',
   'et-EE',
+  'fa-IR',
   'fi-FI',
   'fr-FR',
+  'hi-IN',
   'hr-HR',
   'hu-HU',
+  'id-ID',
   'it-IT',
+  'ja-JP',
   'lt-LT',
+  'lv-LV',
   'nl-NL',
+  'no-NO',
   'pl-PL',
   'pt-PT',
+  'pt-BR',
   'ro-RO',
   'ru-RU',
+  'si-LK',
   'sk-SK',
   'sl-SI',
+  'sr-SP',
+  'sv-SE',
   'tr-TR',
   'uk-UA',
+  'zh-CN',
+  'zh-TW',
 ];
diff --git a/src/script/auth/util/handleUtil.ts b/src/script/auth/util/handleUtil.ts
index 28f7f5a7865..0d9eac19d8b 100644
--- a/src/script/auth/util/handleUtil.ts
+++ b/src/script/auth/util/handleUtil.ts
@@ -62,23 +62,20 @@ function getRandomWordCombination(): string {
   return `${randomArrayElement(RANDOM_WORDS_1)}${randomArrayElement(RANDOM_WORDS_2)}`;
 }
 
-export function generateHandleVariations(
-  handle: string,
-  numberOfVariations: number = DEFAULT_NUMBER_VARIATIONS,
-): string[] {
+function generateHandleVariations(handle: string, numberOfVariations: number = DEFAULT_NUMBER_VARIATIONS): string[] {
   return Array.from(Array(numberOfVariations), (_, index) => {
     const digitCount = index + 1;
     return appendRandomDigits(handle.slice(0, MAX_HANDLE_LENGTH - digitCount), digitCount);
   });
 }
 
-export function appendRandomDigits(handle: string, additionalNumbers: number): string {
+function appendRandomDigits(handle: string, additionalNumbers: number): string {
   const MAX_RANDOM_INT = 9;
   const randomDigits = Array.from(Array(additionalNumbers), () => randomInt(MAX_RANDOM_INT));
   return `${handle}${randomDigits.join('')}`;
 }
 
-export function normalizeName(name: string): string {
+function normalizeName(name: string): string {
   return getSlug(name)
     .toLowerCase()
     .replace(/[^a-z0-9_]/g, '')
diff --git a/src/script/auth/util/oauthUtil.ts b/src/script/auth/util/oauthUtil.ts
index e6ab590e69b..e44bb49cf7d 100644
--- a/src/script/auth/util/oauthUtil.ts
+++ b/src/script/auth/util/oauthUtil.ts
@@ -27,10 +27,17 @@ import {Scope} from '../page/OAuthPermissions';
  * @returns OAuthBody
  */
 export const oAuthParams = (location: Location) => {
-  const params = new URLSearchParams(location.search);
+  const queryString = getOAuthQueryString(location);
+  const params = new URLSearchParams(queryString ?? location.hash);
   return Object.fromEntries(params) as unknown as OAuthBody;
 };
 
+export const getOAuthQueryString = (location: Location) => {
+  const hash = location.hash;
+  const queryParamIndex = hash.indexOf('?');
+  return hash.substring(queryParamIndex);
+};
+
 /**
  * Takes the oauth body and returns the scopes as an array of Scopes accepted by the app.
  * @param oauthBody oauth body object
diff --git a/src/script/auth/util/test/TestUtil.tsx b/src/script/auth/util/test/TestUtil.tsx
index 9a2481c3f9e..c392d9831c0 100644
--- a/src/script/auth/util/test/TestUtil.tsx
+++ b/src/script/auth/util/test/TestUtil.tsx
@@ -37,17 +37,17 @@ import {createUuid} from 'Util/uuid';
 
 import {Api, RootState} from '../../module/reducer';
 
-export const withStore = (
+const withStore = (
   children: React.ReactNode,
   store: MockStoreEnhanced<RecursivePartial<RootState>, ThunkDispatch<RootState, Api, AnyAction>>,
 ) => <Provider store={store}>{children}</Provider>;
 
+const withRouter = (component: React.ReactNode) => <Router>{component}</Router>;
+
 export const withIntl = (component: React.ReactNode) => <IntlProvider locale="en">{component}</IntlProvider>;
 
 export const withTheme = (component: React.ReactNode) => <StyledApp themeId={THEME_ID.DEFAULT}>{component}</StyledApp>;
 
-export const withRouter = (component: React.ReactNode) => <Router>{component}</Router>;
-
 const wrapComponent = (
   component: React.ReactNode,
   store: MockStoreEnhanced<RecursivePartial<RootState>, ThunkDispatch<RootState, Api, AnyAction>>,
diff --git a/src/script/backup/BackUpHeader.ts b/src/script/backup/BackUpHeader.ts
new file mode 100644
index 00000000000..4ba47e51472
--- /dev/null
+++ b/src/script/backup/BackUpHeader.ts
@@ -0,0 +1,216 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import sodium from 'libsodium-wrappers';
+
+export interface DecodedHeader {
+  format: string;
+  version: string;
+  salt: Uint8Array;
+  hashedUserId: Uint8Array;
+  opslimit: number;
+  memlimit: number;
+}
+
+export const ENCRYPTED_BACKUP_FORMAT = 'WBUX';
+export const ENCRYPTED_BACKUP_VERSION = '03';
+export const ERROR_TYPES = {
+  INVALID_USER_ID: 'INVALID_USER_ID',
+  INVALID_VERSION: 'INVALID_VERSION',
+  INVALID_FORMAT: 'INVALID_FORMAT',
+};
+
+export class BackUpHeader {
+  private readonly userId: string;
+  private readonly password: string;
+
+  // Defined by given specs on: https://wearezeta.atlassian.net/wiki/spaces/ENGINEERIN/pages/59867179/Exporting+history+v2
+  private readonly format = ENCRYPTED_BACKUP_FORMAT;
+  private readonly version = ENCRYPTED_BACKUP_VERSION;
+  private readonly MEMLIMIT_INTERACTIVE_VALUE = 33554432;
+  private readonly OPSLIMIT_INTERACTIVE_VALUE = 4;
+  private readonly PWD_HASH_OUTPUT_BYTES = 32;
+  private readonly UNSIGNED_INT_LENGTH = 4;
+  private readonly BACKUP_HEADER_EXTRA_GAP_LENGTH = 1;
+  private readonly BACKUP_HEADER_FORMAT_LENGTH = 4;
+  private readonly BACKUP_HEADER_VERSION_LENGTH = 2;
+
+  constructor(userId: string, password: string) {
+    this.userId = userId;
+    this.password = password;
+  }
+
+  async encodeHeader() {
+    await sodium.ready;
+    const {
+      BACKUP_HEADER_FORMAT_LENGTH,
+      BACKUP_HEADER_EXTRA_GAP_LENGTH,
+      BACKUP_HEADER_VERSION_LENGTH,
+      PWD_HASH_OUTPUT_BYTES,
+      UNSIGNED_INT_LENGTH,
+    } = this;
+
+    const salt = sodium.randombytes_buf(sodium.crypto_pwhash_SALTBYTES);
+    const hashedUserId = this.hashUserId(
+      this.userId,
+      salt,
+      this.OPSLIMIT_INTERACTIVE_VALUE,
+      this.MEMLIMIT_INTERACTIVE_VALUE,
+    );
+    const formatBytes = sodium.from_string(this.format);
+    const versionBytes = sodium.from_string(this.version);
+    const nonReadableByte = new Uint8Array([0x00]);
+    const opslimitBytes = new Uint8Array(UNSIGNED_INT_LENGTH);
+    const memlimitBytes = new Uint8Array(UNSIGNED_INT_LENGTH);
+
+    // Set opslimitBytes and memlimitBytes using DataView
+    new DataView(opslimitBytes.buffer).setUint32(0, this.OPSLIMIT_INTERACTIVE_VALUE, false);
+    new DataView(memlimitBytes.buffer).setUint32(0, this.MEMLIMIT_INTERACTIVE_VALUE, false);
+
+    const headerData = new Uint8Array(
+      BACKUP_HEADER_FORMAT_LENGTH +
+        BACKUP_HEADER_EXTRA_GAP_LENGTH +
+        BACKUP_HEADER_VERSION_LENGTH +
+        sodium.crypto_pwhash_SALTBYTES +
+        PWD_HASH_OUTPUT_BYTES +
+        2 * UNSIGNED_INT_LENGTH,
+    );
+    let offset = 0;
+    offset = this.copyBytes(headerData, formatBytes, offset);
+    offset = this.copyBytes(headerData, nonReadableByte, offset);
+    offset = this.copyBytes(headerData, versionBytes, offset);
+    offset = this.copyBytes(headerData, salt, offset);
+    offset = this.copyBytes(headerData, hashedUserId, offset);
+    offset = this.copyBytes(headerData, opslimitBytes, offset);
+    this.copyBytes(headerData, memlimitBytes, offset);
+
+    return headerData;
+  }
+
+  copyBytes(destination: Uint8Array, source: Uint8Array, offset: number): number {
+    destination.set(source, offset);
+    const nextPos = offset + source.length;
+    return nextPos;
+  }
+
+  async decodeHeader(
+    encryptedDataSource: Uint8Array,
+  ): Promise<{decodingError: string | null; decodedHeader: DecodedHeader; headerSize: number}> {
+    const dataSrc = new Uint8Array(encryptedDataSource);
+    const {decodedHeader, headerSize} = this.readBackupHeader(dataSrc);
+
+    await sodium.ready;
+    // Sanity checks
+    const expectedHashedUserId = this.hashUserId(
+      this.userId,
+      decodedHeader.salt,
+      decodedHeader.opslimit,
+      decodedHeader.memlimit,
+    );
+    const storedHashedUserId = decodedHeader.hashedUserId;
+    const decodingError = this.handleHeaderDecodingErrors(decodedHeader, expectedHashedUserId, storedHashedUserId);
+
+    return {decodingError, decodedHeader, headerSize};
+  }
+
+  handleHeaderDecodingErrors(
+    decodedHeader: DecodedHeader,
+    expectedHashedUserId: Uint8Array,
+    storedHashedUserId: Uint8Array,
+  ) {
+    const {format, version} = decodedHeader;
+    if (!sodium.memcmp(expectedHashedUserId, storedHashedUserId)) {
+      return ERROR_TYPES.INVALID_USER_ID;
+    } else if (format !== this.format) {
+      return ERROR_TYPES.INVALID_FORMAT;
+    } else if (parseInt(version) < parseInt(this.version)) {
+      return ERROR_TYPES.INVALID_VERSION;
+    }
+    return null;
+  }
+
+  async generateChaCha20Key(header: DecodedHeader) {
+    await sodium.ready;
+
+    return sodium.crypto_pwhash(
+      this.PWD_HASH_OUTPUT_BYTES,
+      this.password,
+      header.salt,
+      header.opslimit,
+      header.memlimit,
+      sodium.crypto_pwhash_ALG_DEFAULT,
+    );
+  }
+
+  hashUserId(userId: string, salt: Uint8Array, opslimit: number, memlimit: number): Uint8Array {
+    return sodium.crypto_pwhash(
+      this.PWD_HASH_OUTPUT_BYTES,
+      userId.toString(),
+      salt,
+      opslimit,
+      memlimit,
+      sodium.crypto_pwhash_ALG_DEFAULT,
+    );
+  }
+
+  readBackupHeader(data: Uint8Array): {decodedHeader: DecodedHeader; headerSize: number} {
+    const {
+      BACKUP_HEADER_FORMAT_LENGTH,
+      BACKUP_HEADER_EXTRA_GAP_LENGTH,
+      BACKUP_HEADER_VERSION_LENGTH,
+      PWD_HASH_OUTPUT_BYTES,
+      UNSIGNED_INT_LENGTH,
+    } = this;
+
+    const formatBytes = data.slice(0, BACKUP_HEADER_FORMAT_LENGTH);
+    const format = new TextDecoder().decode(formatBytes);
+
+    const versionOffset = BACKUP_HEADER_FORMAT_LENGTH + BACKUP_HEADER_EXTRA_GAP_LENGTH;
+    const versionLength = BACKUP_HEADER_VERSION_LENGTH;
+    const versionBytes = data.slice(versionOffset, versionOffset + versionLength);
+    const version = new TextDecoder().decode(versionBytes);
+
+    const saltOffset = versionOffset + versionLength;
+    const saltLength = sodium.crypto_pwhash_SALTBYTES;
+    const salt = data.slice(saltOffset, saltOffset + saltLength);
+
+    const hashedUserIdOffset = saltOffset + saltLength;
+    const hashedUserIdLength = PWD_HASH_OUTPUT_BYTES;
+    const hashedUserId = data.slice(hashedUserIdOffset, hashedUserIdOffset + hashedUserIdLength);
+
+    const opslimitOffset = hashedUserIdOffset + hashedUserIdLength;
+    const opslimit = new DataView(data.buffer).getUint32(opslimitOffset, false);
+
+    const memlimitOffset = opslimitOffset + UNSIGNED_INT_LENGTH;
+    const memlimit = new DataView(data.buffer).getUint32(memlimitOffset, false);
+
+    const headerSize = memlimitOffset + UNSIGNED_INT_LENGTH;
+
+    const decodedHeader = {
+      format,
+      version,
+      salt,
+      hashedUserId,
+      opslimit,
+      memlimit,
+    };
+
+    return {decodedHeader, headerSize};
+  }
+}
diff --git a/src/script/backup/BackupHeader.test.tsx b/src/script/backup/BackupHeader.test.tsx
new file mode 100644
index 00000000000..f9ed3fa96aa
--- /dev/null
+++ b/src/script/backup/BackupHeader.test.tsx
@@ -0,0 +1,54 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {BackUpHeader, ENCRYPTED_BACKUP_FORMAT, ENCRYPTED_BACKUP_VERSION} from './BackUpHeader';
+
+describe('BackUpHeader', () => {
+  let backUpHeader: BackUpHeader;
+
+  beforeEach(() => {
+    // Initialize the BackUpHeader instance before each test
+    backUpHeader = new BackUpHeader('userId', 'password');
+  });
+
+  test('encodeHeader returns the expected header data', async () => {
+    const headerData = await backUpHeader.encodeHeader();
+
+    // Assert the expected properties of the headerData
+    expect(headerData).toHaveLength(63);
+  });
+
+  test('decodeHeader returns the expected decoded header', async () => {
+    // Create encoded header data
+    const encodedHeaderData = await backUpHeader.encodeHeader();
+
+    const {decodedHeader, headerSize} = await backUpHeader.decodeHeader(encodedHeaderData);
+
+    // Assert the expected properties of the decoded header
+    expect(decodedHeader.format).toBe(ENCRYPTED_BACKUP_FORMAT);
+    expect(decodedHeader.version).toBe(ENCRYPTED_BACKUP_VERSION);
+    expect(decodedHeader.salt).toBeInstanceOf(Uint8Array);
+    expect(decodedHeader.hashedUserId).toBeInstanceOf(Uint8Array);
+    expect(decodedHeader.opslimit).toBe(4);
+    expect(decodedHeader.memlimit).toBe(33554432);
+
+    // Assert the headerSize value
+    expect(headerSize).toBe(encodedHeaderData.length);
+  });
+});
diff --git a/src/script/backup/BackupRepository.test.ts b/src/script/backup/BackupRepository.test.ts
index 21ae6e2f7e2..78b4cd053bb 100644
--- a/src/script/backup/BackupRepository.test.ts
+++ b/src/script/backup/BackupRepository.test.ts
@@ -25,6 +25,7 @@ import {noop} from 'Util/util';
 import {createUuid} from 'Util/uuid';
 import {WebWorker} from 'Util/worker';
 
+import {BackUpHeader, DecodedHeader, ENCRYPTED_BACKUP_FORMAT, ENCRYPTED_BACKUP_VERSION} from './BackUpHeader';
 import {BackupRepository, Filename} from './BackupRepository';
 import {BackupService} from './BackupService';
 import {CancelError, DifferentAccountError, IncompatibleBackupError, IncompatiblePlatformError} from './Error';
@@ -122,6 +123,7 @@ describe('BackupRepository', () => {
 
     it('ignores verification events in the backup', async () => {
       const user = new User('user1');
+      const password = '';
       const [backupRepository, {storageService, backupService}] = await buildBackupRepository();
       const verificationEvent = {
         conversation: conversationId,
@@ -135,7 +137,7 @@ describe('BackupRepository', () => {
 
       await storageService.save(StorageSchemata.OBJECT_STORE.EVENTS, undefined, verificationEvent);
       await storageService.save(StorageSchemata.OBJECT_STORE.EVENTS, undefined, textEvent);
-      const blob = await backupRepository.generateHistory(user, 'client1', noop);
+      const blob = await backupRepository.generateHistory(user, 'client1', noop, password);
 
       await backupRepository.importHistory(new User('user1'), blob, noop, noop);
 
@@ -147,12 +149,13 @@ describe('BackupRepository', () => {
 
     it('cancels export', async () => {
       const [backupRepository, {storageService}] = await buildBackupRepository();
+      const password = '';
       await Promise.all([
         ...messages.map(message => storageService.save(eventStoreName, undefined, message)),
         storageService.save('conversations', conversationId, conversation),
       ]);
 
-      const exportPromise = backupRepository.generateHistory(new User(), 'client1', noop);
+      const exportPromise = backupRepository.generateHistory(new User(), 'client1', noop, password);
       backupRepository.cancelAction();
 
       await expect(exportPromise).rejects.toThrow(jasmine.any(CancelError));
@@ -224,4 +227,76 @@ describe('BackupRepository', () => {
       });
     });
   });
+
+  describe('Backup encrytion', () => {
+    test('compressHistoryFiles calls the encryption function if password is provided', async () => {
+      // Mocked values
+      const password = 'Password';
+      const clientId = 'ClientId';
+      const user = new User('user1');
+      const mockHashedUserId = new Uint8Array(32);
+      const mockEncodeHeader = jest.fn().mockResolvedValue(new Uint8Array(63));
+      const mockGenerateChaCha20Key = jest.fn().mockImplementation((header: DecodedHeader) => new Uint8Array(32));
+      const mockSalt = new Uint8Array(16);
+      const mockReadBackupHeader = jest.fn().mockReturnValue({
+        decodedHeader: {
+          format: ENCRYPTED_BACKUP_FORMAT,
+          version: ENCRYPTED_BACKUP_VERSION,
+          salt: mockSalt,
+          hashedUserId: mockHashedUserId,
+          opslimit: 4,
+          memlimit: 33554432,
+        },
+        headerSize: 63,
+      });
+
+      // Mock the behavior of BackUpHeader methods
+      jest.spyOn(BackUpHeader.prototype, 'encodeHeader').mockImplementation(mockEncodeHeader);
+      jest.spyOn(BackUpHeader.prototype, 'generateChaCha20Key').mockImplementation(mockGenerateChaCha20Key);
+      jest.spyOn(BackUpHeader.prototype, 'readBackupHeader').mockImplementation(mockReadBackupHeader);
+
+      const [backupRepository] = await buildBackupRepository();
+      await backupRepository.generateHistory(user, clientId, noop, password);
+
+      // // Assert the expected function calls
+      expect(mockEncodeHeader).toHaveBeenCalled();
+      expect(mockReadBackupHeader).toHaveBeenCalled();
+      expect(mockGenerateChaCha20Key).toHaveBeenCalled();
+
+      const {decodedHeader} = mockReadBackupHeader();
+      expect(mockGenerateChaCha20Key).toHaveBeenCalledWith(decodedHeader);
+    });
+
+    test('compressHistoryFiles does not call the encryption function if no password is provided', async () => {
+      // Mocked values
+      const password = '';
+      const clientId = 'ClientId';
+      const user = new User('user1');
+      const mockEncodeHeader = jest.fn().mockResolvedValue(new Uint8Array(63));
+      const mockGenerateChaCha20Key = jest.fn().mockImplementation(header => new Uint8Array(32));
+
+      // Mock the behavior of BackUpHeader methods
+      jest.spyOn(BackUpHeader.prototype, 'encodeHeader').mockImplementation(mockEncodeHeader);
+      jest.spyOn(BackUpHeader.prototype, 'generateChaCha20Key').mockImplementation(mockGenerateChaCha20Key);
+
+      const [backupRepository] = await buildBackupRepository();
+      await backupRepository.generateHistory(user, clientId, noop, password);
+
+      // Assert the expected function calls
+      expect(mockEncodeHeader).not.toHaveBeenCalled();
+      expect(mockGenerateChaCha20Key).not.toHaveBeenCalled();
+    });
+    test('compressHistoryFiles returns a Blob object with the correct type', async () => {
+      // Mocked values...
+      const password = 'Password';
+      const clientId = 'ClientId';
+      const user = new User('user1');
+
+      const [backupRepository] = await buildBackupRepository();
+      const result = await backupRepository.generateHistory(user, clientId, noop, password);
+
+      expect(result).toBeInstanceOf(Blob);
+      expect(result.type).toBe('application/zip');
+    });
+  });
 });
diff --git a/src/script/backup/BackupRepository.ts b/src/script/backup/BackupRepository.ts
index b756ce246c7..5fa7f254217 100644
--- a/src/script/backup/BackupRepository.ts
+++ b/src/script/backup/BackupRepository.ts
@@ -26,6 +26,7 @@ import {Logger, getLogger} from 'Util/Logger';
 import {constructUserPrimaryKey} from 'Util/StorageUtil';
 import {WebWorker} from 'Util/worker';
 
+import {BackUpHeader, ERROR_TYPES} from './BackUpHeader';
 import {BackupService} from './BackupService';
 import {
   CancelError,
@@ -33,8 +34,10 @@ import {
   ExportError,
   ImportError,
   IncompatibleBackupError,
+  IncompatibleBackupFormatError,
   IncompatiblePlatformError,
   InvalidMetaDataError,
+  InvalidPassword,
 } from './Error';
 import {preprocessConversations, preprocessEvents, preprocessUsers} from './recordPreprocessors';
 
@@ -123,12 +126,17 @@ export class BackupRepository {
    * @param progressCallback called on every step of the export
    * @returns The promise that contains all the exported tables
    */
-  public async generateHistory(user: User, clientId: string, progressCallback: ProgressCallback): Promise<Blob> {
+  public async generateHistory(
+    user: User,
+    clientId: string,
+    progressCallback: ProgressCallback,
+    password: string,
+  ): Promise<Blob> {
     this.canceled = false;
 
     try {
       const exportedData = await this._exportHistory(progressCallback);
-      return await this.compressHistoryFiles(user, clientId, exportedData);
+      return await this.compressHistoryFiles(user, clientId, exportedData, password);
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : error;
       this.logger.error(`Could not export history: ${errorMessage}`, error);
@@ -172,8 +180,12 @@ export class BackupRepository {
     });
     return tableData;
   }
-
-  private async compressHistoryFiles(user: User, clientId: string, exportedData: Record<string, any>): Promise<Blob> {
+  private async compressHistoryFiles(
+    user: User,
+    clientId: string,
+    exportedData: Record<string, any>,
+    password: string,
+  ): Promise<Blob> {
     const metaData = this.createMetaData(user, clientId);
 
     const files: Record<string, Uint8Array> = {};
@@ -187,28 +199,117 @@ export class BackupRepository {
       const fileName = `${tableName}.json`;
       files[fileName] = encodedData;
     }
-
     files[Filename.METADATA] = encodedMetadata;
 
+    if (password) {
+      return this.createEncryptedBackup(files, user, password);
+    }
+
+    // If no password, return the regular ZIP archive
     const array = await this.worker.post<Uint8Array>({type: 'zip', files});
     return new Blob([array], {type: 'application/zip'});
   }
 
+  private async createEncryptedBackup(files: Record<string, Uint8Array>, user: User, password: string): Promise<Blob> {
+    // encode header
+    const backupCoder = new BackUpHeader(user.id, password);
+    const backupHeader = await this.generateBackupHeader(user, password, backupCoder).catch(error => {
+      throw new Error('Backup error:', error);
+    });
+
+    // Encrypt the ZIP archive using the provided password
+    const {decodedHeader} = backupCoder.readBackupHeader(backupHeader);
+    const chaCha20Key = await backupCoder.generateChaCha20Key(decodedHeader);
+    const array = await this.worker.post<Uint8Array>({type: 'zip', files, encrytionKey: chaCha20Key});
+
+    // Prepend the combinedBytes to the ZIP archive data
+    const combinedArray = this.concatenateByteArrays([backupHeader, array]);
+    return new Blob([combinedArray], {type: 'application/zip'});
+  }
+
+  private async generateBackupHeader(user: User, password: string, backupCoder: BackUpHeader) {
+    const backupHeader = await backupCoder.encodeHeader();
+    if (backupHeader.byteLength === 0) {
+      throw new Error('Backup header is empty');
+    }
+    return backupHeader;
+  }
+
+  private concatenateByteArrays(arrays: Uint8Array[]): Uint8Array {
+    // Calculate the total length of the concatenated array
+    let totalLength = 0;
+    for (const array of arrays) {
+      totalLength += array.length;
+    }
+
+    // Create a new Uint8Array with the total length
+    const concatenatedArray = new Uint8Array(totalLength);
+
+    // Copy each array into the concatenated array
+    let offset = 0;
+    for (const array of arrays) {
+      concatenatedArray.set(array, offset);
+      offset += array.length;
+    }
+
+    return concatenatedArray;
+  }
   public getBackupInitData(): Promise<number> {
     return this.backupService.getHistoryCount();
   }
 
+  private async convertToUint8Array(data: ArrayBuffer | Blob): Promise<Uint8Array> {
+    if (data instanceof ArrayBuffer) {
+      return new Uint8Array(data);
+    } else if (data instanceof Blob) {
+      return await this.readBlobAsUint8Array(data);
+    }
+    throw new Error('Unsupported data type');
+  }
+  private async readBlobAsUint8Array(blob: Blob): Promise<Uint8Array> {
+    return new Promise<Uint8Array>((resolve, reject) => {
+      const reader = new FileReader();
+
+      reader.onloadend = () => {
+        if (reader.result instanceof ArrayBuffer) {
+          resolve(new Uint8Array(reader.result));
+        } else {
+          reject(new Error('Invalid Blob data'));
+        }
+      };
+
+      reader.onerror = () => {
+        reject(new Error('Failed to read Blob data'));
+      };
+
+      reader.readAsArrayBuffer(blob);
+    });
+  }
+
   public async importHistory(
     user: User,
     data: ArrayBuffer | Blob,
     initCallback: ProgressCallback,
     progressCallback: ProgressCallback,
+    password?: string,
   ): Promise<void> {
     this.canceled = false;
-
-    const files = await this.worker.post<Record<string, Uint8Array>>({type: 'unzip', bytes: data});
+    let files;
+
+    if (password) {
+      files = await this.createDecryptedBackup(data, user, password);
+    } else {
+      files = await this.worker.post<Record<string, Uint8Array>>({
+        type: 'unzip',
+        bytes: data,
+      });
+    }
 
     if (files.error) {
+      const error = files.error.toString();
+      if (error === 'WRONG_PASSWORD') {
+        throw new InvalidPassword(error);
+      }
       throw new ImportError(files.error as unknown as string);
     }
 
@@ -234,6 +335,33 @@ export class BackupRepository {
     await this.importHistoryData(fileDescriptors, progressCallback);
   }
 
+  private async createDecryptedBackup(
+    data: ArrayBuffer | Blob,
+    user: User,
+    password: string,
+  ): Promise<Record<string, Uint8Array>> {
+    const backupCoder = new BackUpHeader(user.id, password);
+
+    // Convert data to Uint8Array
+    const dataArray = await this.convertToUint8Array(data);
+    const {decodingError, decodedHeader, headerSize} = await backupCoder.decodeHeader(dataArray);
+
+    // error decoding the header
+    if (decodingError) {
+      this.mapDecodingError(decodingError);
+    }
+    // We need to read the ChaCha20 generated header prior to the encrypted backup file data to run some sanity checks
+    const chaChaHeaderKey = await backupCoder.generateChaCha20Key(decodedHeader);
+
+    // ChaCha20 header is needed to validate the encrypted data hasn't been tampered with different authentication
+    return await this.worker.post<Record<string, Uint8Array>>({
+      type: 'unzip',
+      bytes: data,
+      encrytionKey: chaChaHeaderKey,
+      headerLength: headerSize,
+    });
+  }
+
   private async importHistoryData(
     fileDescriptors: FileDescriptor[],
     progressCallback: ProgressCallback,
@@ -268,9 +396,8 @@ export class BackupRepository {
     let importedEntities: Conversation[] = [];
 
     const importConversationChunk = async (conversationChunk: ConversationRecord[]) => {
-      const importedConversationEntities = await this.conversationRepository.updateConversationStates(
-        conversationChunk,
-      );
+      const importedConversationEntities =
+        await this.conversationRepository.updateConversationStates(conversationChunk);
       importedEntities = importedEntities.concat(importedConversationEntities);
       progressCallback(conversationChunk.length);
       return importedEntities.length;
@@ -341,11 +468,12 @@ export class BackupRepository {
   }
 
   private prepareEvents(entity: EventRecord) {
-    if (entity.data) {
+    const data = entity.data as any;
+    if (data) {
       UINT8ARRAY_FIELDS.forEach(field => {
-        const dataField = entity.data[field];
+        const dataField = data[field];
         if (dataField) {
-          entity.data[field] = new Uint8Array(Object.values(dataField));
+          data[field] = new Uint8Array(Object.values(dataField));
         }
       });
     }
@@ -389,4 +517,27 @@ export class BackupRepository {
       throw new IncompatibleBackupError(message);
     }
   }
+
+  private mapDecodingError(decodingError: string) {
+    let message = '';
+    switch (decodingError) {
+      case ERROR_TYPES.INVALID_USER_ID: {
+        message = 'The user id in the backup file header does not match the expected one';
+        this.logger.error(message);
+        throw new DifferentAccountError(message);
+        break;
+      }
+      case ERROR_TYPES.INVALID_FORMAT:
+        message = 'The provided backup version is lower than the minimum supported version';
+        this.logger.error(message);
+        throw new IncompatibleBackupError(message);
+        break;
+
+      case ERROR_TYPES.INVALID_VERSION:
+        message = 'The provided backup version is lower than the minimum supported version';
+        this.logger.error('The provided backup format is not supported');
+        throw new IncompatibleBackupFormatError(message);
+        break;
+    }
+  }
 }
diff --git a/src/script/backup/BackupService.ts b/src/script/backup/BackupService.ts
index 077b21f839d..fc180deb4b7 100644
--- a/src/script/backup/BackupService.ts
+++ b/src/script/backup/BackupService.ts
@@ -81,7 +81,7 @@ export class BackupService {
     {
       generatePrimaryKey,
       generateId,
-    }: {generatePrimaryKey?: (entry: T) => string; generateId?: (entry: T) => string} = {},
+    }: {generatePrimaryKey?: (entry: T) => string; generateId?: (entry: T) => string | undefined} = {},
   ): Promise<number> {
     if (this.storageService.db) {
       const table = await this.storageService.db.table(tableName);
@@ -112,14 +112,14 @@ export class BackupService {
   private async addByIds<T>(
     table: Dexie.Table<T, unknown>,
     entities: T[],
-    generateId?: (entry: T) => string,
+    generateId?: (entry: T) => string | undefined,
   ): Promise<number> {
     if (!generateId) {
       await table.bulkAdd(entities);
       return entities.length;
     }
 
-    const ids = entities.map(generateId);
+    const ids = entities.map(generateId).filter((id): id is string => typeof id === 'string');
     const existingEntities = await table.where('id').anyOf(ids).toArray();
     const newEntities = entities.filter(
       entity => !existingEntities.some(existingEntity => generateId(existingEntity) === generateId(entity)),
diff --git a/src/script/backup/Error.ts b/src/script/backup/Error.ts
index 1cba33bf0b7..d55ce909c51 100644
--- a/src/script/backup/Error.ts
+++ b/src/script/backup/Error.ts
@@ -59,9 +59,23 @@ export class IncompatibleBackupError extends ImportError {
   }
 }
 
+export class IncompatibleBackupFormatError extends ImportError {
+  constructor(message = 'The provided backup format is not supported') {
+    super(message);
+    Object.setPrototypeOf(this, IncompatibleBackupFormatError.prototype);
+  }
+}
+
 export class IncompatiblePlatformError extends ImportError {
   constructor(message = 'Backup created by incompatible platform') {
     super(message);
     Object.setPrototypeOf(this, IncompatiblePlatformError.prototype);
   }
 }
+
+export class InvalidPassword extends ImportError {
+  constructor(message = 'Wrong Password') {
+    super(message);
+    Object.setPrototypeOf(this, InvalidPassword.prototype);
+  }
+}
diff --git a/src/script/backup/zipWorker.ts b/src/script/backup/zipWorker.ts
index 25003966a58..dc54cb1ab76 100644
--- a/src/script/backup/zipWorker.ts
+++ b/src/script/backup/zipWorker.ts
@@ -18,24 +18,49 @@
  */
 
 import JSZip from 'jszip';
+import sodium from 'libsodium-wrappers';
 
-type Payload = {type: 'zip'; files: Record<string, ArrayBuffer | string>} | {type: 'unzip'; bytes: ArrayBuffer};
+import {ImportError} from './Error';
+
+type Payload =
+  | {type: 'zip'; files: Record<string, ArrayBuffer | string>; encrytionKey?: Uint8Array}
+  | {type: 'unzip'; bytes: ArrayBuffer; encrytionKey?: Uint8Array; headerLength?: number};
 
 export async function handleZipEvent(payload: Payload) {
   const zip = new JSZip();
+  const encrytionKey = payload.encrytionKey;
   switch (payload.type) {
     case 'zip':
       for (const [filename, file] of Object.entries(payload.files)) {
         zip.file(filename, file, {binary: true});
       }
 
-      const array = await zip.generateAsync({compression: 'DEFLATE', type: 'uint8array'});
+      const OriginalData = await zip.generateAsync({compression: 'DEFLATE', type: 'uint8array'});
 
-      return array;
+      if (encrytionKey) {
+        // Encrypt the ZIP archive using the provided encrytionKey
+        const encryptedData = await encryptFile(OriginalData, encrytionKey);
+        return encryptedData;
+      }
+      return OriginalData;
 
     case 'unzip':
-      const archive = await JSZip.loadAsync(payload.bytes);
+      let decryptedBytes;
 
+      if (!!encrytionKey) {
+        // Decrypt the ZIP archive using the provided encrytionKey
+        const payloadBytes = new Uint8Array(payload.bytes);
+        const headerLength = payload.headerLength ? payload.headerLength : 0;
+        try {
+          decryptedBytes = await decryptFile(payloadBytes, encrytionKey, headerLength);
+        } catch (error) {
+          // Handle decryption failure
+          throw new ImportError(error.message);
+        }
+      } else {
+        decryptedBytes = payload.bytes;
+      }
+      const archive = await JSZip.loadAsync(decryptedBytes);
       const files: Record<string, Uint8Array> = {};
 
       for (const fileName in archive.files) {
@@ -46,6 +71,45 @@ export async function handleZipEvent(payload: Payload) {
   }
 }
 
+// Encrypt a file
+async function encryptFile(fileContent: Uint8Array, encryptionKey: Uint8Array): Promise<Uint8Array> {
+  await sodium.ready;
+
+  const headerBytes = sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES;
+  const stateAndHeader = sodium.crypto_secretstream_xchacha20poly1305_init_push(encryptionKey);
+  const {state, header} = stateAndHeader;
+
+  const encryptedFile = sodium.crypto_secretstream_xchacha20poly1305_push(
+    state,
+    fileContent,
+    null,
+    sodium.crypto_secretstream_xchacha20poly1305_TAG_MESSAGE,
+  );
+  const encrypted = new Uint8Array(headerBytes + encryptedFile.length);
+
+  encrypted.set(header);
+  encrypted.set(encryptedFile, headerBytes);
+
+  return encrypted;
+}
+
+// Decrypt a file
+async function decryptFile(encryptedDataSource: Uint8Array, encryptionKey: Uint8Array, headerLength: number) {
+  await sodium.ready;
+
+  const metaDataHeader = headerLength;
+  const headerBytes = sodium.crypto_secretstream_xchacha20poly1305_HEADERBYTES;
+  const header = encryptedDataSource.slice(metaDataHeader, metaDataHeader + headerBytes);
+  const state = sodium.crypto_secretstream_xchacha20poly1305_init_pull(header, encryptionKey);
+  const encryptedContent = encryptedDataSource.slice(headerBytes + metaDataHeader);
+  const decrypted = sodium.crypto_secretstream_xchacha20poly1305_pull(state, encryptedContent);
+
+  if (!decrypted) {
+    throw new ImportError('WRONG_PASSWORD');
+  }
+
+  return decrypted.message;
+}
 self.addEventListener('message', async (event: MessageEvent<Payload>) => {
   try {
     const result = await handleZipEvent(event.data);
diff --git a/src/script/calling/Call.ts b/src/script/calling/Call.ts
index d15e5c34042..f46d258e72c 100644
--- a/src/script/calling/Call.ts
+++ b/src/script/calling/Call.ts
@@ -88,8 +88,8 @@ export class Call {
     this.initialType = callType;
     this.selfClientId = selfParticipant?.clientId;
     this.participants = ko.observableArray([selfParticipant]);
-    this.activeAudioOutput = this.mediaDevicesHandler.currentAvailableDeviceId.audioOutput();
-    this.mediaDevicesHandler.currentAvailableDeviceId.audioOutput.subscribe((newActiveAudioOutput: string) => {
+    this.activeAudioOutput = this.mediaDevicesHandler.currentAvailableDeviceId.audiooutput();
+    this.mediaDevicesHandler.currentAvailableDeviceId.audiooutput.subscribe((newActiveAudioOutput: string) => {
       this.activeAudioOutput = newActiveAudioOutput;
       this.updateAudioStreamsSink();
     });
diff --git a/src/script/calling/CallingRepository.test.ts b/src/script/calling/CallingRepository.test.ts
index e5f837ce940..3dea6daa268 100644
--- a/src/script/calling/CallingRepository.test.ts
+++ b/src/script/calling/CallingRepository.test.ts
@@ -69,10 +69,10 @@ describe('CallingRepository', () => {
   const clientId = createUuid();
 
   const mediaDevices = {
-    audioInput: ko.pureComputed(() => 'test'),
-    audioOutput: ko.pureComputed(() => 'test'),
-    screenInput: ko.pureComputed(() => 'test'),
-    videoInput: ko.pureComputed(() => 'test'),
+    audioinput: ko.pureComputed(() => 'test'),
+    audiooutput: ko.pureComputed(() => 'test'),
+    screeninput: ko.pureComputed(() => 'test'),
+    videoinput: ko.pureComputed(() => 'test'),
   };
 
   beforeAll(() => {
@@ -136,7 +136,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       incomingCall.state(CALL_STATE.INCOMING);
 
@@ -148,7 +148,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       activeCall.state(CALL_STATE.MEDIA_ESTAB);
 
@@ -160,7 +160,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       declinedCall.state(CALL_STATE.INCOMING);
       declinedCall.reason(REASON.STILL_ONGOING);
@@ -183,7 +183,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       const source = new window.RTCAudioSource();
       const audioTrack = source.createTrack();
@@ -213,7 +213,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       const source = new window.RTCAudioSource();
       const audioTrack = source.createTrack();
@@ -249,7 +249,7 @@ describe('CallingRepository', () => {
         CALL_TYPE.NORMAL,
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler,
+        } as unknown as MediaDevicesHandler,
       );
       spyOn(callingRepository['callState'], 'joinedCall').and.returnValue(call);
       callingRepository.stopMediaSource(MediaType.AUDIO);
@@ -267,10 +267,10 @@ describe('CallingRepository', () => {
 
 describe('CallingRepository ISO', () => {
   const mediaDevices = {
-    audioInput: ko.pureComputed(() => 'test'),
-    audioOutput: ko.pureComputed(() => 'test'),
-    screenInput: ko.pureComputed(() => 'test'),
-    videoInput: ko.pureComputed(() => 'test'),
+    audioinput: ko.pureComputed(() => 'test'),
+    audiooutput: ko.pureComputed(() => 'test'),
+    screeninput: ko.pureComputed(() => 'test'),
+    videoinput: ko.pureComputed(() => 'test'),
   };
   describe('incoming call', () => {
     let avsUser: number;
@@ -297,7 +297,7 @@ describe('CallingRepository ISO', () => {
         {} as any, // MediaStreamHandler
         {
           currentAvailableDeviceId: mediaDevices,
-        } as MediaDevicesHandler, // mediaDevicesHandler
+        } as unknown as MediaDevicesHandler, // mediaDevicesHandler
         {
           toServerTimestamp: jest.fn().mockImplementation(() => Date.now()),
         } as any, // ServerTimeHandler
diff --git a/src/script/calling/CallingRepository.ts b/src/script/calling/CallingRepository.ts
index 99de20d69b0..289f732273c 100644
--- a/src/script/calling/CallingRepository.ts
+++ b/src/script/calling/CallingRepository.ts
@@ -143,6 +143,7 @@ export class CallingRepository {
   private wCall?: Wcall;
   private wUser: number = 0;
   private nextMuteState: MuteState = MuteState.SELF_MUTED;
+  private isConferenceCallingSupported = false;
   /**
    * Keeps track of the size of the avs log once the webapp is initiated. This allows detecting meaningless avs logs (logs that have a length equal to the length when the webapp was initiated)
    */
@@ -255,6 +256,7 @@ export class CallingRepository {
     wCall.setUserMediaHandler(this.getCallMediaStream);
     wCall.setAudioStreamHandler(this.updateCallAudioStreams);
     wCall.setVideoStreamHandler(this.updateParticipantVideoStream);
+    this.isConferenceCallingSupported = wCall.isConferenceCallingSupported();
     setInterval(() => wCall.poll(), 500);
     return wCall;
   }
@@ -326,10 +328,15 @@ export class CallingRepository {
     activeCall?.muteState(isMuted ? this.nextMuteState : MuteState.NOT_MUTED);
   };
 
-  private async pushClients(call: Call, checkMismatch?: boolean) {
+  public async pushClients(call: Call | undefined = this.callState.joinedCall(), checkMismatch?: boolean) {
+    if (!call) {
+      return false;
+    }
     const conversation = this.conversationState.findConversation(call.conversationId);
     if (!conversation) {
-      this.logger.warn(`Unable to find a conversation with id of ${call.conversationId}`);
+      this.logger.warn(
+        `Unable to find a conversation with id of ${call.conversationId.id}@${call.conversationId.domain}`,
+      );
       return false;
     }
     const allClients = await this.core.service!.conversation.fetchAllParticipantsClients(call.conversationId);
@@ -494,7 +501,7 @@ export class CallingRepository {
    * @see https://www.chromestatus.com/feature/6321945865879552
    */
   get supportsConferenceCalling(): boolean {
-    return Runtime.isSupportingConferenceCalling();
+    return this.isConferenceCallingSupported;
   }
 
   /**
@@ -622,7 +629,7 @@ export class CallingRepository {
     const conversation = this.conversationState.findConversation(conversationId);
 
     if (!conversation) {
-      this.logger.warn(`Unable to find a conversation with id of ${conversationId}`);
+      this.logger.warn(`Unable to find a conversation with id of ${conversationId.id}@${conversationId.domain}`);
       return;
     }
     switch (content.type) {
@@ -1235,7 +1242,9 @@ export class CallingRepository {
     if (reason === REASON.NOONE_JOINED || reason === REASON.EVERYONE_LEFT) {
       const conversationEntity = this.conversationState.findConversation(conversationId);
       if (!conversationEntity) {
-        this.logger.warn(`Unable to find a conversation with id of ${call.conversationId}`);
+        this.logger.warn(
+          `Unable to find a conversation with id of ${call.conversationId.id}@${call.conversationId.domain}`,
+        );
       } else {
         const callingEvent = EventBuilder.buildCallingTimeoutEvent(
           reason,
@@ -1418,14 +1427,15 @@ export class CallingRepository {
   }
 
   private updateParticipantVideoState(call: Call, members: QualifiedWcallMember[]): void {
-    members.forEach(member => call.getParticipant(member.userId, member.clientid)?.isSendingVideo(!!member.vrecv));
+    members.forEach(member => call.getParticipant(member.userId, member.clientid)?.videoState(member.vrecv));
   }
 
   private updateParticipantAudioState(call: Call, members: QualifiedWcallMember[]): void {
-    members.forEach(member =>
-      call
-        .getParticipant(member.userId, member.clientid)
-        ?.isAudioEstablished(member.aestab === AUDIO_STATE.ESTABLISHED),
+    members.forEach(
+      member =>
+        call
+          .getParticipant(member.userId, member.clientid)
+          ?.isAudioEstablished(member.aestab === AUDIO_STATE.ESTABLISHED),
     );
   }
 
@@ -1767,8 +1777,9 @@ export class CallingRepository {
         htmlMessage: t('modalNoCameraMessage', Config.getConfig().BRAND_NAME, {
           '/faqLink': '</a>',
           br: '<br>',
-          faqLink:
-            '<a href="https://support.wire.com/hc/articles/202935412" data-uie-name="go-no-camera-faq" target="_blank" rel="noopener noreferrer">',
+          faqLink: `<a href="${
+            Config.getConfig().URL.SUPPORT.CAMERA_ACCESS_DENIED
+          }" data-uie-name="go-no-camera-faq" target="_blank" rel="noopener noreferrer">`,
         }),
         title: t('modalNoCameraTitle'),
       },
diff --git a/src/script/calling/Participant.ts b/src/script/calling/Participant.ts
index 3e34d8c4d30..52b72de7a29 100644
--- a/src/script/calling/Participant.ts
+++ b/src/script/calling/Participant.ts
@@ -39,14 +39,17 @@ export class Participant {
   public sharesCamera: ko.PureComputed<boolean>;
   public startedScreenSharingAt: ko.Observable<number>;
   public isActivelySpeaking: ko.Observable<boolean>;
-  public isSendingVideo: ko.Observable<boolean>;
+  public isSendingVideo: ko.PureComputed<boolean>;
   public isAudioEstablished: ko.Observable<boolean>;
 
   // Audio
   public audioStream: ko.Observable<MediaStream | undefined>;
   public isMuted: ko.Observable<boolean>;
 
-  constructor(public user: User, public clientId: ClientId) {
+  constructor(
+    public user: User,
+    public clientId: ClientId,
+  ) {
     this.videoState = ko.observable(VIDEO_STATE.STOPPED);
     this.hasActiveVideo = ko.pureComputed(() => {
       return (this.sharesCamera() || this.sharesScreen()) && !!this.videoStream();
@@ -65,7 +68,9 @@ export class Participant {
     this.isActivelySpeaking = ko.observable(false);
     this.startedScreenSharingAt = ko.observable();
     this.isMuted = ko.observable(false);
-    this.isSendingVideo = ko.observable(false);
+    this.isSendingVideo = ko.pureComputed(() => {
+      return this.videoState() !== VIDEO_STATE.STOPPED;
+    });
     this.isAudioEstablished = ko.observable(false);
   }
 
diff --git a/src/script/calling/mlsConference.ts b/src/script/calling/mlsConference.ts
index 702b1c31805..f6cc66921d1 100644
--- a/src/script/calling/mlsConference.ts
+++ b/src/script/calling/mlsConference.ts
@@ -100,9 +100,8 @@ export const subscribeToEpochUpdates = async (
     keyLength: number;
   }) => void,
 ): Promise<() => void> => {
-  const {epoch: initialEpoch, groupId: subconversationGroupId} = await mlsService.joinConferenceSubconversation(
-    conversationId,
-  );
+  const {epoch: initialEpoch, groupId: subconversationGroupId} =
+    await mlsService.joinConferenceSubconversation(conversationId);
 
   const forwardNewEpoch = async ({groupId, epoch}: {groupId: string; epoch: number}) => {
     if (groupId !== subconversationGroupId) {
diff --git a/src/script/client/ClientEntity.ts b/src/script/client/ClientEntity.ts
index 2de40e68507..e132f036ed8 100644
--- a/src/script/client/ClientEntity.ts
+++ b/src/script/client/ClientEntity.ts
@@ -44,6 +44,7 @@ export class ClientEntity {
   };
   meta: {
     isVerified?: ko.Observable<boolean>;
+    isMLSVerified?: ko.Observable<boolean>;
     primaryKey?: string;
     userId?: string;
   };
@@ -71,6 +72,7 @@ export class ClientEntity {
     // Metadata maintained by us
     this.meta = {
       isVerified: ko.observable(false),
+      isMLSVerified: ko.observable(false),
       primaryKey: undefined,
     };
   }
@@ -116,6 +118,9 @@ export class ClientEntity {
     jsonObject.meta.is_verified = jsonObject.meta.isVerified;
     delete jsonObject.meta.isVerified;
 
+    jsonObject.meta.is_mls_verified = jsonObject.meta.isMLSVerified;
+    delete jsonObject.meta.isMLSVerified;
+
     if (jsonObject.meta.primaryKey) {
       jsonObject.meta.primary_key = jsonObject.meta.primaryKey;
       delete jsonObject.meta.primaryKey;
diff --git a/src/script/client/ClientMapper.test.ts b/src/script/client/ClientMapper.test.ts
index 597ef9c4c0b..84f0b523fad 100644
--- a/src/script/client/ClientMapper.test.ts
+++ b/src/script/client/ClientMapper.test.ts
@@ -60,6 +60,7 @@ describe('ClientMapper', () => {
       expect(clientEntity.location?.lat).toBe(clientPayload.location.lat);
       expect(clientEntity.location?.lon).toBe(clientPayload.location.lon);
       expect(clientEntity.meta.isVerified?.()).toBe(false);
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(false);
       expect(clientEntity.model).toBe(clientPayload.model);
       expect(clientEntity.time).toBe(clientPayload.time);
       expect(clientEntity.type).toBe(ClientType.TEMPORARY);
@@ -75,6 +76,7 @@ describe('ClientMapper', () => {
       expect(clientEntity.id).toBe(clientPayload.id);
       expect(clientEntity.class).toBe(clientPayload.class);
       expect(clientEntity.meta.isVerified?.()).toBe(false);
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(false);
       expect(clientEntity.isPermanent()).toBe(false);
       expect(clientEntity.isTemporary()).toBe(false);
     });
@@ -85,6 +87,7 @@ describe('ClientMapper', () => {
         id: '66d0515a23a0ef25',
         meta: {
           is_verified: true,
+          is_mls_verified: true,
         },
       };
 
@@ -104,6 +107,7 @@ describe('ClientMapper', () => {
         domain: '',
         meta: {
           is_verified: true,
+          is_mls_verified: true,
         },
       };
 
@@ -143,6 +147,7 @@ describe('ClientMapper', () => {
       expect(clientEntity.location?.lat).toBe(clientPayload.location.lat);
       expect(clientEntity.location?.lon).toBe(clientPayload.location.lon);
       expect(clientEntity.meta.isVerified?.()).toBe(false);
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(false);
       expect(clientEntity.model).toBe(clientPayload.model);
       expect(clientEntity.time).toBe(clientPayload.time);
       expect(clientEntity.type).toBe(ClientType.PERMANENT);
@@ -165,6 +170,7 @@ describe('ClientMapper', () => {
       expect(clientEntity.location?.lat).toBe(clientPayload.location.lat);
       expect(clientEntity.location?.lon).toBe(clientPayload.location.lon);
       expect(clientEntity.meta.isVerified?.()).toBe(false);
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(false);
       expect(clientEntity.model).toBe(clientPayload.model);
       expect(clientEntity.time).toBe(clientPayload.time);
       expect(clientEntity.type).toBe(ClientType.PERMANENT);
diff --git a/src/script/client/ClientMapper.ts b/src/script/client/ClientMapper.ts
index a797d870fc1..64aff74e2e2 100644
--- a/src/script/client/ClientMapper.ts
+++ b/src/script/client/ClientMapper.ts
@@ -57,7 +57,8 @@ export class ClientMapper {
     if (isClientRecord(clientPayload)) {
       const {userId} = parseClientId(clientPayload.meta.primary_key);
 
-      clientEntity.meta.isVerified(clientPayload.meta.is_verified);
+      clientEntity.meta.isVerified?.(!!clientPayload.meta.is_verified);
+      clientEntity.meta.isMLSVerified?.(!!clientPayload.meta.is_mls_verified);
       clientEntity.meta.primaryKey = clientPayload.meta.primary_key;
       clientEntity.meta.userId = userId;
     }
diff --git a/src/script/client/ClientRepository.test.ts b/src/script/client/ClientRepository.test.ts
index 237f7a5b073..f377d6926d4 100644
--- a/src/script/client/ClientRepository.test.ts
+++ b/src/script/client/ClientRepository.test.ts
@@ -37,6 +37,15 @@ describe('ClientRepository', () => {
 
   beforeAll(async () => {
     await testFactory.exposeClientActors();
+
+    const user = new User(entities.user.john_doe.id, null);
+    user.email(entities.user.john_doe.email);
+    user.isMe = true;
+    user.locale = entities.user.john_doe.locale;
+    user.name(entities.user.john_doe.name);
+    user.phone(entities.user.john_doe.phone);
+
+    testFactory.client_repository?.init(user);
     userId = testFactory.client_repository.selfUser().id;
   });
 
@@ -47,7 +56,7 @@ describe('ClientRepository', () => {
       const client = new ClientEntity(false, null);
       client.id = clientId;
 
-      testFactory.client_repository['clientState'].currentClient(client);
+      testFactory.client_repository['clientState'].currentClient = client;
 
       const clients = [
         {class: ClientClassification.DESKTOP, id: '706f64373b1bcf79'},
@@ -91,6 +100,7 @@ describe('ClientRepository', () => {
       ...clientPayloadServer,
       meta: {
         is_verified: true,
+        is_mls_verified: true,
         primary_key: 'local_identity',
       },
     };
@@ -102,9 +112,9 @@ describe('ClientRepository', () => {
       spyOn(clientService, 'getClientById').and.returnValue(Promise.resolve(clientPayloadServer));
       spyOn(clientService, 'putClientCapabilities').and.returnValue(Promise.resolve());
 
-      return testFactory.client_repository.getValidLocalClient().then(clientObservable => {
-        expect(clientObservable).toBeDefined();
-        expect(clientObservable().id).toBe(clientId);
+      return testFactory.client_repository.getValidLocalClient().then(client => {
+        expect(client).toBeDefined();
+        expect(client.id).toBe(clientId);
       });
     });
 
@@ -158,7 +168,7 @@ describe('ClientRepository', () => {
     beforeEach(() => {
       (jasmine as any).getEnv().allowRespy(true);
       spyOn(Runtime, 'isDesktopApp').and.returnValue(false);
-      testFactory.client_repository['clientState'].currentClient(undefined);
+      testFactory.client_repository['clientState'].currentClient = undefined;
     });
 
     it('returns true on Electron', () => {
@@ -169,7 +179,7 @@ describe('ClientRepository', () => {
         type: ClientType.PERMANENT,
       };
       const clientEntity = ClientMapper.mapClient(clientPayload, true, null);
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       spyOn(Runtime, 'isDesktopApp').and.returnValue(true);
       const isPermanent = testFactory.client_repository.isCurrentClientPermanent();
 
@@ -184,7 +194,7 @@ describe('ClientRepository', () => {
         type: ClientType.TEMPORARY,
       };
       const clientEntity = ClientMapper.mapClient(clientPayload, true, null);
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       spyOn(Runtime, 'isDesktopApp').and.returnValue(true);
       const isPermanent = testFactory.client_repository.isCurrentClientPermanent();
 
@@ -206,7 +216,7 @@ describe('ClientRepository', () => {
         type: ClientType.PERMANENT,
       };
       const clientEntity = ClientMapper.mapClient(clientPayload, true, null);
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       const isPermanent = testFactory.client_repository.isCurrentClientPermanent();
 
       expect(isPermanent).toBeTruthy();
@@ -220,7 +230,7 @@ describe('ClientRepository', () => {
         type: ClientType.TEMPORARY,
       };
       const clientEntity = ClientMapper.mapClient(clientPayload, true, null);
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       const isPermanent = testFactory.client_repository.isCurrentClientPermanent();
 
       expect(isPermanent).toBeFalsy();
@@ -234,12 +244,13 @@ describe('ClientRepository', () => {
   });
 
   describe('isCurrentClient', () => {
-    beforeEach(() => testFactory.client_repository['clientState'].currentClient(undefined));
+    //@ts-ignore
+    beforeEach(() => (testFactory.client_repository['clientState'].currentClient = undefined));
 
     it('returns true if user ID and client ID match', () => {
       const clientEntity = new ClientEntity(false, null);
       clientEntity.id = clientId;
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       testFactory.client_repository.selfUser(new User(userId, null));
       const result = testFactory.client_repository['isCurrentClient']({domain: '', id: userId}, clientId);
 
@@ -249,7 +260,7 @@ describe('ClientRepository', () => {
     it('returns false if only the user ID matches', () => {
       const clientEntity = new ClientEntity(false, null);
       clientEntity.id = clientId;
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       const result = testFactory.client_repository['isCurrentClient']({domain: '', id: userId}, 'ABCDE');
 
       expect(result).toBeFalsy();
@@ -258,7 +269,7 @@ describe('ClientRepository', () => {
     it('returns false if only the client ID matches', () => {
       const clientEntity = new ClientEntity(false, null);
       clientEntity.id = clientId;
-      testFactory.client_repository['clientState'].currentClient(clientEntity);
+      testFactory.client_repository['clientState'].currentClient = clientEntity;
       const result = testFactory.client_repository['isCurrentClient']({domain: '', id: 'ABCDE'}, clientId);
 
       expect(result).toBeFalsy();
@@ -271,14 +282,14 @@ describe('ClientRepository', () => {
     });
 
     it('throws an error if client ID is not specified', () => {
-      testFactory.client_repository['clientState'].currentClient(new ClientEntity(false, null));
+      testFactory.client_repository['clientState'].currentClient = new ClientEntity(false, null);
       const functionCall = () => testFactory.client_repository['isCurrentClient']({domain: '', id: userId}, undefined);
 
       expect(functionCall).toThrow(ClientError);
     });
 
     it('throws an error if user ID is not specified', () => {
-      testFactory.client_repository['clientState'].currentClient(new ClientEntity(false, null));
+      testFactory.client_repository['clientState'].currentClient = new ClientEntity(false, null);
       const functionCall = () => testFactory.client_repository['isCurrentClient'](undefined, clientId);
 
       expect(functionCall).toThrow(ClientError);
diff --git a/src/script/client/ClientRepository.ts b/src/script/client/ClientRepository.ts
index f07b195d387..99d4d72aaa8 100644
--- a/src/script/client/ClientRepository.ts
+++ b/src/script/client/ClientRepository.ts
@@ -39,6 +39,7 @@ import {constructClientId, parseClientId} from './ClientIdUtil';
 import {ClientMapper} from './ClientMapper';
 import type {ClientService} from './ClientService';
 import {ClientState} from './ClientState';
+import {isClientMLSCapable, wasClientActiveWithinLast4Weeks} from './ClientUtils';
 
 import {SIGN_OUT_REASON} from '../auth/SignOutReason';
 import {PrimaryModal} from '../components/Modals/PrimaryModal';
@@ -158,8 +159,8 @@ export class ClientRepository {
         }
 
         const currentClient = ClientMapper.mapClient(clientRecord, true, clientRecord.domain);
-        this.clientState.currentClient(currentClient);
-        return this.clientState.currentClient();
+        this.clientState.currentClient = currentClient;
+        return this.clientState.currentClient;
       });
   }
 
@@ -218,6 +219,7 @@ export class ClientRepository {
       domain: userId.domain,
       meta: {
         is_verified: false,
+        is_mls_verified: false,
         primary_key: constructClientId(userId, clientPayload.id),
       },
     };
@@ -243,13 +245,16 @@ export class ClientRepository {
    * Get and validate the local client.
    * @returns Resolves with an observable containing the client if valid
    */
-  async getValidLocalClient(): Promise<ko.Observable<ClientEntity>> {
+  async getValidLocalClient(): Promise<ClientEntity> {
     try {
       const clientEntity = await this.getCurrentClientFromDb();
       await this.getClientByIdFromBackend(clientEntity.id);
       const currentClient = this.clientState.currentClient;
 
-      await this.clientService.putClientCapabilities(currentClient().id, {
+      if (!currentClient) {
+        throw new ClientError(ClientError.TYPE.CLIENT_NOT_SET, ClientError.MESSAGE.CLIENT_NOT_SET);
+      }
+      await this.clientService.putClientCapabilities(currentClient.id, {
         capabilities: [ClientCapability.LEGAL_HOLD_IMPLICIT_CONSENT],
       });
 
@@ -268,9 +273,9 @@ export class ClientRepository {
    * Load current client type from amplify store.
    * @returns Type of current client
    */
-  private loadCurrentClientType(): ClientType.PERMANENT | ClientType.TEMPORARY {
-    if (this.clientState.currentClient()) {
-      return this.clientState.currentClient().type;
+  private loadCurrentClientType(): ClientType.PERMANENT | ClientType.TEMPORARY | undefined {
+    if (this.clientState.currentClient) {
+      return this.clientState.currentClient.type;
     }
     const isPermanent = loadValue(StorageKey.AUTH.PERSIST);
     const type = isPermanent ? ClientType.PERMANENT : ClientType.TEMPORARY;
@@ -297,8 +302,8 @@ export class ClientRepository {
   }
 
   logoutClient = async (): Promise<void> => {
-    if (this.clientState.currentClient()) {
-      if (this.clientState.isTemporaryClient()) {
+    if (this.clientState.currentClient) {
+      if (this.clientState.currentClient.isTemporary()) {
         await this.deleteLocalTemporaryClient();
         amplify.publish(WebAppEvents.LIFECYCLE.SIGN_OUT, SIGN_OUT_REASON.USER_REQUESTED, true);
       } else {
@@ -385,10 +390,10 @@ export class ClientRepository {
    * @returns Type of current client is permanent
    */
   isCurrentClientPermanent(): boolean {
-    if (!this.clientState.currentClient()) {
+    if (!this.clientState.currentClient) {
       throw new ClientError(ClientError.TYPE.CLIENT_NOT_SET, ClientError.MESSAGE.CLIENT_NOT_SET);
     }
-    return Runtime.isDesktopApp() || this.clientState.currentClient().isPermanent();
+    return Runtime.isDesktopApp() || this.clientState.currentClient.isPermanent();
   }
 
   /**
@@ -396,11 +401,18 @@ export class ClientRepository {
    * @returns Resolves when the clients have been updated
    */
   async updateClientsForSelf(): Promise<ClientEntity[]> {
-    const clientsData = await this.clientService.getClients();
+    const clientsData = await this.getAllSelfClients();
     const {domain, id} = this.selfUser();
     return this.updateUserClients({domain, id}, clientsData, false);
   }
 
+  /**
+   * Fetches metadata of all the self user's clients.
+   */
+  public async getAllSelfClients(): Promise<RegisteredClient[]> {
+    return this.clientService.getClients();
+  }
+
   /**
    * Update clients of a user with the given backend data.
    * @note This function matches clients retrieved from the backend with the data stored in the local database.
@@ -441,7 +453,7 @@ export class ClientRepository {
 
             delete clientsFromBackend[clientId];
 
-            if (this.clientState.currentClient() && this.isCurrentClient(userId, clientId)) {
+            if (this.clientState.currentClient && this.isCurrentClient(userId, clientId)) {
               this.logger.warn(`Removing duplicate local self client`);
               await this.removeClient(userId, clientId);
             }
@@ -468,7 +480,7 @@ export class ClientRepository {
         for (const clientId in clientsFromBackend) {
           const clientPayload = clientsFromBackend[clientId];
 
-          if (this.clientState.currentClient() && this.isCurrentClient(userId, clientId)) {
+          if (this.clientState.currentClient && this.isCurrentClient(userId, clientId)) {
             continue;
           }
 
@@ -503,7 +515,7 @@ export class ClientRepository {
    * @returns Is the client the current local client
    */
   private isCurrentClient(userId: QualifiedId, clientId: string): boolean {
-    if (!this.clientState.currentClient()) {
+    if (!this.clientState.currentClient) {
       throw new ClientError(ClientError.TYPE.CLIENT_NOT_SET, ClientError.MESSAGE.CLIENT_NOT_SET);
     }
     if (!userId) {
@@ -512,7 +524,7 @@ export class ClientRepository {
     if (!clientId) {
       throw new ClientError(ClientError.TYPE.NO_CLIENT_ID, ClientError.MESSAGE.NO_CLIENT_ID);
     }
-    return matchQualifiedIds(userId, this.selfUser()) && clientId === this.clientState.currentClient().id;
+    return matchQualifiedIds(userId, this.selfUser()) && clientId === this.clientState.currentClient.id;
   }
 
   //##############################################################################
@@ -554,7 +566,7 @@ export class ClientRepository {
       return;
     }
 
-    const isCurrentClient = clientId === this.clientState.currentClient().id;
+    const isCurrentClient = clientId === this.clientState.currentClient.id;
     if (isCurrentClient) {
       // If the current client has been removed, we need to sign out
       amplify.publish(WebAppEvents.LIFECYCLE.SIGN_OUT, SIGN_OUT_REASON.CLIENT_REMOVED, true);
@@ -576,4 +588,11 @@ export class ClientRepository {
     }
     amplify.publish(WebAppEvents.CLIENT.REMOVE, this.selfUser().qualifiedId, clientId);
   }
+
+  public async haveAllActiveSelfClientsRegisteredMLSDevice(): Promise<boolean> {
+    const selfClients = await this.getAllSelfClients();
+    //we consider client active if it was active within last 4 weeks
+    const activeClients = selfClients.filter(wasClientActiveWithinLast4Weeks);
+    return activeClients.every(isClientMLSCapable);
+  }
 }
diff --git a/src/script/client/ClientState.ts b/src/script/client/ClientState.ts
index 1b593d9b796..6741eae5692 100644
--- a/src/script/client/ClientState.ts
+++ b/src/script/client/ClientState.ts
@@ -25,11 +25,7 @@ import {ClientEntity} from './ClientEntity';
 @singleton()
 export class ClientState {
   clients: ko.PureComputed<ClientEntity[]>;
-  currentClient: ko.Observable<ClientEntity>;
-  isTemporaryClient: ko.PureComputed<boolean>;
+  currentClient: ClientEntity | undefined;
 
-  constructor() {
-    this.currentClient = ko.observable();
-    this.isTemporaryClient = ko.pureComputed(() => this.currentClient()?.isTemporary());
-  }
+  constructor() {}
 }
diff --git a/src/script/client/ClientUtils.test.ts b/src/script/client/ClientUtils.test.ts
new file mode 100644
index 00000000000..7b38207432d
--- /dev/null
+++ b/src/script/client/ClientUtils.test.ts
@@ -0,0 +1,50 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {RegisteredClient} from '@wireapp/api-client/lib/client';
+
+import {TIME_IN_MILLIS} from 'Util/TimeUtil';
+
+import {wasClientActiveWithinLast4Weeks} from './ClientUtils';
+
+const createClientWithLastActive = (date: Date): RegisteredClient => {
+  return {last_active: date.toISOString()} as RegisteredClient;
+};
+
+describe('wasClientActiveWithinLast4Weeks', () => {
+  beforeEach(() => {
+    jest.useFakeTimers();
+    jest.setSystemTime(new Date('2021-01-01'));
+  });
+
+  it('should return false if client was last active 29 days ago', () => {
+    const client = createClientWithLastActive(new Date(Date.now() - 29 * TIME_IN_MILLIS.DAY));
+    expect(wasClientActiveWithinLast4Weeks(client)).toBe(false);
+  });
+
+  it('should return true if client was last active exactly 28 days ago', () => {
+    const client = createClientWithLastActive(new Date(Date.now() - 28 * TIME_IN_MILLIS.DAY));
+    expect(wasClientActiveWithinLast4Weeks(client)).toBe(true);
+  });
+
+  it('should return true if client was last active less than 28 days ago', () => {
+    const client = createClientWithLastActive(new Date(Date.now() - 20 * TIME_IN_MILLIS.DAY));
+    expect(wasClientActiveWithinLast4Weeks(client)).toBe(true);
+  });
+});
diff --git a/src/script/client/ClientUtils.ts b/src/script/client/ClientUtils.ts
new file mode 100644
index 00000000000..e1d47100899
--- /dev/null
+++ b/src/script/client/ClientUtils.ts
@@ -0,0 +1,42 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {RegisteredClient} from '@wireapp/api-client/lib/client';
+
+import {weeksPassedSinceDate} from 'Util/TimeUtil';
+
+export const wasClientActiveWithinLast4Weeks = ({last_active: lastActiveISODate}: RegisteredClient): boolean => {
+  //if client has not requested /notifications endpoint yet with backend supporting last_active field, we assume it is not active
+  if (!lastActiveISODate) {
+    return false;
+  }
+
+  const passedWeeksSinceLastActive = weeksPassedSinceDate(new Date(lastActiveISODate));
+  return passedWeeksSinceLastActive <= 4;
+};
+
+/**
+ * Check if client is MLS-capable device.
+ * Client is considered MLS capable if it was registered and has uploaded MLS public keys.
+ * @param client - client to check
+ * @returns {boolean}
+ */
+export const isClientMLSCapable = ({mls_public_keys: mlsPublicKeys}: RegisteredClient): boolean => {
+  return Object.values(mlsPublicKeys).length > 0;
+};
diff --git a/src/script/components/AppContainer/AppContainer.tsx b/src/script/components/AppContainer/AppContainer.tsx
index ea41e8efc84..b5456af4a38 100644
--- a/src/script/components/AppContainer/AppContainer.tsx
+++ b/src/script/components/AppContainer/AppContainer.tsx
@@ -24,6 +24,9 @@ import {container} from 'tsyringe';
 
 import {SIGN_OUT_REASON} from 'src/script/auth/SignOutReason';
 import {useSingleInstance} from 'src/script/hooks/useSingleInstance';
+import {PROPERTIES_TYPE} from 'src/script/properties/PropertiesType';
+
+import {useTheme} from './hooks/useTheme';
 
 import {Configuration} from '../../Config';
 import {setAppLocale} from '../../localization/Localizer';
@@ -45,6 +48,7 @@ export const AppContainer: FC<AppProps> = ({config, clientType}) => {
   // Publishing application on the global scope for debug and testing purposes.
   window.wire.app = app;
   const mainView = new MainViewModel(app.repository);
+  useTheme(() => app.repository.properties.getPreference(PROPERTIES_TYPE.INTERFACE.THEME));
 
   const {hasOtherInstance, registerInstance} = useSingleInstance();
 
diff --git a/src/script/components/AppContainer/hooks/useTheme.test.ts b/src/script/components/AppContainer/hooks/useTheme.test.ts
new file mode 100644
index 00000000000..4af040716aa
--- /dev/null
+++ b/src/script/components/AppContainer/hooks/useTheme.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {renderHook} from '@testing-library/react';
+import {amplify} from 'amplify';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+import {Theme, useTheme} from './useTheme';
+
+describe('useTheme', () => {
+  it.each([
+    ['dark', 'theme-dark'],
+    ['default', 'theme-default'],
+  ] as const)('should set the initial theme to the body classes', (theme, bodyclass) => {
+    renderHook(() => useTheme(() => theme));
+
+    expect(document.body.className).toContain(bodyclass);
+  });
+
+  it('live updates as theme changes', () => {
+    let theme: Theme = 'default';
+
+    renderHook(() => useTheme(() => theme));
+
+    expect(document.body.className).toContain('theme-default');
+
+    theme = 'dark';
+    amplify.publish(WebAppEvents.PROPERTIES.UPDATE.INTERFACE.THEME);
+    expect(document.body.className).toContain('theme-dark');
+
+    theme = 'default';
+    amplify.publish(WebAppEvents.PROPERTIES.UPDATED);
+    expect(document.body.className).toContain('theme-default');
+  });
+});
diff --git a/src/script/components/AppContainer/hooks/useTheme.ts b/src/script/components/AppContainer/hooks/useTheme.ts
new file mode 100644
index 00000000000..cded8c6737a
--- /dev/null
+++ b/src/script/components/AppContainer/hooks/useTheme.ts
@@ -0,0 +1,41 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import type {WebappProperties} from '@wireapp/api-client/lib/user/data';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+import {useUserPropertyChange} from 'src/script/hooks/useUserProperty';
+
+const THEMES_CLASS_PREFIX = 'theme-';
+
+export type Theme = WebappProperties['settings']['interface']['theme'];
+
+function setTheme(theme: Theme) {
+  const classes = document.body.className
+    .split(' ')
+    .filter(elementClass => !elementClass.startsWith(THEMES_CLASS_PREFIX))
+    .concat(`${THEMES_CLASS_PREFIX}${theme}`);
+  document.body.className = classes.join(' ');
+}
+
+export function useTheme(getTheme: () => Theme) {
+  setTheme(getTheme());
+  useUserPropertyChange(getTheme, WebAppEvents.PROPERTIES.UPDATE.INTERFACE.THEME, setTheme);
+}
diff --git a/src/script/components/AvailabilityState.tsx b/src/script/components/AvailabilityState.tsx
index f9c61c9d5ee..03c0e6c8213 100644
--- a/src/script/components/AvailabilityState.tsx
+++ b/src/script/components/AvailabilityState.tsx
@@ -29,7 +29,7 @@ import {KEY} from 'Util/KeyboardUtil';
 
 import {Icon} from './Icon';
 
-export interface AvailabilityStateProps {
+interface AvailabilityStateProps {
   availability: Availability.Type;
   className?: string;
   dataUieName: string;
@@ -54,7 +54,7 @@ const buttonCommonStyles: CSSObject = {
   textTransform: 'uppercase',
 };
 
-const AvailabilityState: React.FC<AvailabilityStateProps> = ({
+export const AvailabilityState: React.FC<AvailabilityStateProps> = ({
   availability,
   className,
   dataUieName,
@@ -174,5 +174,3 @@ const AvailabilityState: React.FC<AvailabilityStateProps> = ({
 
   return wrappedContent;
 };
-
-export {AvailabilityState};
diff --git a/src/script/components/Avatar/AvatarBorder.tsx b/src/script/components/Avatar/AvatarBorder.tsx
index d6ebe584823..5d6d412b706 100644
--- a/src/script/components/Avatar/AvatarBorder.tsx
+++ b/src/script/components/Avatar/AvatarBorder.tsx
@@ -21,11 +21,11 @@ import React from 'react';
 
 import {CSS_FILL_PARENT} from 'Util/CSSMixin';
 
-export interface AvatarBorderProps {
+interface AvatarBorderProps {
   borderRadius?: string;
 }
 
-const AvatarBorder: React.FunctionComponent<AvatarBorderProps> = ({borderRadius = '50%'}) => (
+export const AvatarBorder: React.FunctionComponent<AvatarBorderProps> = ({borderRadius = '50%'}) => (
   <div
     css={{
       ...CSS_FILL_PARENT,
@@ -34,5 +34,3 @@ const AvatarBorder: React.FunctionComponent<AvatarBorderProps> = ({borderRadius
     }}
   />
 );
-
-export {AvatarBorder};
diff --git a/src/script/components/Avatar/AvatarInitials.tsx b/src/script/components/Avatar/AvatarInitials.tsx
index 86b0382ed87..fb41e0ea4cd 100644
--- a/src/script/components/Avatar/AvatarInitials.tsx
+++ b/src/script/components/Avatar/AvatarInitials.tsx
@@ -24,7 +24,7 @@ import {getFirstChar} from 'Util/StringUtil';
 
 import {AVATAR_SIZE, INITIALS_SIZE, DIAMETER} from '.';
 
-export interface AvatarInitialsProps {
+interface AvatarInitialsProps {
   avatarSize: AVATAR_SIZE;
   initials: string;
   color?: string;
diff --git a/src/script/components/Avatar/ServiceAvatar.tsx b/src/script/components/Avatar/ServiceAvatar.tsx
index 3d950f3aa4c..e41fc8e9029 100644
--- a/src/script/components/Avatar/ServiceAvatar.tsx
+++ b/src/script/components/Avatar/ServiceAvatar.tsx
@@ -33,7 +33,7 @@ import {ServiceEntity} from '../../integration/ServiceEntity';
 
 import {AVATAR_SIZE} from '.';
 
-export interface ServiceAvatarProps extends React.HTMLProps<HTMLDivElement> {
+interface ServiceAvatarProps extends React.HTMLProps<HTMLDivElement> {
   avatarSize: AVATAR_SIZE;
   onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
   participant: ServiceEntity;
diff --git a/src/script/components/Avatar/TemporaryGuestAvatar.tsx b/src/script/components/Avatar/TemporaryGuestAvatar.tsx
index ec75c53805a..18611f68729 100644
--- a/src/script/components/Avatar/TemporaryGuestAvatar.tsx
+++ b/src/script/components/Avatar/TemporaryGuestAvatar.tsx
@@ -32,7 +32,7 @@ import {User} from '../../entity/User';
 
 import {AVATAR_SIZE, STATE, DIAMETER} from '.';
 
-export interface TemporaryGuestAvatarProps extends React.HTMLProps<HTMLDivElement> {
+interface TemporaryGuestAvatarProps extends React.HTMLProps<HTMLDivElement> {
   avatarSize: AVATAR_SIZE;
   noBadge?: boolean;
   onClick?: (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
diff --git a/src/script/components/Avatar/UserAvatar.tsx b/src/script/components/Avatar/UserAvatar.tsx
index 724d9f3998c..6a1d6738f3c 100644
--- a/src/script/components/Avatar/UserAvatar.tsx
+++ b/src/script/components/Avatar/UserAvatar.tsx
@@ -21,6 +21,7 @@ import React, {MouseEvent as ReactMouseEvent, KeyboardEvent as ReactKeyBoardEven
 
 import {COLOR} from '@wireapp/react-ui-kit';
 
+import {useUserName} from 'Components/UserName';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
@@ -67,17 +68,16 @@ const UserAvatar: React.FunctionComponent<UserAvatarProps> = ({
 }) => {
   const isImageGrey = !noFilter && [STATE.BLOCKED, STATE.IGNORED, STATE.PENDING, STATE.UNKNOWN].includes(state);
   const backgroundColor = state === STATE.UNKNOWN ? COLOR.GRAY : undefined;
+  const name = useUserName(participant);
   const {
     mediumPictureResource,
     previewPictureResource,
     accent_color: accentColor,
-    name,
     initials,
   } = useKoSubscribableChildren(participant, [
     'mediumPictureResource',
     'previewPictureResource',
     'accent_color',
-    'name',
     'initials',
   ]);
   const avatarImgAlt = avatarAlt ? avatarAlt : `${t('userProfileImageAlt')} ${name}`;
diff --git a/src/script/components/ConnectRequests/ConnectionRequests.tsx b/src/script/components/ConnectRequests/ConnectionRequests.tsx
index f79f5831c0d..7df2cfa8ff5 100644
--- a/src/script/components/ConnectRequests/ConnectionRequests.tsx
+++ b/src/script/components/ConnectRequests/ConnectionRequests.tsx
@@ -17,15 +17,16 @@
  *
  */
 
-import {FC, useContext, useEffect, useRef} from 'react';
+import {useContext, useEffect, useRef} from 'react';
 
 import {container} from 'tsyringe';
 
 import {Button, ButtonVariant, IconButton, IconButtonVariant, useMatchMedia} from '@wireapp/react-ui-kit';
 
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {UserClassifiedBar} from 'Components/input/ClassifiedBar';
 import {UnverifiedUserWarning} from 'Components/Modals/UserModal';
+import {UserName} from 'Components/UserName';
 import {useAppMainState, ViewType} from 'src/script/page/state';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
@@ -40,10 +41,10 @@ interface ConnectRequestsProps {
   readonly teamState: TeamState;
 }
 
-export const ConnectRequests: FC<ConnectRequestsProps> = ({
+export const ConnectRequests = ({
   userState = container.resolve(UserState),
   teamState = container.resolve(TeamState),
-}) => {
+}: ConnectRequestsProps) => {
   const connectRequestsRefEnd = useRef<HTMLDivElement | null>(null);
   const temporaryConnectRequestsCount = useRef<number>(0);
 
@@ -121,12 +122,14 @@ export const ConnectRequests: FC<ConnectRequestsProps> = ({
               data-uie-uid={connectRequest.id}
               data-uie-name="connect-request"
             >
-              <div className="connect-request-name ellipsis">{connectRequest.name()}</div>
+              <div className="connect-request-name ellipsis">
+                <UserName user={connectRequest} />
+              </div>
 
               <div className="connect-request-username label-username">{connectRequest.handle}</div>
 
               {classifiedDomains && (
-                <ClassifiedBar users={[userState.self(), connectRequest]} classifiedDomains={classifiedDomains} />
+                <UserClassifiedBar users={[connectRequest]} classifiedDomains={classifiedDomains} />
               )}
 
               <Avatar
diff --git a/src/script/components/Conversation/Conversation.tsx b/src/script/components/Conversation/Conversation.tsx
index f7b2dbd1fc9..f0355768cd9 100644
--- a/src/script/components/Conversation/Conversation.tsx
+++ b/src/script/components/Conversation/Conversation.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, UIEvent, useCallback, useState} from 'react';
+import {UIEvent, useCallback, useState} from 'react';
 
 import cx from 'classnames';
 import {container} from 'tsyringe';
@@ -62,26 +62,25 @@ import {RightSidebarParams} from '../../page/AppMain';
 import {PanelState} from '../../page/RightSidebar';
 import {useMainViewModel} from '../../page/RootProvider';
 import {TeamState} from '../../team/TeamState';
-import {UserState} from '../../user/UserState';
 import {ElementType, MessageDetails} from '../MessagesList/Message/ContentMessage/asset/TextMessageRenderer';
 
 interface ConversationProps {
   readonly initialMessage?: Message;
   readonly teamState: TeamState;
-  readonly userState: UserState;
+  selfUser: User;
   openRightSidebar: (panelState: PanelState, params: RightSidebarParams, compareEntityId?: boolean) => void;
   isRightSidebarOpen?: boolean;
 }
 
 const CONFIG = Config.getConfig();
 
-export const Conversation: FC<ConversationProps> = ({
+export const Conversation = ({
   initialMessage,
   teamState,
-  userState,
+  selfUser,
   openRightSidebar,
   isRightSidebarOpen = false,
-}) => {
+}: ConversationProps) => {
   const messageListLogger = getLogger('ConversationList');
 
   const mainViewModel = useMainViewModel();
@@ -100,7 +99,6 @@ export const Conversation: FC<ConversationProps> = ({
     'isFileSharingSendingEnabled',
   ]);
   const {is1to1, isRequest} = useKoSubscribableChildren(activeConversation!, ['is1to1', 'isRequest']);
-  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
   const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
 
   const {activeCalls} = useKoSubscribableChildren(callState, ['activeCalls']);
@@ -253,12 +251,16 @@ export const Conversation: FC<ConversationProps> = ({
     }
   };
 
-  const showMessageDetails = (message: Message, showLikes = false) => {
+  const showMessageDetails = (message: Message, showReactions = false) => {
     if (!is1to1) {
-      openRightSidebar(PanelState.MESSAGE_DETAILS, {entity: message, showLikes});
+      openRightSidebar(PanelState.MESSAGE_DETAILS, {entity: message, showReactions}, true);
     }
   };
 
+  const showMessageReactions = (message: Message, showReactions = true) => {
+    openRightSidebar(PanelState.MESSAGE_DETAILS, {entity: message, showReactions}, true);
+  };
+
   const handleEmailClick = (event: Event, messageDetails: MessageDetails) => {
     safeMailOpen(messageDetails.href!);
     event.preventDefault();
@@ -343,6 +345,7 @@ export const Conversation: FC<ConversationProps> = ({
       conversationRepository: repositories.conversation,
       currentMessageEntity: messageEntity,
       messageRepository: repositories.message,
+      selfUser,
     });
   };
 
@@ -462,7 +465,7 @@ export const Conversation: FC<ConversationProps> = ({
           <TitleBar
             repositories={repositories}
             conversation={activeConversation}
-            userState={userState}
+            selfUser={selfUser}
             teamState={teamState}
             callActions={mainViewModel.calling.callActions}
             openRightSidebar={openRightSidebar}
@@ -503,6 +506,7 @@ export const Conversation: FC<ConversationProps> = ({
             cancelConnectionRequest={clickOnCancelRequest}
             showUserDetails={showUserDetails}
             showMessageDetails={showMessageDetails}
+            showMessageReactions={showMessageReactions}
             showParticipants={showParticipants}
             showImageDetails={showDetail}
             resetSession={onSessionResetClick}
@@ -514,22 +518,25 @@ export const Conversation: FC<ConversationProps> = ({
             setMsgElementsFocusable={setMsgElementsFocusable}
           />
 
-          <InputBar
-            conversationEntity={activeConversation}
-            conversationRepository={repositories.conversation}
-            eventRepository={repositories.event}
-            messageRepository={repositories.message}
-            openGiphy={openGiphy}
-            propertiesRepository={repositories.properties}
-            searchRepository={repositories.search}
-            storageRepository={repositories.storage}
-            teamState={teamState}
-            selfUser={selfUser}
-            onShiftTab={() => setMsgElementsFocusable(false)}
-            uploadDroppedFiles={uploadDroppedFiles}
-            uploadImages={uploadImages}
-            uploadFiles={uploadFiles}
-          />
+          {isConversationLoaded && (
+            <InputBar
+              key={activeConversation?.id}
+              conversation={activeConversation}
+              conversationRepository={repositories.conversation}
+              eventRepository={repositories.event}
+              messageRepository={repositories.message}
+              openGiphy={openGiphy}
+              propertiesRepository={repositories.properties}
+              searchRepository={repositories.search}
+              storageRepository={repositories.storage}
+              teamState={teamState}
+              selfUser={selfUser}
+              onShiftTab={() => setMsgElementsFocusable(false)}
+              uploadDroppedFiles={uploadDroppedFiles}
+              uploadImages={uploadImages}
+              uploadFiles={uploadFiles}
+            />
+          )}
 
           <div className="conversation-loading">
             <div className="icon-spinner spin accent-text"></div>
diff --git a/src/script/components/Emoji/emoji.json b/src/script/components/Emoji/emoji.json
deleted file mode 100644
index d5d05a4350f..00000000000
--- a/src/script/components/Emoji/emoji.json
+++ /dev/null
@@ -1,16127 +0,0 @@
-{
-  "0023": {
-    "aliases": [],
-    "code": "0023-fe0f",
-    "name": ":pound_symbol:"
-  },
-  "0023-20e3": {
-    "aliases": [],
-    "code": "0023-fe0f-20e3",
-    "name": ":hash:"
-  },
-  "002a": {
-    "aliases": [],
-    "code": "002a-fe0f",
-    "name": ":asterisk_symbol:"
-  },
-  "002a-20e3": {
-    "aliases": [":keycap_asterisk:"],
-    "code": "002a-fe0f-20e3",
-    "name": ":asterisk:"
-  },
-  "0030": {
-    "aliases": [],
-    "code": "0030-fe0f",
-    "name": ":digit_zero:"
-  },
-  "0030-20e3": {
-    "aliases": [],
-    "code": "0030-fe0f-20e3",
-    "name": ":zero:"
-  },
-  "0031": {
-    "aliases": [],
-    "code": "0031-fe0f",
-    "name": ":digit_one:"
-  },
-  "0031-20e3": {
-    "aliases": [],
-    "code": "0031-fe0f-20e3",
-    "name": ":one:"
-  },
-  "0032": {
-    "aliases": [],
-    "code": "0032-fe0f",
-    "name": ":digit_two:"
-  },
-  "0032-20e3": {
-    "aliases": [],
-    "code": "0032-fe0f-20e3",
-    "name": ":two:"
-  },
-  "0033": {
-    "aliases": [],
-    "code": "0033-fe0f",
-    "name": ":digit_three:"
-  },
-  "0033-20e3": {
-    "aliases": [],
-    "code": "0033-fe0f-20e3",
-    "name": ":three:"
-  },
-  "0034": {
-    "aliases": [],
-    "code": "0034-fe0f",
-    "name": ":digit_four:"
-  },
-  "0034-20e3": {
-    "aliases": [],
-    "code": "0034-fe0f-20e3",
-    "name": ":four:"
-  },
-  "0035": {
-    "aliases": [],
-    "code": "0035-fe0f",
-    "name": ":digit_five:"
-  },
-  "0035-20e3": {
-    "aliases": [],
-    "code": "0035-fe0f-20e3",
-    "name": ":five:"
-  },
-  "0036": {
-    "aliases": [],
-    "code": "0036-fe0f",
-    "name": ":digit_six:"
-  },
-  "0036-20e3": {
-    "aliases": [],
-    "code": "0036-fe0f-20e3",
-    "name": ":six:"
-  },
-  "0037": {
-    "aliases": [],
-    "code": "0037-fe0f",
-    "name": ":digit_seven:"
-  },
-  "0037-20e3": {
-    "aliases": [],
-    "code": "0037-fe0f-20e3",
-    "name": ":seven:"
-  },
-  "0038": {
-    "aliases": [],
-    "code": "0038-fe0f",
-    "name": ":digit_eight:"
-  },
-  "0038-20e3": {
-    "aliases": [],
-    "code": "0038-fe0f-20e3",
-    "name": ":eight:"
-  },
-  "0039": {
-    "aliases": [],
-    "code": "0039-fe0f",
-    "name": ":digit_nine:"
-  },
-  "0039-20e3": {
-    "aliases": [],
-    "code": "0039-fe0f-20e3",
-    "name": ":nine:"
-  },
-  "00a9": {
-    "aliases": [],
-    "code": "00a9-fe0f",
-    "name": ":copyright:"
-  },
-  "00ae": {
-    "aliases": [],
-    "code": "00ae-fe0f",
-    "name": ":registered:"
-  },
-  "1f004": {
-    "aliases": [],
-    "code": "1f004",
-    "name": ":mahjong:"
-  },
-  "1f0cf": {
-    "aliases": [],
-    "code": "1f0cf",
-    "name": ":black_joker:"
-  },
-  "1f170": {
-    "aliases": [],
-    "code": "1f170-fe0f",
-    "name": ":a:"
-  },
-  "1f171": {
-    "aliases": [],
-    "code": "1f171-fe0f",
-    "name": ":b:"
-  },
-  "1f17e": {
-    "aliases": [],
-    "code": "1f17e-fe0f",
-    "name": ":o2:"
-  },
-  "1f17f": {
-    "aliases": [],
-    "code": "1f17f-fe0f",
-    "name": ":parking:"
-  },
-  "1f18e": {
-    "aliases": [],
-    "code": "1f18e",
-    "name": ":ab:"
-  },
-  "1f191": {
-    "aliases": [],
-    "code": "1f191",
-    "name": ":cl:"
-  },
-  "1f192": {
-    "aliases": [],
-    "code": "1f192",
-    "name": ":cool:"
-  },
-  "1f193": {
-    "aliases": [],
-    "code": "1f193",
-    "name": ":free:"
-  },
-  "1f194": {
-    "aliases": [],
-    "code": "1f194",
-    "name": ":id:"
-  },
-  "1f195": {
-    "aliases": [],
-    "code": "1f195",
-    "name": ":new:"
-  },
-  "1f196": {
-    "aliases": [],
-    "code": "1f196",
-    "name": ":ng:"
-  },
-  "1f197": {
-    "aliases": [],
-    "code": "1f197",
-    "name": ":ok:"
-  },
-  "1f198": {
-    "aliases": [],
-    "code": "1f198",
-    "name": ":sos:"
-  },
-  "1f199": {
-    "aliases": [],
-    "code": "1f199",
-    "name": ":up:"
-  },
-  "1f19a": {
-    "aliases": [],
-    "code": "1f19a",
-    "name": ":vs:"
-  },
-  "1f1e6": {
-    "aliases": [],
-    "code": "1f1e6",
-    "name": ":regional_indicator_a:"
-  },
-  "1f1e6-1f1e8": {
-    "aliases": [":ac:"],
-    "code": "1f1e6-1f1e8",
-    "name": ":flag_ac:"
-  },
-  "1f1e6-1f1e9": {
-    "aliases": [":ad:"],
-    "code": "1f1e6-1f1e9",
-    "name": ":flag_ad:"
-  },
-  "1f1e6-1f1ea": {
-    "aliases": [":ae:"],
-    "code": "1f1e6-1f1ea",
-    "name": ":flag_ae:"
-  },
-  "1f1e6-1f1eb": {
-    "aliases": [":af:"],
-    "code": "1f1e6-1f1eb",
-    "name": ":flag_af:"
-  },
-  "1f1e6-1f1ec": {
-    "aliases": [":ag:"],
-    "code": "1f1e6-1f1ec",
-    "name": ":flag_ag:"
-  },
-  "1f1e6-1f1ee": {
-    "aliases": [":ai:"],
-    "code": "1f1e6-1f1ee",
-    "name": ":flag_ai:"
-  },
-  "1f1e6-1f1f1": {
-    "aliases": [":al:"],
-    "code": "1f1e6-1f1f1",
-    "name": ":flag_al:"
-  },
-  "1f1e6-1f1f2": {
-    "aliases": [":am:"],
-    "code": "1f1e6-1f1f2",
-    "name": ":flag_am:"
-  },
-  "1f1e6-1f1f4": {
-    "aliases": [":ao:"],
-    "code": "1f1e6-1f1f4",
-    "name": ":flag_ao:"
-  },
-  "1f1e6-1f1f6": {
-    "aliases": [":aq:"],
-    "code": "1f1e6-1f1f6",
-    "name": ":flag_aq:"
-  },
-  "1f1e6-1f1f7": {
-    "aliases": [":ar:"],
-    "code": "1f1e6-1f1f7",
-    "name": ":flag_ar:"
-  },
-  "1f1e6-1f1f8": {
-    "aliases": [":as:"],
-    "code": "1f1e6-1f1f8",
-    "name": ":flag_as:"
-  },
-  "1f1e6-1f1f9": {
-    "aliases": [":at:"],
-    "code": "1f1e6-1f1f9",
-    "name": ":flag_at:"
-  },
-  "1f1e6-1f1fa": {
-    "aliases": [":au:"],
-    "code": "1f1e6-1f1fa",
-    "name": ":flag_au:"
-  },
-  "1f1e6-1f1fc": {
-    "aliases": [":aw:"],
-    "code": "1f1e6-1f1fc",
-    "name": ":flag_aw:"
-  },
-  "1f1e6-1f1fd": {
-    "aliases": [":ax:"],
-    "code": "1f1e6-1f1fd",
-    "name": ":flag_ax:"
-  },
-  "1f1e6-1f1ff": {
-    "aliases": [":az:"],
-    "code": "1f1e6-1f1ff",
-    "name": ":flag_az:"
-  },
-  "1f1e7": {
-    "aliases": [],
-    "code": "1f1e7",
-    "name": ":regional_indicator_b:"
-  },
-  "1f1e7-1f1e6": {
-    "aliases": [":ba:"],
-    "code": "1f1e7-1f1e6",
-    "name": ":flag_ba:"
-  },
-  "1f1e7-1f1e7": {
-    "aliases": [":bb:"],
-    "code": "1f1e7-1f1e7",
-    "name": ":flag_bb:"
-  },
-  "1f1e7-1f1e9": {
-    "aliases": [":bd:"],
-    "code": "1f1e7-1f1e9",
-    "name": ":flag_bd:"
-  },
-  "1f1e7-1f1ea": {
-    "aliases": [":be:"],
-    "code": "1f1e7-1f1ea",
-    "name": ":flag_be:"
-  },
-  "1f1e7-1f1eb": {
-    "aliases": [":bf:"],
-    "code": "1f1e7-1f1eb",
-    "name": ":flag_bf:"
-  },
-  "1f1e7-1f1ec": {
-    "aliases": [":bg:"],
-    "code": "1f1e7-1f1ec",
-    "name": ":flag_bg:"
-  },
-  "1f1e7-1f1ed": {
-    "aliases": [":bh:"],
-    "code": "1f1e7-1f1ed",
-    "name": ":flag_bh:"
-  },
-  "1f1e7-1f1ee": {
-    "aliases": [":bi:"],
-    "code": "1f1e7-1f1ee",
-    "name": ":flag_bi:"
-  },
-  "1f1e7-1f1ef": {
-    "aliases": [":bj:"],
-    "code": "1f1e7-1f1ef",
-    "name": ":flag_bj:"
-  },
-  "1f1e7-1f1f1": {
-    "aliases": [":bl:"],
-    "code": "1f1e7-1f1f1",
-    "name": ":flag_bl:"
-  },
-  "1f1e7-1f1f2": {
-    "aliases": [":bm:"],
-    "code": "1f1e7-1f1f2",
-    "name": ":flag_bm:"
-  },
-  "1f1e7-1f1f3": {
-    "aliases": [":bn:"],
-    "code": "1f1e7-1f1f3",
-    "name": ":flag_bn:"
-  },
-  "1f1e7-1f1f4": {
-    "aliases": [":bo:"],
-    "code": "1f1e7-1f1f4",
-    "name": ":flag_bo:"
-  },
-  "1f1e7-1f1f6": {
-    "aliases": [":bq:"],
-    "code": "1f1e7-1f1f6",
-    "name": ":flag_bq:"
-  },
-  "1f1e7-1f1f7": {
-    "aliases": [":br:"],
-    "code": "1f1e7-1f1f7",
-    "name": ":flag_br:"
-  },
-  "1f1e7-1f1f8": {
-    "aliases": [":bs:"],
-    "code": "1f1e7-1f1f8",
-    "name": ":flag_bs:"
-  },
-  "1f1e7-1f1f9": {
-    "aliases": [":bt:"],
-    "code": "1f1e7-1f1f9",
-    "name": ":flag_bt:"
-  },
-  "1f1e7-1f1fb": {
-    "aliases": [":bv:"],
-    "code": "1f1e7-1f1fb",
-    "name": ":flag_bv:"
-  },
-  "1f1e7-1f1fc": {
-    "aliases": [":bw:"],
-    "code": "1f1e7-1f1fc",
-    "name": ":flag_bw:"
-  },
-  "1f1e7-1f1fe": {
-    "aliases": [":by:"],
-    "code": "1f1e7-1f1fe",
-    "name": ":flag_by:"
-  },
-  "1f1e7-1f1ff": {
-    "aliases": [":bz:"],
-    "code": "1f1e7-1f1ff",
-    "name": ":flag_bz:"
-  },
-  "1f1e8": {
-    "aliases": [],
-    "code": "1f1e8",
-    "name": ":regional_indicator_c:"
-  },
-  "1f1e8-1f1e6": {
-    "aliases": [":ca:"],
-    "code": "1f1e8-1f1e6",
-    "name": ":flag_ca:"
-  },
-  "1f1e8-1f1e8": {
-    "aliases": [":cc:"],
-    "code": "1f1e8-1f1e8",
-    "name": ":flag_cc:"
-  },
-  "1f1e8-1f1e9": {
-    "aliases": [":congo:"],
-    "code": "1f1e8-1f1e9",
-    "name": ":flag_cd:"
-  },
-  "1f1e8-1f1eb": {
-    "aliases": [":cf:"],
-    "code": "1f1e8-1f1eb",
-    "name": ":flag_cf:"
-  },
-  "1f1e8-1f1ec": {
-    "aliases": [":cg:"],
-    "code": "1f1e8-1f1ec",
-    "name": ":flag_cg:"
-  },
-  "1f1e8-1f1ed": {
-    "aliases": [":ch:"],
-    "code": "1f1e8-1f1ed",
-    "name": ":flag_ch:"
-  },
-  "1f1e8-1f1ee": {
-    "aliases": [":ci:"],
-    "code": "1f1e8-1f1ee",
-    "name": ":flag_ci:"
-  },
-  "1f1e8-1f1f0": {
-    "aliases": [":ck:"],
-    "code": "1f1e8-1f1f0",
-    "name": ":flag_ck:"
-  },
-  "1f1e8-1f1f1": {
-    "aliases": [":chile:"],
-    "code": "1f1e8-1f1f1",
-    "name": ":flag_cl:"
-  },
-  "1f1e8-1f1f2": {
-    "aliases": [":cm:"],
-    "code": "1f1e8-1f1f2",
-    "name": ":flag_cm:"
-  },
-  "1f1e8-1f1f3": {
-    "aliases": [":cn:"],
-    "code": "1f1e8-1f1f3",
-    "name": ":flag_cn:"
-  },
-  "1f1e8-1f1f4": {
-    "aliases": [":co:"],
-    "code": "1f1e8-1f1f4",
-    "name": ":flag_co:"
-  },
-  "1f1e8-1f1f5": {
-    "aliases": [":cp:"],
-    "code": "1f1e8-1f1f5",
-    "name": ":flag_cp:"
-  },
-  "1f1e8-1f1f7": {
-    "aliases": [":cr:"],
-    "code": "1f1e8-1f1f7",
-    "name": ":flag_cr:"
-  },
-  "1f1e8-1f1fa": {
-    "aliases": [":cu:"],
-    "code": "1f1e8-1f1fa",
-    "name": ":flag_cu:"
-  },
-  "1f1e8-1f1fb": {
-    "aliases": [":cv:"],
-    "code": "1f1e8-1f1fb",
-    "name": ":flag_cv:"
-  },
-  "1f1e8-1f1fc": {
-    "aliases": [":cw:"],
-    "code": "1f1e8-1f1fc",
-    "name": ":flag_cw:"
-  },
-  "1f1e8-1f1fd": {
-    "aliases": [":cx:"],
-    "code": "1f1e8-1f1fd",
-    "name": ":flag_cx:"
-  },
-  "1f1e8-1f1fe": {
-    "aliases": [":cy:"],
-    "code": "1f1e8-1f1fe",
-    "name": ":flag_cy:"
-  },
-  "1f1e8-1f1ff": {
-    "aliases": [":cz:"],
-    "code": "1f1e8-1f1ff",
-    "name": ":flag_cz:"
-  },
-  "1f1e9": {
-    "aliases": [],
-    "code": "1f1e9",
-    "name": ":regional_indicator_d:"
-  },
-  "1f1e9-1f1ea": {
-    "aliases": [":de:"],
-    "code": "1f1e9-1f1ea",
-    "name": ":flag_de:"
-  },
-  "1f1e9-1f1ec": {
-    "aliases": [":dg:"],
-    "code": "1f1e9-1f1ec",
-    "name": ":flag_dg:"
-  },
-  "1f1e9-1f1ef": {
-    "aliases": [":dj:"],
-    "code": "1f1e9-1f1ef",
-    "name": ":flag_dj:"
-  },
-  "1f1e9-1f1f0": {
-    "aliases": [":dk:"],
-    "code": "1f1e9-1f1f0",
-    "name": ":flag_dk:"
-  },
-  "1f1e9-1f1f2": {
-    "aliases": [":dm:"],
-    "code": "1f1e9-1f1f2",
-    "name": ":flag_dm:"
-  },
-  "1f1e9-1f1f4": {
-    "aliases": [":do:"],
-    "code": "1f1e9-1f1f4",
-    "name": ":flag_do:"
-  },
-  "1f1e9-1f1ff": {
-    "aliases": [":dz:"],
-    "code": "1f1e9-1f1ff",
-    "name": ":flag_dz:"
-  },
-  "1f1ea": {
-    "aliases": [],
-    "code": "1f1ea",
-    "name": ":regional_indicator_e:"
-  },
-  "1f1ea-1f1e6": {
-    "aliases": [":ea:"],
-    "code": "1f1ea-1f1e6",
-    "name": ":flag_ea:"
-  },
-  "1f1ea-1f1e8": {
-    "aliases": [":ec:"],
-    "code": "1f1ea-1f1e8",
-    "name": ":flag_ec:"
-  },
-  "1f1ea-1f1ea": {
-    "aliases": [":ee:"],
-    "code": "1f1ea-1f1ea",
-    "name": ":flag_ee:"
-  },
-  "1f1ea-1f1ec": {
-    "aliases": [":eg:"],
-    "code": "1f1ea-1f1ec",
-    "name": ":flag_eg:"
-  },
-  "1f1ea-1f1ed": {
-    "aliases": [":eh:"],
-    "code": "1f1ea-1f1ed",
-    "name": ":flag_eh:"
-  },
-  "1f1ea-1f1f7": {
-    "aliases": [":er:"],
-    "code": "1f1ea-1f1f7",
-    "name": ":flag_er:"
-  },
-  "1f1ea-1f1f8": {
-    "aliases": [":es:"],
-    "code": "1f1ea-1f1f8",
-    "name": ":flag_es:"
-  },
-  "1f1ea-1f1f9": {
-    "aliases": [":et:"],
-    "code": "1f1ea-1f1f9",
-    "name": ":flag_et:"
-  },
-  "1f1ea-1f1fa": {
-    "aliases": [":eu:"],
-    "code": "1f1ea-1f1fa",
-    "name": ":flag_eu:"
-  },
-  "1f1eb": {
-    "aliases": [],
-    "code": "1f1eb",
-    "name": ":regional_indicator_f:"
-  },
-  "1f1eb-1f1ee": {
-    "aliases": [":fi:"],
-    "code": "1f1eb-1f1ee",
-    "name": ":flag_fi:"
-  },
-  "1f1eb-1f1ef": {
-    "aliases": [":fj:"],
-    "code": "1f1eb-1f1ef",
-    "name": ":flag_fj:"
-  },
-  "1f1eb-1f1f0": {
-    "aliases": [":fk:"],
-    "code": "1f1eb-1f1f0",
-    "name": ":flag_fk:"
-  },
-  "1f1eb-1f1f2": {
-    "aliases": [":fm:"],
-    "code": "1f1eb-1f1f2",
-    "name": ":flag_fm:"
-  },
-  "1f1eb-1f1f4": {
-    "aliases": [":fo:"],
-    "code": "1f1eb-1f1f4",
-    "name": ":flag_fo:"
-  },
-  "1f1eb-1f1f7": {
-    "aliases": [":fr:"],
-    "code": "1f1eb-1f1f7",
-    "name": ":flag_fr:"
-  },
-  "1f1ec": {
-    "aliases": [],
-    "code": "1f1ec",
-    "name": ":regional_indicator_g:"
-  },
-  "1f1ec-1f1e6": {
-    "aliases": [":ga:"],
-    "code": "1f1ec-1f1e6",
-    "name": ":flag_ga:"
-  },
-  "1f1ec-1f1e7": {
-    "aliases": [":gb:"],
-    "code": "1f1ec-1f1e7",
-    "name": ":flag_gb:"
-  },
-  "1f1ec-1f1e9": {
-    "aliases": [":gd:"],
-    "code": "1f1ec-1f1e9",
-    "name": ":flag_gd:"
-  },
-  "1f1ec-1f1ea": {
-    "aliases": [":ge:"],
-    "code": "1f1ec-1f1ea",
-    "name": ":flag_ge:"
-  },
-  "1f1ec-1f1eb": {
-    "aliases": [":gf:"],
-    "code": "1f1ec-1f1eb",
-    "name": ":flag_gf:"
-  },
-  "1f1ec-1f1ec": {
-    "aliases": [":gg:"],
-    "code": "1f1ec-1f1ec",
-    "name": ":flag_gg:"
-  },
-  "1f1ec-1f1ed": {
-    "aliases": [":gh:"],
-    "code": "1f1ec-1f1ed",
-    "name": ":flag_gh:"
-  },
-  "1f1ec-1f1ee": {
-    "aliases": [":gi:"],
-    "code": "1f1ec-1f1ee",
-    "name": ":flag_gi:"
-  },
-  "1f1ec-1f1f1": {
-    "aliases": [":gl:"],
-    "code": "1f1ec-1f1f1",
-    "name": ":flag_gl:"
-  },
-  "1f1ec-1f1f2": {
-    "aliases": [":gm:"],
-    "code": "1f1ec-1f1f2",
-    "name": ":flag_gm:"
-  },
-  "1f1ec-1f1f3": {
-    "aliases": [":gn:"],
-    "code": "1f1ec-1f1f3",
-    "name": ":flag_gn:"
-  },
-  "1f1ec-1f1f5": {
-    "aliases": [":gp:"],
-    "code": "1f1ec-1f1f5",
-    "name": ":flag_gp:"
-  },
-  "1f1ec-1f1f6": {
-    "aliases": [":gq:"],
-    "code": "1f1ec-1f1f6",
-    "name": ":flag_gq:"
-  },
-  "1f1ec-1f1f7": {
-    "aliases": [":gr:"],
-    "code": "1f1ec-1f1f7",
-    "name": ":flag_gr:"
-  },
-  "1f1ec-1f1f8": {
-    "aliases": [":gs:"],
-    "code": "1f1ec-1f1f8",
-    "name": ":flag_gs:"
-  },
-  "1f1ec-1f1f9": {
-    "aliases": [":gt:"],
-    "code": "1f1ec-1f1f9",
-    "name": ":flag_gt:"
-  },
-  "1f1ec-1f1fa": {
-    "aliases": [":gu:"],
-    "code": "1f1ec-1f1fa",
-    "name": ":flag_gu:"
-  },
-  "1f1ec-1f1fc": {
-    "aliases": [":gw:"],
-    "code": "1f1ec-1f1fc",
-    "name": ":flag_gw:"
-  },
-  "1f1ec-1f1fe": {
-    "aliases": [":gy:"],
-    "code": "1f1ec-1f1fe",
-    "name": ":flag_gy:"
-  },
-  "1f1ed": {
-    "aliases": [],
-    "code": "1f1ed",
-    "name": ":regional_indicator_h:"
-  },
-  "1f1ed-1f1f0": {
-    "aliases": [":hk:"],
-    "code": "1f1ed-1f1f0",
-    "name": ":flag_hk:"
-  },
-  "1f1ed-1f1f2": {
-    "aliases": [":hm:"],
-    "code": "1f1ed-1f1f2",
-    "name": ":flag_hm:"
-  },
-  "1f1ed-1f1f3": {
-    "aliases": [":hn:"],
-    "code": "1f1ed-1f1f3",
-    "name": ":flag_hn:"
-  },
-  "1f1ed-1f1f7": {
-    "aliases": [":hr:"],
-    "code": "1f1ed-1f1f7",
-    "name": ":flag_hr:"
-  },
-  "1f1ed-1f1f9": {
-    "aliases": [":ht:"],
-    "code": "1f1ed-1f1f9",
-    "name": ":flag_ht:"
-  },
-  "1f1ed-1f1fa": {
-    "aliases": [":hu:"],
-    "code": "1f1ed-1f1fa",
-    "name": ":flag_hu:"
-  },
-  "1f1ee": {
-    "aliases": [],
-    "code": "1f1ee",
-    "name": ":regional_indicator_i:"
-  },
-  "1f1ee-1f1e8": {
-    "aliases": [":ic:"],
-    "code": "1f1ee-1f1e8",
-    "name": ":flag_ic:"
-  },
-  "1f1ee-1f1e9": {
-    "aliases": [":indonesia:"],
-    "code": "1f1ee-1f1e9",
-    "name": ":flag_id:"
-  },
-  "1f1ee-1f1ea": {
-    "aliases": [":ie:"],
-    "code": "1f1ee-1f1ea",
-    "name": ":flag_ie:"
-  },
-  "1f1ee-1f1f1": {
-    "aliases": [":il:"],
-    "code": "1f1ee-1f1f1",
-    "name": ":flag_il:"
-  },
-  "1f1ee-1f1f2": {
-    "aliases": [":im:"],
-    "code": "1f1ee-1f1f2",
-    "name": ":flag_im:"
-  },
-  "1f1ee-1f1f3": {
-    "aliases": [":in:"],
-    "code": "1f1ee-1f1f3",
-    "name": ":flag_in:"
-  },
-  "1f1ee-1f1f4": {
-    "aliases": [":io:"],
-    "code": "1f1ee-1f1f4",
-    "name": ":flag_io:"
-  },
-  "1f1ee-1f1f6": {
-    "aliases": [":iq:"],
-    "code": "1f1ee-1f1f6",
-    "name": ":flag_iq:"
-  },
-  "1f1ee-1f1f7": {
-    "aliases": [":ir:"],
-    "code": "1f1ee-1f1f7",
-    "name": ":flag_ir:"
-  },
-  "1f1ee-1f1f8": {
-    "aliases": [":is:"],
-    "code": "1f1ee-1f1f8",
-    "name": ":flag_is:"
-  },
-  "1f1ee-1f1f9": {
-    "aliases": [":it:"],
-    "code": "1f1ee-1f1f9",
-    "name": ":flag_it:"
-  },
-  "1f1ef": {
-    "aliases": [],
-    "code": "1f1ef",
-    "name": ":regional_indicator_j:"
-  },
-  "1f1ef-1f1ea": {
-    "aliases": [":je:"],
-    "code": "1f1ef-1f1ea",
-    "name": ":flag_je:"
-  },
-  "1f1ef-1f1f2": {
-    "aliases": [":jm:"],
-    "code": "1f1ef-1f1f2",
-    "name": ":flag_jm:"
-  },
-  "1f1ef-1f1f4": {
-    "aliases": [":jo:"],
-    "code": "1f1ef-1f1f4",
-    "name": ":flag_jo:"
-  },
-  "1f1ef-1f1f5": {
-    "aliases": [":jp:"],
-    "code": "1f1ef-1f1f5",
-    "name": ":flag_jp:"
-  },
-  "1f1f0": {
-    "aliases": [],
-    "code": "1f1f0",
-    "name": ":regional_indicator_k:"
-  },
-  "1f1f0-1f1ea": {
-    "aliases": [":ke:"],
-    "code": "1f1f0-1f1ea",
-    "name": ":flag_ke:"
-  },
-  "1f1f0-1f1ec": {
-    "aliases": [":kg:"],
-    "code": "1f1f0-1f1ec",
-    "name": ":flag_kg:"
-  },
-  "1f1f0-1f1ed": {
-    "aliases": [":kh:"],
-    "code": "1f1f0-1f1ed",
-    "name": ":flag_kh:"
-  },
-  "1f1f0-1f1ee": {
-    "aliases": [":ki:"],
-    "code": "1f1f0-1f1ee",
-    "name": ":flag_ki:"
-  },
-  "1f1f0-1f1f2": {
-    "aliases": [":km:"],
-    "code": "1f1f0-1f1f2",
-    "name": ":flag_km:"
-  },
-  "1f1f0-1f1f3": {
-    "aliases": [":kn:"],
-    "code": "1f1f0-1f1f3",
-    "name": ":flag_kn:"
-  },
-  "1f1f0-1f1f5": {
-    "aliases": [":kp:"],
-    "code": "1f1f0-1f1f5",
-    "name": ":flag_kp:"
-  },
-  "1f1f0-1f1f7": {
-    "aliases": [":kr:"],
-    "code": "1f1f0-1f1f7",
-    "name": ":flag_kr:"
-  },
-  "1f1f0-1f1fc": {
-    "aliases": [":kw:"],
-    "code": "1f1f0-1f1fc",
-    "name": ":flag_kw:"
-  },
-  "1f1f0-1f1fe": {
-    "aliases": [":ky:"],
-    "code": "1f1f0-1f1fe",
-    "name": ":flag_ky:"
-  },
-  "1f1f0-1f1ff": {
-    "aliases": [":kz:"],
-    "code": "1f1f0-1f1ff",
-    "name": ":flag_kz:"
-  },
-  "1f1f1": {
-    "aliases": [],
-    "code": "1f1f1",
-    "name": ":regional_indicator_l:"
-  },
-  "1f1f1-1f1e6": {
-    "aliases": [":la:"],
-    "code": "1f1f1-1f1e6",
-    "name": ":flag_la:"
-  },
-  "1f1f1-1f1e7": {
-    "aliases": [":lb:"],
-    "code": "1f1f1-1f1e7",
-    "name": ":flag_lb:"
-  },
-  "1f1f1-1f1e8": {
-    "aliases": [":lc:"],
-    "code": "1f1f1-1f1e8",
-    "name": ":flag_lc:"
-  },
-  "1f1f1-1f1ee": {
-    "aliases": [":li:"],
-    "code": "1f1f1-1f1ee",
-    "name": ":flag_li:"
-  },
-  "1f1f1-1f1f0": {
-    "aliases": [":lk:"],
-    "code": "1f1f1-1f1f0",
-    "name": ":flag_lk:"
-  },
-  "1f1f1-1f1f7": {
-    "aliases": [":lr:"],
-    "code": "1f1f1-1f1f7",
-    "name": ":flag_lr:"
-  },
-  "1f1f1-1f1f8": {
-    "aliases": [":ls:"],
-    "code": "1f1f1-1f1f8",
-    "name": ":flag_ls:"
-  },
-  "1f1f1-1f1f9": {
-    "aliases": [":lt:"],
-    "code": "1f1f1-1f1f9",
-    "name": ":flag_lt:"
-  },
-  "1f1f1-1f1fa": {
-    "aliases": [":lu:"],
-    "code": "1f1f1-1f1fa",
-    "name": ":flag_lu:"
-  },
-  "1f1f1-1f1fb": {
-    "aliases": [":lv:"],
-    "code": "1f1f1-1f1fb",
-    "name": ":flag_lv:"
-  },
-  "1f1f1-1f1fe": {
-    "aliases": [":ly:"],
-    "code": "1f1f1-1f1fe",
-    "name": ":flag_ly:"
-  },
-  "1f1f2": {
-    "aliases": [],
-    "code": "1f1f2",
-    "name": ":regional_indicator_m:"
-  },
-  "1f1f2-1f1e6": {
-    "aliases": [":ma:"],
-    "code": "1f1f2-1f1e6",
-    "name": ":flag_ma:"
-  },
-  "1f1f2-1f1e8": {
-    "aliases": [":mc:"],
-    "code": "1f1f2-1f1e8",
-    "name": ":flag_mc:"
-  },
-  "1f1f2-1f1e9": {
-    "aliases": [":md:"],
-    "code": "1f1f2-1f1e9",
-    "name": ":flag_md:"
-  },
-  "1f1f2-1f1ea": {
-    "aliases": [":me:"],
-    "code": "1f1f2-1f1ea",
-    "name": ":flag_me:"
-  },
-  "1f1f2-1f1eb": {
-    "aliases": [":mf:"],
-    "code": "1f1f2-1f1eb",
-    "name": ":flag_mf:"
-  },
-  "1f1f2-1f1ec": {
-    "aliases": [":mg:"],
-    "code": "1f1f2-1f1ec",
-    "name": ":flag_mg:"
-  },
-  "1f1f2-1f1ed": {
-    "aliases": [":mh:"],
-    "code": "1f1f2-1f1ed",
-    "name": ":flag_mh:"
-  },
-  "1f1f2-1f1f0": {
-    "aliases": [":mk:"],
-    "code": "1f1f2-1f1f0",
-    "name": ":flag_mk:"
-  },
-  "1f1f2-1f1f1": {
-    "aliases": [":ml:"],
-    "code": "1f1f2-1f1f1",
-    "name": ":flag_ml:"
-  },
-  "1f1f2-1f1f2": {
-    "aliases": [":mm:"],
-    "code": "1f1f2-1f1f2",
-    "name": ":flag_mm:"
-  },
-  "1f1f2-1f1f3": {
-    "aliases": [":mn:"],
-    "code": "1f1f2-1f1f3",
-    "name": ":flag_mn:"
-  },
-  "1f1f2-1f1f4": {
-    "aliases": [":mo:"],
-    "code": "1f1f2-1f1f4",
-    "name": ":flag_mo:"
-  },
-  "1f1f2-1f1f5": {
-    "aliases": [":mp:"],
-    "code": "1f1f2-1f1f5",
-    "name": ":flag_mp:"
-  },
-  "1f1f2-1f1f6": {
-    "aliases": [":mq:"],
-    "code": "1f1f2-1f1f6",
-    "name": ":flag_mq:"
-  },
-  "1f1f2-1f1f7": {
-    "aliases": [":mr:"],
-    "code": "1f1f2-1f1f7",
-    "name": ":flag_mr:"
-  },
-  "1f1f2-1f1f8": {
-    "aliases": [":ms:"],
-    "code": "1f1f2-1f1f8",
-    "name": ":flag_ms:"
-  },
-  "1f1f2-1f1f9": {
-    "aliases": [":mt:"],
-    "code": "1f1f2-1f1f9",
-    "name": ":flag_mt:"
-  },
-  "1f1f2-1f1fa": {
-    "aliases": [":mu:"],
-    "code": "1f1f2-1f1fa",
-    "name": ":flag_mu:"
-  },
-  "1f1f2-1f1fb": {
-    "aliases": [":mv:"],
-    "code": "1f1f2-1f1fb",
-    "name": ":flag_mv:"
-  },
-  "1f1f2-1f1fc": {
-    "aliases": [":mw:"],
-    "code": "1f1f2-1f1fc",
-    "name": ":flag_mw:"
-  },
-  "1f1f2-1f1fd": {
-    "aliases": [":mx:"],
-    "code": "1f1f2-1f1fd",
-    "name": ":flag_mx:"
-  },
-  "1f1f2-1f1fe": {
-    "aliases": [":my:"],
-    "code": "1f1f2-1f1fe",
-    "name": ":flag_my:"
-  },
-  "1f1f2-1f1ff": {
-    "aliases": [":mz:"],
-    "code": "1f1f2-1f1ff",
-    "name": ":flag_mz:"
-  },
-  "1f1f3": {
-    "aliases": [],
-    "code": "1f1f3",
-    "name": ":regional_indicator_n:"
-  },
-  "1f1f3-1f1e6": {
-    "aliases": [":na:"],
-    "code": "1f1f3-1f1e6",
-    "name": ":flag_na:"
-  },
-  "1f1f3-1f1e8": {
-    "aliases": [":nc:"],
-    "code": "1f1f3-1f1e8",
-    "name": ":flag_nc:"
-  },
-  "1f1f3-1f1ea": {
-    "aliases": [":ne:"],
-    "code": "1f1f3-1f1ea",
-    "name": ":flag_ne:"
-  },
-  "1f1f3-1f1eb": {
-    "aliases": [":nf:"],
-    "code": "1f1f3-1f1eb",
-    "name": ":flag_nf:"
-  },
-  "1f1f3-1f1ec": {
-    "aliases": [":nigeria:"],
-    "code": "1f1f3-1f1ec",
-    "name": ":flag_ng:"
-  },
-  "1f1f3-1f1ee": {
-    "aliases": [":ni:"],
-    "code": "1f1f3-1f1ee",
-    "name": ":flag_ni:"
-  },
-  "1f1f3-1f1f1": {
-    "aliases": [":nl:"],
-    "code": "1f1f3-1f1f1",
-    "name": ":flag_nl:"
-  },
-  "1f1f3-1f1f4": {
-    "aliases": [":no:"],
-    "code": "1f1f3-1f1f4",
-    "name": ":flag_no:"
-  },
-  "1f1f3-1f1f5": {
-    "aliases": [":np:"],
-    "code": "1f1f3-1f1f5",
-    "name": ":flag_np:"
-  },
-  "1f1f3-1f1f7": {
-    "aliases": [":nr:"],
-    "code": "1f1f3-1f1f7",
-    "name": ":flag_nr:"
-  },
-  "1f1f3-1f1fa": {
-    "aliases": [":nu:"],
-    "code": "1f1f3-1f1fa",
-    "name": ":flag_nu:"
-  },
-  "1f1f3-1f1ff": {
-    "aliases": [":nz:"],
-    "code": "1f1f3-1f1ff",
-    "name": ":flag_nz:"
-  },
-  "1f1f4": {
-    "aliases": [],
-    "code": "1f1f4",
-    "name": ":regional_indicator_o:"
-  },
-  "1f1f4-1f1f2": {
-    "aliases": [":om:"],
-    "code": "1f1f4-1f1f2",
-    "name": ":flag_om:"
-  },
-  "1f1f5": {
-    "aliases": [],
-    "code": "1f1f5",
-    "name": ":regional_indicator_p:"
-  },
-  "1f1f5-1f1e6": {
-    "aliases": [":pa:"],
-    "code": "1f1f5-1f1e6",
-    "name": ":flag_pa:"
-  },
-  "1f1f5-1f1ea": {
-    "aliases": [":pe:"],
-    "code": "1f1f5-1f1ea",
-    "name": ":flag_pe:"
-  },
-  "1f1f5-1f1eb": {
-    "aliases": [":pf:"],
-    "code": "1f1f5-1f1eb",
-    "name": ":flag_pf:"
-  },
-  "1f1f5-1f1ec": {
-    "aliases": [":pg:"],
-    "code": "1f1f5-1f1ec",
-    "name": ":flag_pg:"
-  },
-  "1f1f5-1f1ed": {
-    "aliases": [":ph:"],
-    "code": "1f1f5-1f1ed",
-    "name": ":flag_ph:"
-  },
-  "1f1f5-1f1f0": {
-    "aliases": [":pk:"],
-    "code": "1f1f5-1f1f0",
-    "name": ":flag_pk:"
-  },
-  "1f1f5-1f1f1": {
-    "aliases": [":pl:"],
-    "code": "1f1f5-1f1f1",
-    "name": ":flag_pl:"
-  },
-  "1f1f5-1f1f2": {
-    "aliases": [":pm:"],
-    "code": "1f1f5-1f1f2",
-    "name": ":flag_pm:"
-  },
-  "1f1f5-1f1f3": {
-    "aliases": [":pn:"],
-    "code": "1f1f5-1f1f3",
-    "name": ":flag_pn:"
-  },
-  "1f1f5-1f1f7": {
-    "aliases": [":pr:"],
-    "code": "1f1f5-1f1f7",
-    "name": ":flag_pr:"
-  },
-  "1f1f5-1f1f8": {
-    "aliases": [":ps:"],
-    "code": "1f1f5-1f1f8",
-    "name": ":flag_ps:"
-  },
-  "1f1f5-1f1f9": {
-    "aliases": [":pt:"],
-    "code": "1f1f5-1f1f9",
-    "name": ":flag_pt:"
-  },
-  "1f1f5-1f1fc": {
-    "aliases": [":pw:"],
-    "code": "1f1f5-1f1fc",
-    "name": ":flag_pw:"
-  },
-  "1f1f5-1f1fe": {
-    "aliases": [":py:"],
-    "code": "1f1f5-1f1fe",
-    "name": ":flag_py:"
-  },
-  "1f1f6": {
-    "aliases": [],
-    "code": "1f1f6",
-    "name": ":regional_indicator_q:"
-  },
-  "1f1f6-1f1e6": {
-    "aliases": [":qa:"],
-    "code": "1f1f6-1f1e6",
-    "name": ":flag_qa:"
-  },
-  "1f1f7": {
-    "aliases": [],
-    "code": "1f1f7",
-    "name": ":regional_indicator_r:"
-  },
-  "1f1f7-1f1ea": {
-    "aliases": [":re:"],
-    "code": "1f1f7-1f1ea",
-    "name": ":flag_re:"
-  },
-  "1f1f7-1f1f4": {
-    "aliases": [":ro:"],
-    "code": "1f1f7-1f1f4",
-    "name": ":flag_ro:"
-  },
-  "1f1f7-1f1f8": {
-    "aliases": [":rs:"],
-    "code": "1f1f7-1f1f8",
-    "name": ":flag_rs:"
-  },
-  "1f1f7-1f1fa": {
-    "aliases": [":ru:"],
-    "code": "1f1f7-1f1fa",
-    "name": ":flag_ru:"
-  },
-  "1f1f7-1f1fc": {
-    "aliases": [":rw:"],
-    "code": "1f1f7-1f1fc",
-    "name": ":flag_rw:"
-  },
-  "1f1f8": {
-    "aliases": [],
-    "code": "1f1f8",
-    "name": ":regional_indicator_s:"
-  },
-  "1f1f8-1f1e6": {
-    "aliases": [":saudiarabia:", ":saudi:"],
-    "code": "1f1f8-1f1e6",
-    "name": ":flag_sa:"
-  },
-  "1f1f8-1f1e7": {
-    "aliases": [":sb:"],
-    "code": "1f1f8-1f1e7",
-    "name": ":flag_sb:"
-  },
-  "1f1f8-1f1e8": {
-    "aliases": [":sc:"],
-    "code": "1f1f8-1f1e8",
-    "name": ":flag_sc:"
-  },
-  "1f1f8-1f1e9": {
-    "aliases": [":sd:"],
-    "code": "1f1f8-1f1e9",
-    "name": ":flag_sd:"
-  },
-  "1f1f8-1f1ea": {
-    "aliases": [":se:"],
-    "code": "1f1f8-1f1ea",
-    "name": ":flag_se:"
-  },
-  "1f1f8-1f1ec": {
-    "aliases": [":sg:"],
-    "code": "1f1f8-1f1ec",
-    "name": ":flag_sg:"
-  },
-  "1f1f8-1f1ed": {
-    "aliases": [":sh:"],
-    "code": "1f1f8-1f1ed",
-    "name": ":flag_sh:"
-  },
-  "1f1f8-1f1ee": {
-    "aliases": [":si:"],
-    "code": "1f1f8-1f1ee",
-    "name": ":flag_si:"
-  },
-  "1f1f8-1f1ef": {
-    "aliases": [":sj:"],
-    "code": "1f1f8-1f1ef",
-    "name": ":flag_sj:"
-  },
-  "1f1f8-1f1f0": {
-    "aliases": [":sk:"],
-    "code": "1f1f8-1f1f0",
-    "name": ":flag_sk:"
-  },
-  "1f1f8-1f1f1": {
-    "aliases": [":sl:"],
-    "code": "1f1f8-1f1f1",
-    "name": ":flag_sl:"
-  },
-  "1f1f8-1f1f2": {
-    "aliases": [":sm:"],
-    "code": "1f1f8-1f1f2",
-    "name": ":flag_sm:"
-  },
-  "1f1f8-1f1f3": {
-    "aliases": [":sn:"],
-    "code": "1f1f8-1f1f3",
-    "name": ":flag_sn:"
-  },
-  "1f1f8-1f1f4": {
-    "aliases": [":so:"],
-    "code": "1f1f8-1f1f4",
-    "name": ":flag_so:"
-  },
-  "1f1f8-1f1f7": {
-    "aliases": [":sr:"],
-    "code": "1f1f8-1f1f7",
-    "name": ":flag_sr:"
-  },
-  "1f1f8-1f1f8": {
-    "aliases": [":ss:"],
-    "code": "1f1f8-1f1f8",
-    "name": ":flag_ss:"
-  },
-  "1f1f8-1f1f9": {
-    "aliases": [":st:"],
-    "code": "1f1f8-1f1f9",
-    "name": ":flag_st:"
-  },
-  "1f1f8-1f1fb": {
-    "aliases": [":sv:"],
-    "code": "1f1f8-1f1fb",
-    "name": ":flag_sv:"
-  },
-  "1f1f8-1f1fd": {
-    "aliases": [":sx:"],
-    "code": "1f1f8-1f1fd",
-    "name": ":flag_sx:"
-  },
-  "1f1f8-1f1fe": {
-    "aliases": [":sy:"],
-    "code": "1f1f8-1f1fe",
-    "name": ":flag_sy:"
-  },
-  "1f1f8-1f1ff": {
-    "aliases": [":sz:"],
-    "code": "1f1f8-1f1ff",
-    "name": ":flag_sz:"
-  },
-  "1f1f9": {
-    "aliases": [],
-    "code": "1f1f9",
-    "name": ":regional_indicator_t:"
-  },
-  "1f1f9-1f1e6": {
-    "aliases": [":ta:"],
-    "code": "1f1f9-1f1e6",
-    "name": ":flag_ta:"
-  },
-  "1f1f9-1f1e8": {
-    "aliases": [":tc:"],
-    "code": "1f1f9-1f1e8",
-    "name": ":flag_tc:"
-  },
-  "1f1f9-1f1e9": {
-    "aliases": [":td:"],
-    "code": "1f1f9-1f1e9",
-    "name": ":flag_td:"
-  },
-  "1f1f9-1f1eb": {
-    "aliases": [":tf:"],
-    "code": "1f1f9-1f1eb",
-    "name": ":flag_tf:"
-  },
-  "1f1f9-1f1ec": {
-    "aliases": [":tg:"],
-    "code": "1f1f9-1f1ec",
-    "name": ":flag_tg:"
-  },
-  "1f1f9-1f1ed": {
-    "aliases": [":th:"],
-    "code": "1f1f9-1f1ed",
-    "name": ":flag_th:"
-  },
-  "1f1f9-1f1ef": {
-    "aliases": [":tj:"],
-    "code": "1f1f9-1f1ef",
-    "name": ":flag_tj:"
-  },
-  "1f1f9-1f1f0": {
-    "aliases": [":tk:"],
-    "code": "1f1f9-1f1f0",
-    "name": ":flag_tk:"
-  },
-  "1f1f9-1f1f1": {
-    "aliases": [":tl:"],
-    "code": "1f1f9-1f1f1",
-    "name": ":flag_tl:"
-  },
-  "1f1f9-1f1f2": {
-    "aliases": [":turkmenistan:"],
-    "code": "1f1f9-1f1f2",
-    "name": ":flag_tm:"
-  },
-  "1f1f9-1f1f3": {
-    "aliases": [":tn:"],
-    "code": "1f1f9-1f1f3",
-    "name": ":flag_tn:"
-  },
-  "1f1f9-1f1f4": {
-    "aliases": [":to:"],
-    "code": "1f1f9-1f1f4",
-    "name": ":flag_to:"
-  },
-  "1f1f9-1f1f7": {
-    "aliases": [":tr:"],
-    "code": "1f1f9-1f1f7",
-    "name": ":flag_tr:"
-  },
-  "1f1f9-1f1f9": {
-    "aliases": [":tt:"],
-    "code": "1f1f9-1f1f9",
-    "name": ":flag_tt:"
-  },
-  "1f1f9-1f1fb": {
-    "aliases": [":tuvalu:"],
-    "code": "1f1f9-1f1fb",
-    "name": ":flag_tv:"
-  },
-  "1f1f9-1f1fc": {
-    "aliases": [":tw:"],
-    "code": "1f1f9-1f1fc",
-    "name": ":flag_tw:"
-  },
-  "1f1f9-1f1ff": {
-    "aliases": [":tz:"],
-    "code": "1f1f9-1f1ff",
-    "name": ":flag_tz:"
-  },
-  "1f1fa": {
-    "aliases": [],
-    "code": "1f1fa",
-    "name": ":regional_indicator_u:"
-  },
-  "1f1fa-1f1e6": {
-    "aliases": [":ua:"],
-    "code": "1f1fa-1f1e6",
-    "name": ":flag_ua:"
-  },
-  "1f1fa-1f1ec": {
-    "aliases": [":ug:"],
-    "code": "1f1fa-1f1ec",
-    "name": ":flag_ug:"
-  },
-  "1f1fa-1f1f2": {
-    "aliases": [":um:"],
-    "code": "1f1fa-1f1f2",
-    "name": ":flag_um:"
-  },
-  "1f1fa-1f1f3": {
-    "aliases": [],
-    "code": "1f1fa-1f1f3",
-    "name": ":united_nations:"
-  },
-  "1f1fa-1f1f8": {
-    "aliases": [":us:"],
-    "code": "1f1fa-1f1f8",
-    "name": ":flag_us:"
-  },
-  "1f1fa-1f1fe": {
-    "aliases": [":uy:"],
-    "code": "1f1fa-1f1fe",
-    "name": ":flag_uy:"
-  },
-  "1f1fa-1f1ff": {
-    "aliases": [":uz:"],
-    "code": "1f1fa-1f1ff",
-    "name": ":flag_uz:"
-  },
-  "1f1fb": {
-    "aliases": [],
-    "code": "1f1fb",
-    "name": ":regional_indicator_v:"
-  },
-  "1f1fb-1f1e6": {
-    "aliases": [":va:"],
-    "code": "1f1fb-1f1e6",
-    "name": ":flag_va:"
-  },
-  "1f1fb-1f1e8": {
-    "aliases": [":vc:"],
-    "code": "1f1fb-1f1e8",
-    "name": ":flag_vc:"
-  },
-  "1f1fb-1f1ea": {
-    "aliases": [":ve:"],
-    "code": "1f1fb-1f1ea",
-    "name": ":flag_ve:"
-  },
-  "1f1fb-1f1ec": {
-    "aliases": [":vg:"],
-    "code": "1f1fb-1f1ec",
-    "name": ":flag_vg:"
-  },
-  "1f1fb-1f1ee": {
-    "aliases": [":vi:"],
-    "code": "1f1fb-1f1ee",
-    "name": ":flag_vi:"
-  },
-  "1f1fb-1f1f3": {
-    "aliases": [":vn:"],
-    "code": "1f1fb-1f1f3",
-    "name": ":flag_vn:"
-  },
-  "1f1fb-1f1fa": {
-    "aliases": [":vu:"],
-    "code": "1f1fb-1f1fa",
-    "name": ":flag_vu:"
-  },
-  "1f1fc": {
-    "aliases": [],
-    "code": "1f1fc",
-    "name": ":regional_indicator_w:"
-  },
-  "1f1fc-1f1eb": {
-    "aliases": [":wf:"],
-    "code": "1f1fc-1f1eb",
-    "name": ":flag_wf:"
-  },
-  "1f1fc-1f1f8": {
-    "aliases": [":ws:"],
-    "code": "1f1fc-1f1f8",
-    "name": ":flag_ws:"
-  },
-  "1f1fd": {
-    "aliases": [],
-    "code": "1f1fd",
-    "name": ":regional_indicator_x:"
-  },
-  "1f1fd-1f1f0": {
-    "aliases": [":xk:"],
-    "code": "1f1fd-1f1f0",
-    "name": ":flag_xk:"
-  },
-  "1f1fe": {
-    "aliases": [],
-    "code": "1f1fe",
-    "name": ":regional_indicator_y:"
-  },
-  "1f1fe-1f1ea": {
-    "aliases": [":ye:"],
-    "code": "1f1fe-1f1ea",
-    "name": ":flag_ye:"
-  },
-  "1f1fe-1f1f9": {
-    "aliases": [":yt:"],
-    "code": "1f1fe-1f1f9",
-    "name": ":flag_yt:"
-  },
-  "1f1ff": {
-    "aliases": [],
-    "code": "1f1ff",
-    "name": ":regional_indicator_z:"
-  },
-  "1f1ff-1f1e6": {
-    "aliases": [":za:"],
-    "code": "1f1ff-1f1e6",
-    "name": ":flag_za:"
-  },
-  "1f1ff-1f1f2": {
-    "aliases": [":zm:"],
-    "code": "1f1ff-1f1f2",
-    "name": ":flag_zm:"
-  },
-  "1f1ff-1f1fc": {
-    "aliases": [":zw:"],
-    "code": "1f1ff-1f1fc",
-    "name": ":flag_zw:"
-  },
-  "1f201": {
-    "aliases": [],
-    "code": "1f201",
-    "name": ":koko:"
-  },
-  "1f202": {
-    "aliases": [],
-    "code": "1f202-fe0f",
-    "name": ":sa:"
-  },
-  "1f21a": {
-    "aliases": [],
-    "code": "1f21a",
-    "name": ":u7121:"
-  },
-  "1f22f": {
-    "aliases": [],
-    "code": "1f22f",
-    "name": ":u6307:"
-  },
-  "1f232": {
-    "aliases": [],
-    "code": "1f232",
-    "name": ":u7981:"
-  },
-  "1f233": {
-    "aliases": [],
-    "code": "1f233",
-    "name": ":u7a7a:"
-  },
-  "1f234": {
-    "aliases": [],
-    "code": "1f234",
-    "name": ":u5408:"
-  },
-  "1f235": {
-    "aliases": [],
-    "code": "1f235",
-    "name": ":u6e80:"
-  },
-  "1f236": {
-    "aliases": [],
-    "code": "1f236",
-    "name": ":u6709:"
-  },
-  "1f237": {
-    "aliases": [],
-    "code": "1f237-fe0f",
-    "name": ":u6708:"
-  },
-  "1f238": {
-    "aliases": [],
-    "code": "1f238",
-    "name": ":u7533:"
-  },
-  "1f239": {
-    "aliases": [],
-    "code": "1f239",
-    "name": ":u5272:"
-  },
-  "1f23a": {
-    "aliases": [],
-    "code": "1f23a",
-    "name": ":u55b6:"
-  },
-  "1f250": {
-    "aliases": [],
-    "code": "1f250",
-    "name": ":ideograph_advantage:"
-  },
-  "1f251": {
-    "aliases": [],
-    "code": "1f251",
-    "name": ":accept:"
-  },
-  "1f300": {
-    "aliases": [],
-    "code": "1f300",
-    "name": ":cyclone:"
-  },
-  "1f301": {
-    "aliases": [],
-    "code": "1f301",
-    "name": ":foggy:"
-  },
-  "1f302": {
-    "aliases": [],
-    "code": "1f302",
-    "name": ":closed_umbrella:"
-  },
-  "1f303": {
-    "aliases": [],
-    "code": "1f303",
-    "name": ":night_with_stars:"
-  },
-  "1f304": {
-    "aliases": [],
-    "code": "1f304",
-    "name": ":sunrise_over_mountains:"
-  },
-  "1f305": {
-    "aliases": [],
-    "code": "1f305",
-    "name": ":sunrise:"
-  },
-  "1f306": {
-    "aliases": [],
-    "code": "1f306",
-    "name": ":city_dusk:"
-  },
-  "1f307": {
-    "aliases": [":city_sunrise:"],
-    "code": "1f307",
-    "name": ":city_sunset:"
-  },
-  "1f308": {
-    "aliases": [],
-    "code": "1f308",
-    "name": ":rainbow:"
-  },
-  "1f309": {
-    "aliases": [],
-    "code": "1f309",
-    "name": ":bridge_at_night:"
-  },
-  "1f30a": {
-    "aliases": [],
-    "code": "1f30a",
-    "name": ":ocean:"
-  },
-  "1f30b": {
-    "aliases": [],
-    "code": "1f30b",
-    "name": ":volcano:"
-  },
-  "1f30c": {
-    "aliases": [],
-    "code": "1f30c",
-    "name": ":milky_way:"
-  },
-  "1f30d": {
-    "aliases": [],
-    "code": "1f30d",
-    "name": ":earth_africa:"
-  },
-  "1f30e": {
-    "aliases": [],
-    "code": "1f30e",
-    "name": ":earth_americas:"
-  },
-  "1f30f": {
-    "aliases": [],
-    "code": "1f30f",
-    "name": ":earth_asia:"
-  },
-  "1f310": {
-    "aliases": [],
-    "code": "1f310",
-    "name": ":globe_with_meridians:"
-  },
-  "1f311": {
-    "aliases": [],
-    "code": "1f311",
-    "name": ":new_moon:"
-  },
-  "1f312": {
-    "aliases": [],
-    "code": "1f312",
-    "name": ":waxing_crescent_moon:"
-  },
-  "1f313": {
-    "aliases": [],
-    "code": "1f313",
-    "name": ":first_quarter_moon:"
-  },
-  "1f314": {
-    "aliases": [],
-    "code": "1f314",
-    "name": ":waxing_gibbous_moon:"
-  },
-  "1f315": {
-    "aliases": [],
-    "code": "1f315",
-    "name": ":full_moon:"
-  },
-  "1f316": {
-    "aliases": [],
-    "code": "1f316",
-    "name": ":waning_gibbous_moon:"
-  },
-  "1f317": {
-    "aliases": [],
-    "code": "1f317",
-    "name": ":last_quarter_moon:"
-  },
-  "1f318": {
-    "aliases": [],
-    "code": "1f318",
-    "name": ":waning_crescent_moon:"
-  },
-  "1f319": {
-    "aliases": [],
-    "code": "1f319",
-    "name": ":crescent_moon:"
-  },
-  "1f31a": {
-    "aliases": [],
-    "code": "1f31a",
-    "name": ":new_moon_with_face:"
-  },
-  "1f31b": {
-    "aliases": [],
-    "code": "1f31b",
-    "name": ":first_quarter_moon_with_face:"
-  },
-  "1f31c": {
-    "aliases": [],
-    "code": "1f31c",
-    "name": ":last_quarter_moon_with_face:"
-  },
-  "1f31d": {
-    "aliases": [],
-    "code": "1f31d",
-    "name": ":full_moon_with_face:"
-  },
-  "1f31e": {
-    "aliases": [],
-    "code": "1f31e",
-    "name": ":sun_with_face:"
-  },
-  "1f31f": {
-    "aliases": [],
-    "code": "1f31f",
-    "name": ":star2:"
-  },
-  "1f320": {
-    "aliases": [],
-    "code": "1f320",
-    "name": ":stars:"
-  },
-  "1f321": {
-    "aliases": [],
-    "code": "1f321-fe0f",
-    "name": ":thermometer:"
-  },
-  "1f324": {
-    "aliases": [":white_sun_with_small_cloud:"],
-    "code": "1f324-fe0f",
-    "name": ":white_sun_small_cloud:"
-  },
-  "1f325": {
-    "aliases": [":white_sun_behind_cloud:"],
-    "code": "1f325-fe0f",
-    "name": ":white_sun_cloud:"
-  },
-  "1f326": {
-    "aliases": [":white_sun_behind_cloud_with_rain:"],
-    "code": "1f326-fe0f",
-    "name": ":white_sun_rain_cloud:"
-  },
-  "1f327": {
-    "aliases": [":cloud_with_rain:"],
-    "code": "1f327-fe0f",
-    "name": ":cloud_rain:"
-  },
-  "1f328": {
-    "aliases": [":cloud_with_snow:"],
-    "code": "1f328-fe0f",
-    "name": ":cloud_snow:"
-  },
-  "1f329": {
-    "aliases": [":cloud_with_lightning:"],
-    "code": "1f329-fe0f",
-    "name": ":cloud_lightning:"
-  },
-  "1f32a": {
-    "aliases": [":cloud_with_tornado:"],
-    "code": "1f32a-fe0f",
-    "name": ":cloud_tornado:"
-  },
-  "1f32b": {
-    "aliases": [],
-    "code": "1f32b-fe0f",
-    "name": ":fog:"
-  },
-  "1f32c": {
-    "aliases": [],
-    "code": "1f32c-fe0f",
-    "name": ":wind_blowing_face:"
-  },
-  "1f32d": {
-    "aliases": [":hot_dog:"],
-    "code": "1f32d",
-    "name": ":hotdog:"
-  },
-  "1f32e": {
-    "aliases": [],
-    "code": "1f32e",
-    "name": ":taco:"
-  },
-  "1f32f": {
-    "aliases": [],
-    "code": "1f32f",
-    "name": ":burrito:"
-  },
-  "1f330": {
-    "aliases": [],
-    "code": "1f330",
-    "name": ":chestnut:"
-  },
-  "1f331": {
-    "aliases": [],
-    "code": "1f331",
-    "name": ":seedling:"
-  },
-  "1f332": {
-    "aliases": [],
-    "code": "1f332",
-    "name": ":evergreen_tree:"
-  },
-  "1f333": {
-    "aliases": [],
-    "code": "1f333",
-    "name": ":deciduous_tree:"
-  },
-  "1f334": {
-    "aliases": [],
-    "code": "1f334",
-    "name": ":palm_tree:"
-  },
-  "1f335": {
-    "aliases": [],
-    "code": "1f335",
-    "name": ":cactus:"
-  },
-  "1f336": {
-    "aliases": [],
-    "code": "1f336-fe0f",
-    "name": ":hot_pepper:"
-  },
-  "1f337": {
-    "aliases": [],
-    "code": "1f337",
-    "name": ":tulip:"
-  },
-  "1f338": {
-    "aliases": [],
-    "code": "1f338",
-    "name": ":cherry_blossom:"
-  },
-  "1f339": {
-    "aliases": [],
-    "code": "1f339",
-    "name": ":rose:"
-  },
-  "1f33a": {
-    "aliases": [],
-    "code": "1f33a",
-    "name": ":hibiscus:"
-  },
-  "1f33b": {
-    "aliases": [],
-    "code": "1f33b",
-    "name": ":sunflower:"
-  },
-  "1f33c": {
-    "aliases": [],
-    "code": "1f33c",
-    "name": ":blossom:"
-  },
-  "1f33d": {
-    "aliases": [],
-    "code": "1f33d",
-    "name": ":corn:"
-  },
-  "1f33e": {
-    "aliases": [],
-    "code": "1f33e",
-    "name": ":ear_of_rice:"
-  },
-  "1f33f": {
-    "aliases": [],
-    "code": "1f33f",
-    "name": ":herb:"
-  },
-  "1f340": {
-    "aliases": [],
-    "code": "1f340",
-    "name": ":four_leaf_clover:"
-  },
-  "1f341": {
-    "aliases": [],
-    "code": "1f341",
-    "name": ":maple_leaf:"
-  },
-  "1f342": {
-    "aliases": [],
-    "code": "1f342",
-    "name": ":fallen_leaf:"
-  },
-  "1f343": {
-    "aliases": [],
-    "code": "1f343",
-    "name": ":leaves:"
-  },
-  "1f344": {
-    "aliases": [],
-    "code": "1f344",
-    "name": ":mushroom:"
-  },
-  "1f345": {
-    "aliases": [],
-    "code": "1f345",
-    "name": ":tomato:"
-  },
-  "1f346": {
-    "aliases": [],
-    "code": "1f346",
-    "name": ":eggplant:"
-  },
-  "1f347": {
-    "aliases": [],
-    "code": "1f347",
-    "name": ":grapes:"
-  },
-  "1f348": {
-    "aliases": [],
-    "code": "1f348",
-    "name": ":melon:"
-  },
-  "1f349": {
-    "aliases": [],
-    "code": "1f349",
-    "name": ":watermelon:"
-  },
-  "1f34a": {
-    "aliases": [],
-    "code": "1f34a",
-    "name": ":tangerine:"
-  },
-  "1f34b": {
-    "aliases": [],
-    "code": "1f34b",
-    "name": ":lemon:"
-  },
-  "1f34c": {
-    "aliases": [],
-    "code": "1f34c",
-    "name": ":banana:"
-  },
-  "1f34d": {
-    "aliases": [],
-    "code": "1f34d",
-    "name": ":pineapple:"
-  },
-  "1f34e": {
-    "aliases": [],
-    "code": "1f34e",
-    "name": ":apple:"
-  },
-  "1f34f": {
-    "aliases": [],
-    "code": "1f34f",
-    "name": ":green_apple:"
-  },
-  "1f350": {
-    "aliases": [],
-    "code": "1f350",
-    "name": ":pear:"
-  },
-  "1f351": {
-    "aliases": [],
-    "code": "1f351",
-    "name": ":peach:"
-  },
-  "1f352": {
-    "aliases": [],
-    "code": "1f352",
-    "name": ":cherries:"
-  },
-  "1f353": {
-    "aliases": [],
-    "code": "1f353",
-    "name": ":strawberry:"
-  },
-  "1f354": {
-    "aliases": [],
-    "code": "1f354",
-    "name": ":hamburger:"
-  },
-  "1f355": {
-    "aliases": [],
-    "code": "1f355",
-    "name": ":pizza:"
-  },
-  "1f356": {
-    "aliases": [],
-    "code": "1f356",
-    "name": ":meat_on_bone:"
-  },
-  "1f357": {
-    "aliases": [],
-    "code": "1f357",
-    "name": ":poultry_leg:"
-  },
-  "1f358": {
-    "aliases": [],
-    "code": "1f358",
-    "name": ":rice_cracker:"
-  },
-  "1f359": {
-    "aliases": [],
-    "code": "1f359",
-    "name": ":rice_ball:"
-  },
-  "1f35a": {
-    "aliases": [],
-    "code": "1f35a",
-    "name": ":rice:"
-  },
-  "1f35b": {
-    "aliases": [],
-    "code": "1f35b",
-    "name": ":curry:"
-  },
-  "1f35c": {
-    "aliases": [],
-    "code": "1f35c",
-    "name": ":ramen:"
-  },
-  "1f35d": {
-    "aliases": [],
-    "code": "1f35d",
-    "name": ":spaghetti:"
-  },
-  "1f35e": {
-    "aliases": [],
-    "code": "1f35e",
-    "name": ":bread:"
-  },
-  "1f35f": {
-    "aliases": [],
-    "code": "1f35f",
-    "name": ":fries:"
-  },
-  "1f360": {
-    "aliases": [],
-    "code": "1f360",
-    "name": ":sweet_potato:"
-  },
-  "1f361": {
-    "aliases": [],
-    "code": "1f361",
-    "name": ":dango:"
-  },
-  "1f362": {
-    "aliases": [],
-    "code": "1f362",
-    "name": ":oden:"
-  },
-  "1f363": {
-    "aliases": [],
-    "code": "1f363",
-    "name": ":sushi:"
-  },
-  "1f364": {
-    "aliases": [],
-    "code": "1f364",
-    "name": ":fried_shrimp:"
-  },
-  "1f365": {
-    "aliases": [],
-    "code": "1f365",
-    "name": ":fish_cake:"
-  },
-  "1f366": {
-    "aliases": [],
-    "code": "1f366",
-    "name": ":icecream:"
-  },
-  "1f367": {
-    "aliases": [],
-    "code": "1f367",
-    "name": ":shaved_ice:"
-  },
-  "1f368": {
-    "aliases": [],
-    "code": "1f368",
-    "name": ":ice_cream:"
-  },
-  "1f369": {
-    "aliases": [],
-    "code": "1f369",
-    "name": ":doughnut:"
-  },
-  "1f36a": {
-    "aliases": [],
-    "code": "1f36a",
-    "name": ":cookie:"
-  },
-  "1f36b": {
-    "aliases": [],
-    "code": "1f36b",
-    "name": ":chocolate_bar:"
-  },
-  "1f36c": {
-    "aliases": [],
-    "code": "1f36c",
-    "name": ":candy:"
-  },
-  "1f36d": {
-    "aliases": [],
-    "code": "1f36d",
-    "name": ":lollipop:"
-  },
-  "1f36e": {
-    "aliases": [":pudding:", ":flan:"],
-    "code": "1f36e",
-    "name": ":custard:"
-  },
-  "1f36f": {
-    "aliases": [],
-    "code": "1f36f",
-    "name": ":honey_pot:"
-  },
-  "1f370": {
-    "aliases": [],
-    "code": "1f370",
-    "name": ":cake:"
-  },
-  "1f371": {
-    "aliases": [],
-    "code": "1f371",
-    "name": ":bento:"
-  },
-  "1f372": {
-    "aliases": [],
-    "code": "1f372",
-    "name": ":stew:"
-  },
-  "1f373": {
-    "aliases": [],
-    "code": "1f373",
-    "name": ":cooking:"
-  },
-  "1f374": {
-    "aliases": [],
-    "code": "1f374",
-    "name": ":fork_and_knife:"
-  },
-  "1f375": {
-    "aliases": [],
-    "code": "1f375",
-    "name": ":tea:"
-  },
-  "1f376": {
-    "aliases": [],
-    "code": "1f376",
-    "name": ":sake:"
-  },
-  "1f377": {
-    "aliases": [],
-    "code": "1f377",
-    "name": ":wine_glass:"
-  },
-  "1f378": {
-    "aliases": [],
-    "code": "1f378",
-    "name": ":cocktail:"
-  },
-  "1f379": {
-    "aliases": [],
-    "code": "1f379",
-    "name": ":tropical_drink:"
-  },
-  "1f37a": {
-    "aliases": [],
-    "code": "1f37a",
-    "name": ":beer:"
-  },
-  "1f37b": {
-    "aliases": [],
-    "code": "1f37b",
-    "name": ":beers:"
-  },
-  "1f37c": {
-    "aliases": [],
-    "code": "1f37c",
-    "name": ":baby_bottle:"
-  },
-  "1f37d": {
-    "aliases": [":fork_and_knife_with_plate:"],
-    "code": "1f37d-fe0f",
-    "name": ":fork_knife_plate:"
-  },
-  "1f37e": {
-    "aliases": [":bottle_with_popping_cork:"],
-    "code": "1f37e",
-    "name": ":champagne:"
-  },
-  "1f37f": {
-    "aliases": [],
-    "code": "1f37f",
-    "name": ":popcorn:"
-  },
-  "1f380": {
-    "aliases": [],
-    "code": "1f380",
-    "name": ":ribbon:"
-  },
-  "1f381": {
-    "aliases": [],
-    "code": "1f381",
-    "name": ":gift:"
-  },
-  "1f382": {
-    "aliases": [],
-    "code": "1f382",
-    "name": ":birthday:"
-  },
-  "1f383": {
-    "aliases": [],
-    "code": "1f383",
-    "name": ":jack_o_lantern:"
-  },
-  "1f384": {
-    "aliases": [],
-    "code": "1f384",
-    "name": ":christmas_tree:"
-  },
-  "1f385": {
-    "aliases": [],
-    "code": "1f385",
-    "name": ":santa:"
-  },
-  "1f385-1f3fb": {
-    "aliases": [],
-    "code": "1f385-1f3fb",
-    "name": ":santa_tone1:"
-  },
-  "1f385-1f3fc": {
-    "aliases": [],
-    "code": "1f385-1f3fc",
-    "name": ":santa_tone2:"
-  },
-  "1f385-1f3fd": {
-    "aliases": [],
-    "code": "1f385-1f3fd",
-    "name": ":santa_tone3:"
-  },
-  "1f385-1f3fe": {
-    "aliases": [],
-    "code": "1f385-1f3fe",
-    "name": ":santa_tone4:"
-  },
-  "1f385-1f3ff": {
-    "aliases": [],
-    "code": "1f385-1f3ff",
-    "name": ":santa_tone5:"
-  },
-  "1f386": {
-    "aliases": [],
-    "code": "1f386",
-    "name": ":fireworks:"
-  },
-  "1f387": {
-    "aliases": [],
-    "code": "1f387",
-    "name": ":sparkler:"
-  },
-  "1f388": {
-    "aliases": [],
-    "code": "1f388",
-    "name": ":balloon:"
-  },
-  "1f389": {
-    "aliases": [],
-    "code": "1f389",
-    "name": ":tada:"
-  },
-  "1f38a": {
-    "aliases": [],
-    "code": "1f38a",
-    "name": ":confetti_ball:"
-  },
-  "1f38b": {
-    "aliases": [],
-    "code": "1f38b",
-    "name": ":tanabata_tree:"
-  },
-  "1f38c": {
-    "aliases": [],
-    "code": "1f38c",
-    "name": ":crossed_flags:"
-  },
-  "1f38d": {
-    "aliases": [],
-    "code": "1f38d",
-    "name": ":bamboo:"
-  },
-  "1f38e": {
-    "aliases": [],
-    "code": "1f38e",
-    "name": ":dolls:"
-  },
-  "1f38f": {
-    "aliases": [],
-    "code": "1f38f",
-    "name": ":flags:"
-  },
-  "1f390": {
-    "aliases": [],
-    "code": "1f390",
-    "name": ":wind_chime:"
-  },
-  "1f391": {
-    "aliases": [],
-    "code": "1f391",
-    "name": ":rice_scene:"
-  },
-  "1f392": {
-    "aliases": [],
-    "code": "1f392",
-    "name": ":school_satchel:"
-  },
-  "1f393": {
-    "aliases": [],
-    "code": "1f393",
-    "name": ":mortar_board:"
-  },
-  "1f396": {
-    "aliases": [],
-    "code": "1f396-fe0f",
-    "name": ":military_medal:"
-  },
-  "1f397": {
-    "aliases": [],
-    "code": "1f397-fe0f",
-    "name": ":reminder_ribbon:"
-  },
-  "1f399": {
-    "aliases": [":studio_microphone:"],
-    "code": "1f399-fe0f",
-    "name": ":microphone2:"
-  },
-  "1f39a": {
-    "aliases": [],
-    "code": "1f39a-fe0f",
-    "name": ":level_slider:"
-  },
-  "1f39b": {
-    "aliases": [],
-    "code": "1f39b-fe0f",
-    "name": ":control_knobs:"
-  },
-  "1f39e": {
-    "aliases": [],
-    "code": "1f39e-fe0f",
-    "name": ":film_frames:"
-  },
-  "1f39f": {
-    "aliases": [":admission_tickets:"],
-    "code": "1f39f-fe0f",
-    "name": ":tickets:"
-  },
-  "1f3a0": {
-    "aliases": [],
-    "code": "1f3a0",
-    "name": ":carousel_horse:"
-  },
-  "1f3a1": {
-    "aliases": [],
-    "code": "1f3a1",
-    "name": ":ferris_wheel:"
-  },
-  "1f3a2": {
-    "aliases": [],
-    "code": "1f3a2",
-    "name": ":roller_coaster:"
-  },
-  "1f3a3": {
-    "aliases": [],
-    "code": "1f3a3",
-    "name": ":fishing_pole_and_fish:"
-  },
-  "1f3a4": {
-    "aliases": [],
-    "code": "1f3a4",
-    "name": ":microphone:"
-  },
-  "1f3a5": {
-    "aliases": [],
-    "code": "1f3a5",
-    "name": ":movie_camera:"
-  },
-  "1f3a6": {
-    "aliases": [],
-    "code": "1f3a6",
-    "name": ":cinema:"
-  },
-  "1f3a7": {
-    "aliases": [],
-    "code": "1f3a7",
-    "name": ":headphones:"
-  },
-  "1f3a8": {
-    "aliases": [],
-    "code": "1f3a8",
-    "name": ":art:"
-  },
-  "1f3a9": {
-    "aliases": [],
-    "code": "1f3a9",
-    "name": ":tophat:"
-  },
-  "1f3aa": {
-    "aliases": [],
-    "code": "1f3aa",
-    "name": ":circus_tent:"
-  },
-  "1f3ab": {
-    "aliases": [],
-    "code": "1f3ab",
-    "name": ":ticket:"
-  },
-  "1f3ac": {
-    "aliases": [],
-    "code": "1f3ac",
-    "name": ":clapper:"
-  },
-  "1f3ad": {
-    "aliases": [],
-    "code": "1f3ad",
-    "name": ":performing_arts:"
-  },
-  "1f3ae": {
-    "aliases": [],
-    "code": "1f3ae",
-    "name": ":video_game:"
-  },
-  "1f3af": {
-    "aliases": [],
-    "code": "1f3af",
-    "name": ":dart:"
-  },
-  "1f3b0": {
-    "aliases": [],
-    "code": "1f3b0",
-    "name": ":slot_machine:"
-  },
-  "1f3b1": {
-    "aliases": [],
-    "code": "1f3b1",
-    "name": ":8ball:"
-  },
-  "1f3b2": {
-    "aliases": [],
-    "code": "1f3b2",
-    "name": ":game_die:"
-  },
-  "1f3b3": {
-    "aliases": [],
-    "code": "1f3b3",
-    "name": ":bowling:"
-  },
-  "1f3b4": {
-    "aliases": [],
-    "code": "1f3b4",
-    "name": ":flower_playing_cards:"
-  },
-  "1f3b5": {
-    "aliases": [],
-    "code": "1f3b5",
-    "name": ":musical_note:"
-  },
-  "1f3b6": {
-    "aliases": [],
-    "code": "1f3b6",
-    "name": ":notes:"
-  },
-  "1f3b7": {
-    "aliases": [],
-    "code": "1f3b7",
-    "name": ":saxophone:"
-  },
-  "1f3b8": {
-    "aliases": [],
-    "code": "1f3b8",
-    "name": ":guitar:"
-  },
-  "1f3b9": {
-    "aliases": [],
-    "code": "1f3b9",
-    "name": ":musical_keyboard:"
-  },
-  "1f3ba": {
-    "aliases": [],
-    "code": "1f3ba",
-    "name": ":trumpet:"
-  },
-  "1f3bb": {
-    "aliases": [],
-    "code": "1f3bb",
-    "name": ":violin:"
-  },
-  "1f3bc": {
-    "aliases": [],
-    "code": "1f3bc",
-    "name": ":musical_score:"
-  },
-  "1f3bd": {
-    "aliases": [],
-    "code": "1f3bd",
-    "name": ":running_shirt_with_sash:"
-  },
-  "1f3be": {
-    "aliases": [],
-    "code": "1f3be",
-    "name": ":tennis:"
-  },
-  "1f3bf": {
-    "aliases": [],
-    "code": "1f3bf",
-    "name": ":ski:"
-  },
-  "1f3c0": {
-    "aliases": [],
-    "code": "1f3c0",
-    "name": ":basketball:"
-  },
-  "1f3c1": {
-    "aliases": [],
-    "code": "1f3c1",
-    "name": ":checkered_flag:"
-  },
-  "1f3c2": {
-    "aliases": [],
-    "code": "1f3c2",
-    "name": ":snowboarder:"
-  },
-  "1f3c2-1f3fb": {
-    "aliases": [":snowboarder_light_skin_tone:"],
-    "code": "1f3c2-1f3fb",
-    "name": ":snowboarder_tone1:"
-  },
-  "1f3c2-1f3fc": {
-    "aliases": [":snowboarder_medium_light_skin_tone:"],
-    "code": "1f3c2-1f3fc",
-    "name": ":snowboarder_tone2:"
-  },
-  "1f3c2-1f3fd": {
-    "aliases": [":snowboarder_medium_skin_tone:"],
-    "code": "1f3c2-1f3fd",
-    "name": ":snowboarder_tone3:"
-  },
-  "1f3c2-1f3fe": {
-    "aliases": [":snowboarder_medium_dark_skin_tone:"],
-    "code": "1f3c2-1f3fe",
-    "name": ":snowboarder_tone4:"
-  },
-  "1f3c2-1f3ff": {
-    "aliases": [":snowboarder_dark_skin_tone:"],
-    "code": "1f3c2-1f3ff",
-    "name": ":snowboarder_tone5:"
-  },
-  "1f3c3": {
-    "aliases": [":runner:"],
-    "code": "1f3c3",
-    "name": ":person_running:"
-  },
-  "1f3c3-1f3fb": {
-    "aliases": [":runner_tone1:"],
-    "code": "1f3c3-1f3fb",
-    "name": ":person_running_tone1:"
-  },
-  "1f3c3-1f3fb-2640": {
-    "aliases": [":woman_running_light_skin_tone:"],
-    "code": "1f3c3-1f3fb-200d-2640-fe0f",
-    "name": ":woman_running_tone1:"
-  },
-  "1f3c3-1f3fb-2642": {
-    "aliases": [":man_running_light_skin_tone:"],
-    "code": "1f3c3-1f3fb-200d-2642-fe0f",
-    "name": ":man_running_tone1:"
-  },
-  "1f3c3-1f3fc": {
-    "aliases": [":runner_tone2:"],
-    "code": "1f3c3-1f3fc",
-    "name": ":person_running_tone2:"
-  },
-  "1f3c3-1f3fc-2640": {
-    "aliases": [":woman_running_medium_light_skin_tone:"],
-    "code": "1f3c3-1f3fc-200d-2640-fe0f",
-    "name": ":woman_running_tone2:"
-  },
-  "1f3c3-1f3fc-2642": {
-    "aliases": [":man_running_medium_light_skin_tone:"],
-    "code": "1f3c3-1f3fc-200d-2642-fe0f",
-    "name": ":man_running_tone2:"
-  },
-  "1f3c3-1f3fd": {
-    "aliases": [":runner_tone3:"],
-    "code": "1f3c3-1f3fd",
-    "name": ":person_running_tone3:"
-  },
-  "1f3c3-1f3fd-2640": {
-    "aliases": [":woman_running_medium_skin_tone:"],
-    "code": "1f3c3-1f3fd-200d-2640-fe0f",
-    "name": ":woman_running_tone3:"
-  },
-  "1f3c3-1f3fd-2642": {
-    "aliases": [":man_running_medium_skin_tone:"],
-    "code": "1f3c3-1f3fd-200d-2642-fe0f",
-    "name": ":man_running_tone3:"
-  },
-  "1f3c3-1f3fe": {
-    "aliases": [":runner_tone4:"],
-    "code": "1f3c3-1f3fe",
-    "name": ":person_running_tone4:"
-  },
-  "1f3c3-1f3fe-2640": {
-    "aliases": [":woman_running_medium_dark_skin_tone:"],
-    "code": "1f3c3-1f3fe-200d-2640-fe0f",
-    "name": ":woman_running_tone4:"
-  },
-  "1f3c3-1f3fe-2642": {
-    "aliases": [":man_running_medium_dark_skin_tone:"],
-    "code": "1f3c3-1f3fe-200d-2642-fe0f",
-    "name": ":man_running_tone4:"
-  },
-  "1f3c3-1f3ff": {
-    "aliases": [":runner_tone5:"],
-    "code": "1f3c3-1f3ff",
-    "name": ":person_running_tone5:"
-  },
-  "1f3c3-1f3ff-2640": {
-    "aliases": [":woman_running_dark_skin_tone:"],
-    "code": "1f3c3-1f3ff-200d-2640-fe0f",
-    "name": ":woman_running_tone5:"
-  },
-  "1f3c3-1f3ff-2642": {
-    "aliases": [":man_running_dark_skin_tone:"],
-    "code": "1f3c3-1f3ff-200d-2642-fe0f",
-    "name": ":man_running_tone5:"
-  },
-  "1f3c3-2640": {
-    "aliases": [],
-    "code": "1f3c3-200d-2640-fe0f",
-    "name": ":woman_running:"
-  },
-  "1f3c3-2642": {
-    "aliases": [],
-    "code": "1f3c3-200d-2642-fe0f",
-    "name": ":man_running:"
-  },
-  "1f3c4": {
-    "aliases": [":surfer:"],
-    "code": "1f3c4",
-    "name": ":person_surfing:"
-  },
-  "1f3c4-1f3fb": {
-    "aliases": [":surfer_tone1:"],
-    "code": "1f3c4-1f3fb",
-    "name": ":person_surfing_tone1:"
-  },
-  "1f3c4-1f3fb-2640": {
-    "aliases": [":woman_surfing_light_skin_tone:"],
-    "code": "1f3c4-1f3fb-200d-2640-fe0f",
-    "name": ":woman_surfing_tone1:"
-  },
-  "1f3c4-1f3fb-2642": {
-    "aliases": [":man_surfing_light_skin_tone:"],
-    "code": "1f3c4-1f3fb-200d-2642-fe0f",
-    "name": ":man_surfing_tone1:"
-  },
-  "1f3c4-1f3fc": {
-    "aliases": [":surfer_tone2:"],
-    "code": "1f3c4-1f3fc",
-    "name": ":person_surfing_tone2:"
-  },
-  "1f3c4-1f3fc-2640": {
-    "aliases": [":woman_surfing_medium_light_skin_tone:"],
-    "code": "1f3c4-1f3fc-200d-2640-fe0f",
-    "name": ":woman_surfing_tone2:"
-  },
-  "1f3c4-1f3fc-2642": {
-    "aliases": [":man_surfing_medium_light_skin_tone:"],
-    "code": "1f3c4-1f3fc-200d-2642-fe0f",
-    "name": ":man_surfing_tone2:"
-  },
-  "1f3c4-1f3fd": {
-    "aliases": [":surfer_tone3:"],
-    "code": "1f3c4-1f3fd",
-    "name": ":person_surfing_tone3:"
-  },
-  "1f3c4-1f3fd-2640": {
-    "aliases": [":woman_surfing_medium_skin_tone:"],
-    "code": "1f3c4-1f3fd-200d-2640-fe0f",
-    "name": ":woman_surfing_tone3:"
-  },
-  "1f3c4-1f3fd-2642": {
-    "aliases": [":man_surfing_medium_skin_tone:"],
-    "code": "1f3c4-1f3fd-200d-2642-fe0f",
-    "name": ":man_surfing_tone3:"
-  },
-  "1f3c4-1f3fe": {
-    "aliases": [":surfer_tone4:"],
-    "code": "1f3c4-1f3fe",
-    "name": ":person_surfing_tone4:"
-  },
-  "1f3c4-1f3fe-2640": {
-    "aliases": [":woman_surfing_medium_dark_skin_tone:"],
-    "code": "1f3c4-1f3fe-200d-2640-fe0f",
-    "name": ":woman_surfing_tone4:"
-  },
-  "1f3c4-1f3fe-2642": {
-    "aliases": [":man_surfing_medium_dark_skin_tone:"],
-    "code": "1f3c4-1f3fe-200d-2642-fe0f",
-    "name": ":man_surfing_tone4:"
-  },
-  "1f3c4-1f3ff": {
-    "aliases": [":surfer_tone5:"],
-    "code": "1f3c4-1f3ff",
-    "name": ":person_surfing_tone5:"
-  },
-  "1f3c4-1f3ff-2640": {
-    "aliases": [":woman_surfing_dark_skin_tone:"],
-    "code": "1f3c4-1f3ff-200d-2640-fe0f",
-    "name": ":woman_surfing_tone5:"
-  },
-  "1f3c4-1f3ff-2642": {
-    "aliases": [":man_surfing_dark_skin_tone:"],
-    "code": "1f3c4-1f3ff-200d-2642-fe0f",
-    "name": ":man_surfing_tone5:"
-  },
-  "1f3c4-2640": {
-    "aliases": [],
-    "code": "1f3c4-200d-2640-fe0f",
-    "name": ":woman_surfing:"
-  },
-  "1f3c4-2642": {
-    "aliases": [],
-    "code": "1f3c4-200d-2642-fe0f",
-    "name": ":man_surfing:"
-  },
-  "1f3c5": {
-    "aliases": [":sports_medal:"],
-    "code": "1f3c5",
-    "name": ":medal:"
-  },
-  "1f3c6": {
-    "aliases": [],
-    "code": "1f3c6",
-    "name": ":trophy:"
-  },
-  "1f3c7": {
-    "aliases": [],
-    "code": "1f3c7",
-    "name": ":horse_racing:"
-  },
-  "1f3c7-1f3fb": {
-    "aliases": [],
-    "code": "1f3c7-1f3fb",
-    "name": ":horse_racing_tone1:"
-  },
-  "1f3c7-1f3fc": {
-    "aliases": [],
-    "code": "1f3c7-1f3fc",
-    "name": ":horse_racing_tone2:"
-  },
-  "1f3c7-1f3fd": {
-    "aliases": [],
-    "code": "1f3c7-1f3fd",
-    "name": ":horse_racing_tone3:"
-  },
-  "1f3c7-1f3fe": {
-    "aliases": [],
-    "code": "1f3c7-1f3fe",
-    "name": ":horse_racing_tone4:"
-  },
-  "1f3c7-1f3ff": {
-    "aliases": [],
-    "code": "1f3c7-1f3ff",
-    "name": ":horse_racing_tone5:"
-  },
-  "1f3c8": {
-    "aliases": [],
-    "code": "1f3c8",
-    "name": ":football:"
-  },
-  "1f3c9": {
-    "aliases": [],
-    "code": "1f3c9",
-    "name": ":rugby_football:"
-  },
-  "1f3ca": {
-    "aliases": [":swimmer:"],
-    "code": "1f3ca",
-    "name": ":person_swimming:"
-  },
-  "1f3ca-1f3fb": {
-    "aliases": [":swimmer_tone1:"],
-    "code": "1f3ca-1f3fb",
-    "name": ":person_swimming_tone1:"
-  },
-  "1f3ca-1f3fb-2640": {
-    "aliases": [":woman_swimming_light_skin_tone:"],
-    "code": "1f3ca-1f3fb-200d-2640-fe0f",
-    "name": ":woman_swimming_tone1:"
-  },
-  "1f3ca-1f3fb-2642": {
-    "aliases": [":man_swimming_light_skin_tone:"],
-    "code": "1f3ca-1f3fb-200d-2642-fe0f",
-    "name": ":man_swimming_tone1:"
-  },
-  "1f3ca-1f3fc": {
-    "aliases": [":swimmer_tone2:"],
-    "code": "1f3ca-1f3fc",
-    "name": ":person_swimming_tone2:"
-  },
-  "1f3ca-1f3fc-2640": {
-    "aliases": [":woman_swimming_medium_light_skin_tone:"],
-    "code": "1f3ca-1f3fc-200d-2640-fe0f",
-    "name": ":woman_swimming_tone2:"
-  },
-  "1f3ca-1f3fc-2642": {
-    "aliases": [":man_swimming_medium_light_skin_tone:"],
-    "code": "1f3ca-1f3fc-200d-2642-fe0f",
-    "name": ":man_swimming_tone2:"
-  },
-  "1f3ca-1f3fd": {
-    "aliases": [":swimmer_tone3:"],
-    "code": "1f3ca-1f3fd",
-    "name": ":person_swimming_tone3:"
-  },
-  "1f3ca-1f3fd-2640": {
-    "aliases": [":woman_swimming_medium_skin_tone:"],
-    "code": "1f3ca-1f3fd-200d-2640-fe0f",
-    "name": ":woman_swimming_tone3:"
-  },
-  "1f3ca-1f3fd-2642": {
-    "aliases": [":man_swimming_medium_skin_tone:"],
-    "code": "1f3ca-1f3fd-200d-2642-fe0f",
-    "name": ":man_swimming_tone3:"
-  },
-  "1f3ca-1f3fe": {
-    "aliases": [":swimmer_tone4:"],
-    "code": "1f3ca-1f3fe",
-    "name": ":person_swimming_tone4:"
-  },
-  "1f3ca-1f3fe-2640": {
-    "aliases": [":woman_swimming_medium_dark_skin_tone:"],
-    "code": "1f3ca-1f3fe-200d-2640-fe0f",
-    "name": ":woman_swimming_tone4:"
-  },
-  "1f3ca-1f3fe-2642": {
-    "aliases": [":man_swimming_medium_dark_skin_tone:"],
-    "code": "1f3ca-1f3fe-200d-2642-fe0f",
-    "name": ":man_swimming_tone4:"
-  },
-  "1f3ca-1f3ff": {
-    "aliases": [":swimmer_tone5:"],
-    "code": "1f3ca-1f3ff",
-    "name": ":person_swimming_tone5:"
-  },
-  "1f3ca-1f3ff-2640": {
-    "aliases": [":woman_swimming_dark_skin_tone:"],
-    "code": "1f3ca-1f3ff-200d-2640-fe0f",
-    "name": ":woman_swimming_tone5:"
-  },
-  "1f3ca-1f3ff-2642": {
-    "aliases": [":man_swimming_dark_skin_tone:"],
-    "code": "1f3ca-1f3ff-200d-2642-fe0f",
-    "name": ":man_swimming_tone5:"
-  },
-  "1f3ca-2640": {
-    "aliases": [],
-    "code": "1f3ca-200d-2640-fe0f",
-    "name": ":woman_swimming:"
-  },
-  "1f3ca-2642": {
-    "aliases": [],
-    "code": "1f3ca-200d-2642-fe0f",
-    "name": ":man_swimming:"
-  },
-  "1f3cb": {
-    "aliases": [":lifter:", ":weight_lifter:"],
-    "code": "1f3cb",
-    "name": ":person_lifting_weights:"
-  },
-  "1f3cb-1f3fb": {
-    "aliases": [":lifter_tone1:", ":weight_lifter_tone1:"],
-    "code": "1f3cb-1f3fb",
-    "name": ":person_lifting_weights_tone1:"
-  },
-  "1f3cb-1f3fb-2640": {
-    "aliases": [":woman_lifting_weights_light_skin_tone:"],
-    "code": "1f3cb-1f3fb-200d-2640-fe0f",
-    "name": ":woman_lifting_weights_tone1:"
-  },
-  "1f3cb-1f3fb-2642": {
-    "aliases": [":man_lifting_weights_light_skin_tone:"],
-    "code": "1f3cb-1f3fb-200d-2642-fe0f",
-    "name": ":man_lifting_weights_tone1:"
-  },
-  "1f3cb-1f3fc": {
-    "aliases": [":lifter_tone2:", ":weight_lifter_tone2:"],
-    "code": "1f3cb-1f3fc",
-    "name": ":person_lifting_weights_tone2:"
-  },
-  "1f3cb-1f3fc-2640": {
-    "aliases": [":woman_lifting_weights_medium_light_skin_tone:"],
-    "code": "1f3cb-1f3fc-200d-2640-fe0f",
-    "name": ":woman_lifting_weights_tone2:"
-  },
-  "1f3cb-1f3fc-2642": {
-    "aliases": [":man_lifting_weights_medium_light_skin_tone:"],
-    "code": "1f3cb-1f3fc-200d-2642-fe0f",
-    "name": ":man_lifting_weights_tone2:"
-  },
-  "1f3cb-1f3fd": {
-    "aliases": [":lifter_tone3:", ":weight_lifter_tone3:"],
-    "code": "1f3cb-1f3fd",
-    "name": ":person_lifting_weights_tone3:"
-  },
-  "1f3cb-1f3fd-2640": {
-    "aliases": [":woman_lifting_weights_medium_skin_tone:"],
-    "code": "1f3cb-1f3fd-200d-2640-fe0f",
-    "name": ":woman_lifting_weights_tone3:"
-  },
-  "1f3cb-1f3fd-2642": {
-    "aliases": [":man_lifting_weights_medium_skin_tone:"],
-    "code": "1f3cb-1f3fd-200d-2642-fe0f",
-    "name": ":man_lifting_weights_tone3:"
-  },
-  "1f3cb-1f3fe": {
-    "aliases": [":lifter_tone4:", ":weight_lifter_tone4:"],
-    "code": "1f3cb-1f3fe",
-    "name": ":person_lifting_weights_tone4:"
-  },
-  "1f3cb-1f3fe-2640": {
-    "aliases": [":woman_lifting_weights_medium_dark_skin_tone:"],
-    "code": "1f3cb-1f3fe-200d-2640-fe0f",
-    "name": ":woman_lifting_weights_tone4:"
-  },
-  "1f3cb-1f3fe-2642": {
-    "aliases": [":man_lifting_weights_medium_dark_skin_tone:"],
-    "code": "1f3cb-1f3fe-200d-2642-fe0f",
-    "name": ":man_lifting_weights_tone4:"
-  },
-  "1f3cb-1f3ff": {
-    "aliases": [":lifter_tone5:", ":weight_lifter_tone5:"],
-    "code": "1f3cb-1f3ff",
-    "name": ":person_lifting_weights_tone5:"
-  },
-  "1f3cb-1f3ff-2640": {
-    "aliases": [":woman_lifting_weights_dark_skin_tone:"],
-    "code": "1f3cb-1f3ff-200d-2640-fe0f",
-    "name": ":woman_lifting_weights_tone5:"
-  },
-  "1f3cb-1f3ff-2642": {
-    "aliases": [":man_lifting_weights_dark_skin_tone:"],
-    "code": "1f3cb-1f3ff-200d-2642-fe0f",
-    "name": ":man_lifting_weights_tone5:"
-  },
-  "1f3cb-2640": {
-    "aliases": [],
-    "code": "1f3cb-fe0f-200d-2640-fe0f",
-    "name": ":woman_lifting_weights:"
-  },
-  "1f3cb-2642": {
-    "aliases": [],
-    "code": "1f3cb-fe0f-200d-2642-fe0f",
-    "name": ":man_lifting_weights:"
-  },
-  "1f3cc": {
-    "aliases": [":golfer:"],
-    "code": "1f3cc",
-    "name": ":person_golfing:"
-  },
-  "1f3cc-1f3fb": {
-    "aliases": [":person_golfing_light_skin_tone:"],
-    "code": "1f3cc-1f3fb",
-    "name": ":person_golfing_tone1:"
-  },
-  "1f3cc-1f3fb-2640": {
-    "aliases": [":woman_golfing_light_skin_tone:"],
-    "code": "1f3cc-1f3fb-200d-2640-fe0f",
-    "name": ":woman_golfing_tone1:"
-  },
-  "1f3cc-1f3fb-2642": {
-    "aliases": [":man_golfing_light_skin_tone:"],
-    "code": "1f3cc-1f3fb-200d-2642-fe0f",
-    "name": ":man_golfing_tone1:"
-  },
-  "1f3cc-1f3fc": {
-    "aliases": [":person_golfing_medium_light_skin_tone:"],
-    "code": "1f3cc-1f3fc",
-    "name": ":person_golfing_tone2:"
-  },
-  "1f3cc-1f3fc-2640": {
-    "aliases": [":woman_golfing_medium_light_skin_tone:"],
-    "code": "1f3cc-1f3fc-200d-2640-fe0f",
-    "name": ":woman_golfing_tone2:"
-  },
-  "1f3cc-1f3fc-2642": {
-    "aliases": [":man_golfing_medium_light_skin_tone:"],
-    "code": "1f3cc-1f3fc-200d-2642-fe0f",
-    "name": ":man_golfing_tone2:"
-  },
-  "1f3cc-1f3fd": {
-    "aliases": [":person_golfing_medium_skin_tone:"],
-    "code": "1f3cc-1f3fd",
-    "name": ":person_golfing_tone3:"
-  },
-  "1f3cc-1f3fd-2640": {
-    "aliases": [":woman_golfing_medium_skin_tone:"],
-    "code": "1f3cc-1f3fd-200d-2640-fe0f",
-    "name": ":woman_golfing_tone3:"
-  },
-  "1f3cc-1f3fd-2642": {
-    "aliases": [":man_golfing_medium_skin_tone:"],
-    "code": "1f3cc-1f3fd-200d-2642-fe0f",
-    "name": ":man_golfing_tone3:"
-  },
-  "1f3cc-1f3fe": {
-    "aliases": [":person_golfing_medium_dark_skin_tone:"],
-    "code": "1f3cc-1f3fe",
-    "name": ":person_golfing_tone4:"
-  },
-  "1f3cc-1f3fe-2640": {
-    "aliases": [":woman_golfing_medium_dark_skin_tone:"],
-    "code": "1f3cc-1f3fe-200d-2640-fe0f",
-    "name": ":woman_golfing_tone4:"
-  },
-  "1f3cc-1f3fe-2642": {
-    "aliases": [":man_golfing_medium_dark_skin_tone:"],
-    "code": "1f3cc-1f3fe-200d-2642-fe0f",
-    "name": ":man_golfing_tone4:"
-  },
-  "1f3cc-1f3ff": {
-    "aliases": [":person_golfing_dark_skin_tone:"],
-    "code": "1f3cc-1f3ff",
-    "name": ":person_golfing_tone5:"
-  },
-  "1f3cc-1f3ff-2640": {
-    "aliases": [":woman_golfing_dark_skin_tone:"],
-    "code": "1f3cc-1f3ff-200d-2640-fe0f",
-    "name": ":woman_golfing_tone5:"
-  },
-  "1f3cc-1f3ff-2642": {
-    "aliases": [":man_golfing_dark_skin_tone:"],
-    "code": "1f3cc-1f3ff-200d-2642-fe0f",
-    "name": ":man_golfing_tone5:"
-  },
-  "1f3cc-2640": {
-    "aliases": [],
-    "code": "1f3cc-fe0f-200d-2640-fe0f",
-    "name": ":woman_golfing:"
-  },
-  "1f3cc-2642": {
-    "aliases": [],
-    "code": "1f3cc-fe0f-200d-2642-fe0f",
-    "name": ":man_golfing:"
-  },
-  "1f3cd": {
-    "aliases": [":racing_motorcycle:"],
-    "code": "1f3cd-fe0f",
-    "name": ":motorcycle:"
-  },
-  "1f3ce": {
-    "aliases": [":racing_car:"],
-    "code": "1f3ce-fe0f",
-    "name": ":race_car:"
-  },
-  "1f3cf": {
-    "aliases": [":cricket_bat_ball:"],
-    "code": "1f3cf",
-    "name": ":cricket_game:"
-  },
-  "1f3d0": {
-    "aliases": [],
-    "code": "1f3d0",
-    "name": ":volleyball:"
-  },
-  "1f3d1": {
-    "aliases": [],
-    "code": "1f3d1",
-    "name": ":field_hockey:"
-  },
-  "1f3d2": {
-    "aliases": [],
-    "code": "1f3d2",
-    "name": ":hockey:"
-  },
-  "1f3d3": {
-    "aliases": [":table_tennis:"],
-    "code": "1f3d3",
-    "name": ":ping_pong:"
-  },
-  "1f3d4": {
-    "aliases": [":snow_capped_mountain:"],
-    "code": "1f3d4-fe0f",
-    "name": ":mountain_snow:"
-  },
-  "1f3d5": {
-    "aliases": [],
-    "code": "1f3d5-fe0f",
-    "name": ":camping:"
-  },
-  "1f3d6": {
-    "aliases": [":beach_with_umbrella:"],
-    "code": "1f3d6-fe0f",
-    "name": ":beach:"
-  },
-  "1f3d7": {
-    "aliases": [":building_construction:"],
-    "code": "1f3d7-fe0f",
-    "name": ":construction_site:"
-  },
-  "1f3d8": {
-    "aliases": [":house_buildings:"],
-    "code": "1f3d8-fe0f",
-    "name": ":homes:"
-  },
-  "1f3d9": {
-    "aliases": [],
-    "code": "1f3d9-fe0f",
-    "name": ":cityscape:"
-  },
-  "1f3da": {
-    "aliases": [":derelict_house_building:"],
-    "code": "1f3da-fe0f",
-    "name": ":house_abandoned:"
-  },
-  "1f3db": {
-    "aliases": [],
-    "code": "1f3db-fe0f",
-    "name": ":classical_building:"
-  },
-  "1f3dc": {
-    "aliases": [],
-    "code": "1f3dc-fe0f",
-    "name": ":desert:"
-  },
-  "1f3dd": {
-    "aliases": [":desert_island:"],
-    "code": "1f3dd-fe0f",
-    "name": ":island:"
-  },
-  "1f3de": {
-    "aliases": [":national_park:"],
-    "code": "1f3de-fe0f",
-    "name": ":park:"
-  },
-  "1f3df": {
-    "aliases": [],
-    "code": "1f3df-fe0f",
-    "name": ":stadium:"
-  },
-  "1f3e0": {
-    "aliases": [],
-    "code": "1f3e0",
-    "name": ":house:"
-  },
-  "1f3e1": {
-    "aliases": [],
-    "code": "1f3e1",
-    "name": ":house_with_garden:"
-  },
-  "1f3e2": {
-    "aliases": [],
-    "code": "1f3e2",
-    "name": ":office:"
-  },
-  "1f3e3": {
-    "aliases": [],
-    "code": "1f3e3",
-    "name": ":post_office:"
-  },
-  "1f3e4": {
-    "aliases": [],
-    "code": "1f3e4",
-    "name": ":european_post_office:"
-  },
-  "1f3e5": {
-    "aliases": [],
-    "code": "1f3e5",
-    "name": ":hospital:"
-  },
-  "1f3e6": {
-    "aliases": [],
-    "code": "1f3e6",
-    "name": ":bank:"
-  },
-  "1f3e7": {
-    "aliases": [],
-    "code": "1f3e7",
-    "name": ":atm:"
-  },
-  "1f3e8": {
-    "aliases": [],
-    "code": "1f3e8",
-    "name": ":hotel:"
-  },
-  "1f3e9": {
-    "aliases": [],
-    "code": "1f3e9",
-    "name": ":love_hotel:"
-  },
-  "1f3ea": {
-    "aliases": [],
-    "code": "1f3ea",
-    "name": ":convenience_store:"
-  },
-  "1f3eb": {
-    "aliases": [],
-    "code": "1f3eb",
-    "name": ":school:"
-  },
-  "1f3ec": {
-    "aliases": [],
-    "code": "1f3ec",
-    "name": ":department_store:"
-  },
-  "1f3ed": {
-    "aliases": [],
-    "code": "1f3ed",
-    "name": ":factory:"
-  },
-  "1f3ee": {
-    "aliases": [],
-    "code": "1f3ee",
-    "name": ":izakaya_lantern:"
-  },
-  "1f3ef": {
-    "aliases": [],
-    "code": "1f3ef",
-    "name": ":japanese_castle:"
-  },
-  "1f3f0": {
-    "aliases": [],
-    "code": "1f3f0",
-    "name": ":european_castle:"
-  },
-  "1f3f3": {
-    "aliases": [":waving_white_flag:"],
-    "code": "1f3f3-fe0f",
-    "name": ":flag_white:"
-  },
-  "1f3f3-1f308": {
-    "aliases": [":gay_pride_flag:"],
-    "code": "1f3f3-fe0f-200d-1f308",
-    "name": ":rainbow_flag:"
-  },
-  "1f3f4": {
-    "aliases": [":waving_black_flag:"],
-    "code": "1f3f4",
-    "name": ":flag_black:"
-  },
-  "1f3f4-2620": {
-    "aliases": [],
-    "code": "1f3f4-200d-2620-fe0f",
-    "name": ":pirate_flag:"
-  },
-  "1f3f4-e0067-e0062-e0065-e006e-e0067-e007f": {
-    "aliases": [],
-    "code": "1f3f4-e0067-e0062-e0065-e006e-e0067-e007f",
-    "name": ":england:"
-  },
-  "1f3f4-e0067-e0062-e0073-e0063-e0074-e007f": {
-    "aliases": [],
-    "code": "1f3f4-e0067-e0062-e0073-e0063-e0074-e007f",
-    "name": ":scotland:"
-  },
-  "1f3f4-e0067-e0062-e0077-e006c-e0073-e007f": {
-    "aliases": [],
-    "code": "1f3f4-e0067-e0062-e0077-e006c-e0073-e007f",
-    "name": ":wales:"
-  },
-  "1f3f5": {
-    "aliases": [],
-    "code": "1f3f5-fe0f",
-    "name": ":rosette:"
-  },
-  "1f3f7": {
-    "aliases": [],
-    "code": "1f3f7-fe0f",
-    "name": ":label:"
-  },
-  "1f3f8": {
-    "aliases": [],
-    "code": "1f3f8",
-    "name": ":badminton:"
-  },
-  "1f3f9": {
-    "aliases": [":archery:"],
-    "code": "1f3f9",
-    "name": ":bow_and_arrow:"
-  },
-  "1f3fa": {
-    "aliases": [],
-    "code": "1f3fa",
-    "name": ":amphora:"
-  },
-  "1f3fb": {
-    "aliases": [],
-    "code": "1f3fb",
-    "name": ":tone1:"
-  },
-  "1f3fc": {
-    "aliases": [],
-    "code": "1f3fc",
-    "name": ":tone2:"
-  },
-  "1f3fd": {
-    "aliases": [],
-    "code": "1f3fd",
-    "name": ":tone3:"
-  },
-  "1f3fe": {
-    "aliases": [],
-    "code": "1f3fe",
-    "name": ":tone4:"
-  },
-  "1f3ff": {
-    "aliases": [],
-    "code": "1f3ff",
-    "name": ":tone5:"
-  },
-  "1f400": {
-    "aliases": [],
-    "code": "1f400",
-    "name": ":rat:"
-  },
-  "1f401": {
-    "aliases": [],
-    "code": "1f401",
-    "name": ":mouse2:"
-  },
-  "1f402": {
-    "aliases": [],
-    "code": "1f402",
-    "name": ":ox:"
-  },
-  "1f403": {
-    "aliases": [],
-    "code": "1f403",
-    "name": ":water_buffalo:"
-  },
-  "1f404": {
-    "aliases": [],
-    "code": "1f404",
-    "name": ":cow2:"
-  },
-  "1f405": {
-    "aliases": [],
-    "code": "1f405",
-    "name": ":tiger2:"
-  },
-  "1f406": {
-    "aliases": [],
-    "code": "1f406",
-    "name": ":leopard:"
-  },
-  "1f407": {
-    "aliases": [],
-    "code": "1f407",
-    "name": ":rabbit2:"
-  },
-  "1f408": {
-    "aliases": [],
-    "code": "1f408",
-    "name": ":cat2:"
-  },
-  "1f409": {
-    "aliases": [],
-    "code": "1f409",
-    "name": ":dragon:"
-  },
-  "1f40a": {
-    "aliases": [],
-    "code": "1f40a",
-    "name": ":crocodile:"
-  },
-  "1f40b": {
-    "aliases": [],
-    "code": "1f40b",
-    "name": ":whale2:"
-  },
-  "1f40c": {
-    "aliases": [],
-    "code": "1f40c",
-    "name": ":snail:"
-  },
-  "1f40d": {
-    "aliases": [],
-    "code": "1f40d",
-    "name": ":snake:"
-  },
-  "1f40e": {
-    "aliases": [],
-    "code": "1f40e",
-    "name": ":racehorse:"
-  },
-  "1f40f": {
-    "aliases": [],
-    "code": "1f40f",
-    "name": ":ram:"
-  },
-  "1f410": {
-    "aliases": [],
-    "code": "1f410",
-    "name": ":goat:"
-  },
-  "1f411": {
-    "aliases": [],
-    "code": "1f411",
-    "name": ":sheep:"
-  },
-  "1f412": {
-    "aliases": [],
-    "code": "1f412",
-    "name": ":monkey:"
-  },
-  "1f413": {
-    "aliases": [],
-    "code": "1f413",
-    "name": ":rooster:"
-  },
-  "1f414": {
-    "aliases": [],
-    "code": "1f414",
-    "name": ":chicken:"
-  },
-  "1f415": {
-    "aliases": [],
-    "code": "1f415",
-    "name": ":dog2:"
-  },
-  "1f415-1f9ba": {
-    "aliases": [],
-    "code": "1f415-200d-1f9ba",
-    "name": ":service_dog:"
-  },
-  "1f416": {
-    "aliases": [],
-    "code": "1f416",
-    "name": ":pig2:"
-  },
-  "1f417": {
-    "aliases": [],
-    "code": "1f417",
-    "name": ":boar:"
-  },
-  "1f418": {
-    "aliases": [],
-    "code": "1f418",
-    "name": ":elephant:"
-  },
-  "1f419": {
-    "aliases": [],
-    "code": "1f419",
-    "name": ":octopus:"
-  },
-  "1f41a": {
-    "aliases": [],
-    "code": "1f41a",
-    "name": ":shell:"
-  },
-  "1f41b": {
-    "aliases": [],
-    "code": "1f41b",
-    "name": ":bug:"
-  },
-  "1f41c": {
-    "aliases": [],
-    "code": "1f41c",
-    "name": ":ant:"
-  },
-  "1f41d": {
-    "aliases": [],
-    "code": "1f41d",
-    "name": ":bee:"
-  },
-  "1f41e": {
-    "aliases": [],
-    "code": "1f41e",
-    "name": ":beetle:"
-  },
-  "1f41f": {
-    "aliases": [],
-    "code": "1f41f",
-    "name": ":fish:"
-  },
-  "1f420": {
-    "aliases": [],
-    "code": "1f420",
-    "name": ":tropical_fish:"
-  },
-  "1f421": {
-    "aliases": [],
-    "code": "1f421",
-    "name": ":blowfish:"
-  },
-  "1f422": {
-    "aliases": [],
-    "code": "1f422",
-    "name": ":turtle:"
-  },
-  "1f423": {
-    "aliases": [],
-    "code": "1f423",
-    "name": ":hatching_chick:"
-  },
-  "1f424": {
-    "aliases": [],
-    "code": "1f424",
-    "name": ":baby_chick:"
-  },
-  "1f425": {
-    "aliases": [],
-    "code": "1f425",
-    "name": ":hatched_chick:"
-  },
-  "1f426": {
-    "aliases": [],
-    "code": "1f426",
-    "name": ":bird:"
-  },
-  "1f427": {
-    "aliases": [],
-    "code": "1f427",
-    "name": ":penguin:"
-  },
-  "1f428": {
-    "aliases": [],
-    "code": "1f428",
-    "name": ":koala:"
-  },
-  "1f429": {
-    "aliases": [],
-    "code": "1f429",
-    "name": ":poodle:"
-  },
-  "1f42a": {
-    "aliases": [],
-    "code": "1f42a",
-    "name": ":dromedary_camel:"
-  },
-  "1f42b": {
-    "aliases": [],
-    "code": "1f42b",
-    "name": ":camel:"
-  },
-  "1f42c": {
-    "aliases": [],
-    "code": "1f42c",
-    "name": ":dolphin:"
-  },
-  "1f42d": {
-    "aliases": [],
-    "code": "1f42d",
-    "name": ":mouse:"
-  },
-  "1f42e": {
-    "aliases": [],
-    "code": "1f42e",
-    "name": ":cow:"
-  },
-  "1f42f": {
-    "aliases": [],
-    "code": "1f42f",
-    "name": ":tiger:"
-  },
-  "1f430": {
-    "aliases": [],
-    "code": "1f430",
-    "name": ":rabbit:"
-  },
-  "1f431": {
-    "aliases": [],
-    "code": "1f431",
-    "name": ":cat:"
-  },
-  "1f432": {
-    "aliases": [],
-    "code": "1f432",
-    "name": ":dragon_face:"
-  },
-  "1f433": {
-    "aliases": [],
-    "code": "1f433",
-    "name": ":whale:"
-  },
-  "1f434": {
-    "aliases": [],
-    "code": "1f434",
-    "name": ":horse:"
-  },
-  "1f435": {
-    "aliases": [],
-    "code": "1f435",
-    "name": ":monkey_face:"
-  },
-  "1f436": {
-    "aliases": [],
-    "code": "1f436",
-    "name": ":dog:"
-  },
-  "1f437": {
-    "aliases": [],
-    "code": "1f437",
-    "name": ":pig:"
-  },
-  "1f438": {
-    "aliases": [],
-    "code": "1f438",
-    "name": ":frog:"
-  },
-  "1f439": {
-    "aliases": [],
-    "code": "1f439",
-    "name": ":hamster:"
-  },
-  "1f43a": {
-    "aliases": [],
-    "code": "1f43a",
-    "name": ":wolf:"
-  },
-  "1f43b": {
-    "aliases": [],
-    "code": "1f43b",
-    "name": ":bear:"
-  },
-  "1f43c": {
-    "aliases": [],
-    "code": "1f43c",
-    "name": ":panda_face:"
-  },
-  "1f43d": {
-    "aliases": [],
-    "code": "1f43d",
-    "name": ":pig_nose:"
-  },
-  "1f43e": {
-    "aliases": [":paw_prints:"],
-    "code": "1f43e",
-    "name": ":feet:"
-  },
-  "1f43f": {
-    "aliases": [],
-    "code": "1f43f-fe0f",
-    "name": ":chipmunk:"
-  },
-  "1f440": {
-    "aliases": [],
-    "code": "1f440",
-    "name": ":eyes:"
-  },
-  "1f441": {
-    "aliases": [],
-    "code": "1f441-fe0f",
-    "name": ":eye:"
-  },
-  "1f441-1f5e8": {
-    "aliases": [],
-    "code": "1f441-fe0f-200d-1f5e8-fe0f",
-    "name": ":eye_in_speech_bubble:"
-  },
-  "1f442": {
-    "aliases": [],
-    "code": "1f442",
-    "name": ":ear:"
-  },
-  "1f442-1f3fb": {
-    "aliases": [],
-    "code": "1f442-1f3fb",
-    "name": ":ear_tone1:"
-  },
-  "1f442-1f3fc": {
-    "aliases": [],
-    "code": "1f442-1f3fc",
-    "name": ":ear_tone2:"
-  },
-  "1f442-1f3fd": {
-    "aliases": [],
-    "code": "1f442-1f3fd",
-    "name": ":ear_tone3:"
-  },
-  "1f442-1f3fe": {
-    "aliases": [],
-    "code": "1f442-1f3fe",
-    "name": ":ear_tone4:"
-  },
-  "1f442-1f3ff": {
-    "aliases": [],
-    "code": "1f442-1f3ff",
-    "name": ":ear_tone5:"
-  },
-  "1f443": {
-    "aliases": [],
-    "code": "1f443",
-    "name": ":nose:"
-  },
-  "1f443-1f3fb": {
-    "aliases": [],
-    "code": "1f443-1f3fb",
-    "name": ":nose_tone1:"
-  },
-  "1f443-1f3fc": {
-    "aliases": [],
-    "code": "1f443-1f3fc",
-    "name": ":nose_tone2:"
-  },
-  "1f443-1f3fd": {
-    "aliases": [],
-    "code": "1f443-1f3fd",
-    "name": ":nose_tone3:"
-  },
-  "1f443-1f3fe": {
-    "aliases": [],
-    "code": "1f443-1f3fe",
-    "name": ":nose_tone4:"
-  },
-  "1f443-1f3ff": {
-    "aliases": [],
-    "code": "1f443-1f3ff",
-    "name": ":nose_tone5:"
-  },
-  "1f444": {
-    "aliases": [],
-    "code": "1f444",
-    "name": ":lips:"
-  },
-  "1f445": {
-    "aliases": [],
-    "code": "1f445",
-    "name": ":tongue:"
-  },
-  "1f446": {
-    "aliases": [],
-    "code": "1f446",
-    "name": ":point_up_2:"
-  },
-  "1f446-1f3fb": {
-    "aliases": [],
-    "code": "1f446-1f3fb",
-    "name": ":point_up_2_tone1:"
-  },
-  "1f446-1f3fc": {
-    "aliases": [],
-    "code": "1f446-1f3fc",
-    "name": ":point_up_2_tone2:"
-  },
-  "1f446-1f3fd": {
-    "aliases": [],
-    "code": "1f446-1f3fd",
-    "name": ":point_up_2_tone3:"
-  },
-  "1f446-1f3fe": {
-    "aliases": [],
-    "code": "1f446-1f3fe",
-    "name": ":point_up_2_tone4:"
-  },
-  "1f446-1f3ff": {
-    "aliases": [],
-    "code": "1f446-1f3ff",
-    "name": ":point_up_2_tone5:"
-  },
-  "1f447": {
-    "aliases": [],
-    "code": "1f447",
-    "name": ":point_down:"
-  },
-  "1f447-1f3fb": {
-    "aliases": [],
-    "code": "1f447-1f3fb",
-    "name": ":point_down_tone1:"
-  },
-  "1f447-1f3fc": {
-    "aliases": [],
-    "code": "1f447-1f3fc",
-    "name": ":point_down_tone2:"
-  },
-  "1f447-1f3fd": {
-    "aliases": [],
-    "code": "1f447-1f3fd",
-    "name": ":point_down_tone3:"
-  },
-  "1f447-1f3fe": {
-    "aliases": [],
-    "code": "1f447-1f3fe",
-    "name": ":point_down_tone4:"
-  },
-  "1f447-1f3ff": {
-    "aliases": [],
-    "code": "1f447-1f3ff",
-    "name": ":point_down_tone5:"
-  },
-  "1f448": {
-    "aliases": [],
-    "code": "1f448",
-    "name": ":point_left:"
-  },
-  "1f448-1f3fb": {
-    "aliases": [],
-    "code": "1f448-1f3fb",
-    "name": ":point_left_tone1:"
-  },
-  "1f448-1f3fc": {
-    "aliases": [],
-    "code": "1f448-1f3fc",
-    "name": ":point_left_tone2:"
-  },
-  "1f448-1f3fd": {
-    "aliases": [],
-    "code": "1f448-1f3fd",
-    "name": ":point_left_tone3:"
-  },
-  "1f448-1f3fe": {
-    "aliases": [],
-    "code": "1f448-1f3fe",
-    "name": ":point_left_tone4:"
-  },
-  "1f448-1f3ff": {
-    "aliases": [],
-    "code": "1f448-1f3ff",
-    "name": ":point_left_tone5:"
-  },
-  "1f449": {
-    "aliases": [],
-    "code": "1f449",
-    "name": ":point_right:"
-  },
-  "1f449-1f3fb": {
-    "aliases": [],
-    "code": "1f449-1f3fb",
-    "name": ":point_right_tone1:"
-  },
-  "1f449-1f3fc": {
-    "aliases": [],
-    "code": "1f449-1f3fc",
-    "name": ":point_right_tone2:"
-  },
-  "1f449-1f3fd": {
-    "aliases": [],
-    "code": "1f449-1f3fd",
-    "name": ":point_right_tone3:"
-  },
-  "1f449-1f3fe": {
-    "aliases": [],
-    "code": "1f449-1f3fe",
-    "name": ":point_right_tone4:"
-  },
-  "1f449-1f3ff": {
-    "aliases": [],
-    "code": "1f449-1f3ff",
-    "name": ":point_right_tone5:"
-  },
-  "1f44a": {
-    "aliases": [],
-    "code": "1f44a",
-    "name": ":punch:"
-  },
-  "1f44a-1f3fb": {
-    "aliases": [],
-    "code": "1f44a-1f3fb",
-    "name": ":punch_tone1:"
-  },
-  "1f44a-1f3fc": {
-    "aliases": [],
-    "code": "1f44a-1f3fc",
-    "name": ":punch_tone2:"
-  },
-  "1f44a-1f3fd": {
-    "aliases": [],
-    "code": "1f44a-1f3fd",
-    "name": ":punch_tone3:"
-  },
-  "1f44a-1f3fe": {
-    "aliases": [],
-    "code": "1f44a-1f3fe",
-    "name": ":punch_tone4:"
-  },
-  "1f44a-1f3ff": {
-    "aliases": [],
-    "code": "1f44a-1f3ff",
-    "name": ":punch_tone5:"
-  },
-  "1f44b": {
-    "aliases": [],
-    "code": "1f44b",
-    "name": ":wave:"
-  },
-  "1f44b-1f3fb": {
-    "aliases": [],
-    "code": "1f44b-1f3fb",
-    "name": ":wave_tone1:"
-  },
-  "1f44b-1f3fc": {
-    "aliases": [],
-    "code": "1f44b-1f3fc",
-    "name": ":wave_tone2:"
-  },
-  "1f44b-1f3fd": {
-    "aliases": [],
-    "code": "1f44b-1f3fd",
-    "name": ":wave_tone3:"
-  },
-  "1f44b-1f3fe": {
-    "aliases": [],
-    "code": "1f44b-1f3fe",
-    "name": ":wave_tone4:"
-  },
-  "1f44b-1f3ff": {
-    "aliases": [],
-    "code": "1f44b-1f3ff",
-    "name": ":wave_tone5:"
-  },
-  "1f44c": {
-    "aliases": [],
-    "code": "1f44c",
-    "name": ":ok_hand:"
-  },
-  "1f44c-1f3fb": {
-    "aliases": [],
-    "code": "1f44c-1f3fb",
-    "name": ":ok_hand_tone1:"
-  },
-  "1f44c-1f3fc": {
-    "aliases": [],
-    "code": "1f44c-1f3fc",
-    "name": ":ok_hand_tone2:"
-  },
-  "1f44c-1f3fd": {
-    "aliases": [],
-    "code": "1f44c-1f3fd",
-    "name": ":ok_hand_tone3:"
-  },
-  "1f44c-1f3fe": {
-    "aliases": [],
-    "code": "1f44c-1f3fe",
-    "name": ":ok_hand_tone4:"
-  },
-  "1f44c-1f3ff": {
-    "aliases": [],
-    "code": "1f44c-1f3ff",
-    "name": ":ok_hand_tone5:"
-  },
-  "1f44d": {
-    "aliases": [":+1:", ":thumbup:"],
-    "code": "1f44d",
-    "name": ":thumbsup:"
-  },
-  "1f44d-1f3fb": {
-    "aliases": [":+1_tone1:", ":thumbup_tone1:"],
-    "code": "1f44d-1f3fb",
-    "name": ":thumbsup_tone1:"
-  },
-  "1f44d-1f3fc": {
-    "aliases": [":+1_tone2:", ":thumbup_tone2:"],
-    "code": "1f44d-1f3fc",
-    "name": ":thumbsup_tone2:"
-  },
-  "1f44d-1f3fd": {
-    "aliases": [":+1_tone3:", ":thumbup_tone3:"],
-    "code": "1f44d-1f3fd",
-    "name": ":thumbsup_tone3:"
-  },
-  "1f44d-1f3fe": {
-    "aliases": [":+1_tone4:", ":thumbup_tone4:"],
-    "code": "1f44d-1f3fe",
-    "name": ":thumbsup_tone4:"
-  },
-  "1f44d-1f3ff": {
-    "aliases": [":+1_tone5:", ":thumbup_tone5:"],
-    "code": "1f44d-1f3ff",
-    "name": ":thumbsup_tone5:"
-  },
-  "1f44e": {
-    "aliases": [":-1:", ":thumbdown:"],
-    "code": "1f44e",
-    "name": ":thumbsdown:"
-  },
-  "1f44e-1f3fb": {
-    "aliases": [":-1_tone1:", ":thumbdown_tone1:"],
-    "code": "1f44e-1f3fb",
-    "name": ":thumbsdown_tone1:"
-  },
-  "1f44e-1f3fc": {
-    "aliases": [":-1_tone2:", ":thumbdown_tone2:"],
-    "code": "1f44e-1f3fc",
-    "name": ":thumbsdown_tone2:"
-  },
-  "1f44e-1f3fd": {
-    "aliases": [":-1_tone3:", ":thumbdown_tone3:"],
-    "code": "1f44e-1f3fd",
-    "name": ":thumbsdown_tone3:"
-  },
-  "1f44e-1f3fe": {
-    "aliases": [":-1_tone4:", ":thumbdown_tone4:"],
-    "code": "1f44e-1f3fe",
-    "name": ":thumbsdown_tone4:"
-  },
-  "1f44e-1f3ff": {
-    "aliases": [":-1_tone5:", ":thumbdown_tone5:"],
-    "code": "1f44e-1f3ff",
-    "name": ":thumbsdown_tone5:"
-  },
-  "1f44f": {
-    "aliases": [],
-    "code": "1f44f",
-    "name": ":clap:"
-  },
-  "1f44f-1f3fb": {
-    "aliases": [],
-    "code": "1f44f-1f3fb",
-    "name": ":clap_tone1:"
-  },
-  "1f44f-1f3fc": {
-    "aliases": [],
-    "code": "1f44f-1f3fc",
-    "name": ":clap_tone2:"
-  },
-  "1f44f-1f3fd": {
-    "aliases": [],
-    "code": "1f44f-1f3fd",
-    "name": ":clap_tone3:"
-  },
-  "1f44f-1f3fe": {
-    "aliases": [],
-    "code": "1f44f-1f3fe",
-    "name": ":clap_tone4:"
-  },
-  "1f44f-1f3ff": {
-    "aliases": [],
-    "code": "1f44f-1f3ff",
-    "name": ":clap_tone5:"
-  },
-  "1f450": {
-    "aliases": [],
-    "code": "1f450",
-    "name": ":open_hands:"
-  },
-  "1f450-1f3fb": {
-    "aliases": [],
-    "code": "1f450-1f3fb",
-    "name": ":open_hands_tone1:"
-  },
-  "1f450-1f3fc": {
-    "aliases": [],
-    "code": "1f450-1f3fc",
-    "name": ":open_hands_tone2:"
-  },
-  "1f450-1f3fd": {
-    "aliases": [],
-    "code": "1f450-1f3fd",
-    "name": ":open_hands_tone3:"
-  },
-  "1f450-1f3fe": {
-    "aliases": [],
-    "code": "1f450-1f3fe",
-    "name": ":open_hands_tone4:"
-  },
-  "1f450-1f3ff": {
-    "aliases": [],
-    "code": "1f450-1f3ff",
-    "name": ":open_hands_tone5:"
-  },
-  "1f451": {
-    "aliases": [],
-    "code": "1f451",
-    "name": ":crown:"
-  },
-  "1f452": {
-    "aliases": [],
-    "code": "1f452",
-    "name": ":womans_hat:"
-  },
-  "1f453": {
-    "aliases": [],
-    "code": "1f453",
-    "name": ":eyeglasses:"
-  },
-  "1f454": {
-    "aliases": [],
-    "code": "1f454",
-    "name": ":necktie:"
-  },
-  "1f455": {
-    "aliases": [],
-    "code": "1f455",
-    "name": ":shirt:"
-  },
-  "1f456": {
-    "aliases": [],
-    "code": "1f456",
-    "name": ":jeans:"
-  },
-  "1f457": {
-    "aliases": [],
-    "code": "1f457",
-    "name": ":dress:"
-  },
-  "1f458": {
-    "aliases": [],
-    "code": "1f458",
-    "name": ":kimono:"
-  },
-  "1f459": {
-    "aliases": [],
-    "code": "1f459",
-    "name": ":bikini:"
-  },
-  "1f45a": {
-    "aliases": [],
-    "code": "1f45a",
-    "name": ":womans_clothes:"
-  },
-  "1f45b": {
-    "aliases": [],
-    "code": "1f45b",
-    "name": ":purse:"
-  },
-  "1f45c": {
-    "aliases": [],
-    "code": "1f45c",
-    "name": ":handbag:"
-  },
-  "1f45d": {
-    "aliases": [],
-    "code": "1f45d",
-    "name": ":pouch:"
-  },
-  "1f45e": {
-    "aliases": [],
-    "code": "1f45e",
-    "name": ":mans_shoe:"
-  },
-  "1f45f": {
-    "aliases": [],
-    "code": "1f45f",
-    "name": ":athletic_shoe:"
-  },
-  "1f460": {
-    "aliases": [],
-    "code": "1f460",
-    "name": ":high_heel:"
-  },
-  "1f461": {
-    "aliases": [],
-    "code": "1f461",
-    "name": ":sandal:"
-  },
-  "1f462": {
-    "aliases": [],
-    "code": "1f462",
-    "name": ":boot:"
-  },
-  "1f463": {
-    "aliases": [],
-    "code": "1f463",
-    "name": ":footprints:"
-  },
-  "1f464": {
-    "aliases": [],
-    "code": "1f464",
-    "name": ":bust_in_silhouette:"
-  },
-  "1f465": {
-    "aliases": [],
-    "code": "1f465",
-    "name": ":busts_in_silhouette:"
-  },
-  "1f466": {
-    "aliases": [],
-    "code": "1f466",
-    "name": ":boy:"
-  },
-  "1f466-1f3fb": {
-    "aliases": [],
-    "code": "1f466-1f3fb",
-    "name": ":boy_tone1:"
-  },
-  "1f466-1f3fc": {
-    "aliases": [],
-    "code": "1f466-1f3fc",
-    "name": ":boy_tone2:"
-  },
-  "1f466-1f3fd": {
-    "aliases": [],
-    "code": "1f466-1f3fd",
-    "name": ":boy_tone3:"
-  },
-  "1f466-1f3fe": {
-    "aliases": [],
-    "code": "1f466-1f3fe",
-    "name": ":boy_tone4:"
-  },
-  "1f466-1f3ff": {
-    "aliases": [],
-    "code": "1f466-1f3ff",
-    "name": ":boy_tone5:"
-  },
-  "1f467": {
-    "aliases": [],
-    "code": "1f467",
-    "name": ":girl:"
-  },
-  "1f467-1f3fb": {
-    "aliases": [],
-    "code": "1f467-1f3fb",
-    "name": ":girl_tone1:"
-  },
-  "1f467-1f3fc": {
-    "aliases": [],
-    "code": "1f467-1f3fc",
-    "name": ":girl_tone2:"
-  },
-  "1f467-1f3fd": {
-    "aliases": [],
-    "code": "1f467-1f3fd",
-    "name": ":girl_tone3:"
-  },
-  "1f467-1f3fe": {
-    "aliases": [],
-    "code": "1f467-1f3fe",
-    "name": ":girl_tone4:"
-  },
-  "1f467-1f3ff": {
-    "aliases": [],
-    "code": "1f467-1f3ff",
-    "name": ":girl_tone5:"
-  },
-  "1f468": {
-    "aliases": [],
-    "code": "1f468",
-    "name": ":man:"
-  },
-  "1f468-1f33e": {
-    "aliases": [],
-    "code": "1f468-200d-1f33e",
-    "name": ":man_farmer:"
-  },
-  "1f468-1f373": {
-    "aliases": [],
-    "code": "1f468-200d-1f373",
-    "name": ":man_cook:"
-  },
-  "1f468-1f393": {
-    "aliases": [],
-    "code": "1f468-200d-1f393",
-    "name": ":man_student:"
-  },
-  "1f468-1f3a4": {
-    "aliases": [],
-    "code": "1f468-200d-1f3a4",
-    "name": ":man_singer:"
-  },
-  "1f468-1f3a8": {
-    "aliases": [],
-    "code": "1f468-200d-1f3a8",
-    "name": ":man_artist:"
-  },
-  "1f468-1f3eb": {
-    "aliases": [],
-    "code": "1f468-200d-1f3eb",
-    "name": ":man_teacher:"
-  },
-  "1f468-1f3ed": {
-    "aliases": [],
-    "code": "1f468-200d-1f3ed",
-    "name": ":man_factory_worker:"
-  },
-  "1f468-1f3fb": {
-    "aliases": [],
-    "code": "1f468-1f3fb",
-    "name": ":man_tone1:"
-  },
-  "1f468-1f3fb-1f33e": {
-    "aliases": [":man_farmer_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f33e",
-    "name": ":man_farmer_tone1:"
-  },
-  "1f468-1f3fb-1f373": {
-    "aliases": [":man_cook_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f373",
-    "name": ":man_cook_tone1:"
-  },
-  "1f468-1f3fb-1f393": {
-    "aliases": [":man_student_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f393",
-    "name": ":man_student_tone1:"
-  },
-  "1f468-1f3fb-1f3a4": {
-    "aliases": [":man_singer_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f3a4",
-    "name": ":man_singer_tone1:"
-  },
-  "1f468-1f3fb-1f3a8": {
-    "aliases": [":man_artist_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f3a8",
-    "name": ":man_artist_tone1:"
-  },
-  "1f468-1f3fb-1f3eb": {
-    "aliases": [":man_teacher_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f3eb",
-    "name": ":man_teacher_tone1:"
-  },
-  "1f468-1f3fb-1f3ed": {
-    "aliases": [":man_factory_worker_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f3ed",
-    "name": ":man_factory_worker_tone1:"
-  },
-  "1f468-1f3fb-1f4bb": {
-    "aliases": [":man_technologist_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f4bb",
-    "name": ":man_technologist_tone1:"
-  },
-  "1f468-1f3fb-1f4bc": {
-    "aliases": [":man_office_worker_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f4bc",
-    "name": ":man_office_worker_tone1:"
-  },
-  "1f468-1f3fb-1f527": {
-    "aliases": [":man_mechanic_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f527",
-    "name": ":man_mechanic_tone1:"
-  },
-  "1f468-1f3fb-1f52c": {
-    "aliases": [":man_scientist_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f52c",
-    "name": ":man_scientist_tone1:"
-  },
-  "1f468-1f3fb-1f680": {
-    "aliases": [":man_astronaut_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f680",
-    "name": ":man_astronaut_tone1:"
-  },
-  "1f468-1f3fb-1f692": {
-    "aliases": [":man_firefighter_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f692",
-    "name": ":man_firefighter_tone1:"
-  },
-  "1f468-1f3fb-1f91d-1f468-1f3fc": {
-    "aliases": [":men_holding_hands_light_skin_tone_medium_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":men_holding_hands_tone1_tone2:"
-  },
-  "1f468-1f3fb-1f91d-1f468-1f3fd": {
-    "aliases": [":men_holding_hands_light_skin_tone_medium_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":men_holding_hands_tone1_tone3:"
-  },
-  "1f468-1f3fb-1f91d-1f468-1f3fe": {
-    "aliases": [":men_holding_hands_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":men_holding_hands_tone1_tone4:"
-  },
-  "1f468-1f3fb-1f91d-1f468-1f3ff": {
-    "aliases": [":men_holding_hands_light_skin_tone_dark_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":men_holding_hands_tone1_tone5:"
-  },
-  "1f468-1f3fb-1f9af": {
-    "aliases": [":man_with_probing_cane_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9af",
-    "name": ":man_with_probing_cane_tone1:"
-  },
-  "1f468-1f3fb-1f9b0": {
-    "aliases": [":man_red_haired_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9b0",
-    "name": ":man_red_haired_tone1:"
-  },
-  "1f468-1f3fb-1f9b1": {
-    "aliases": [":man_curly_haired_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9b1",
-    "name": ":man_curly_haired_tone1:"
-  },
-  "1f468-1f3fb-1f9b2": {
-    "aliases": [":man_bald_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9b2",
-    "name": ":man_bald_tone1:"
-  },
-  "1f468-1f3fb-1f9b3": {
-    "aliases": [":man_white_haired_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9b3",
-    "name": ":man_white_haired_tone1:"
-  },
-  "1f468-1f3fb-1f9bc": {
-    "aliases": [":man_in_motorized_wheelchair_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair_tone1:"
-  },
-  "1f468-1f3fb-1f9bd": {
-    "aliases": [":man_in_manual_wheelchair_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair_tone1:"
-  },
-  "1f468-1f3fb-2695": {
-    "aliases": [":man_health_worker_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-2695-fe0f",
-    "name": ":man_health_worker_tone1:"
-  },
-  "1f468-1f3fb-2696": {
-    "aliases": [":man_judge_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-2696-fe0f",
-    "name": ":man_judge_tone1:"
-  },
-  "1f468-1f3fb-2708": {
-    "aliases": [":man_pilot_light_skin_tone:"],
-    "code": "1f468-1f3fb-200d-2708-fe0f",
-    "name": ":man_pilot_tone1:"
-  },
-  "1f468-1f3fc": {
-    "aliases": [],
-    "code": "1f468-1f3fc",
-    "name": ":man_tone2:"
-  },
-  "1f468-1f3fc-1f33e": {
-    "aliases": [":man_farmer_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f33e",
-    "name": ":man_farmer_tone2:"
-  },
-  "1f468-1f3fc-1f373": {
-    "aliases": [":man_cook_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f373",
-    "name": ":man_cook_tone2:"
-  },
-  "1f468-1f3fc-1f393": {
-    "aliases": [":man_student_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f393",
-    "name": ":man_student_tone2:"
-  },
-  "1f468-1f3fc-1f3a4": {
-    "aliases": [":man_singer_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f3a4",
-    "name": ":man_singer_tone2:"
-  },
-  "1f468-1f3fc-1f3a8": {
-    "aliases": [":man_artist_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f3a8",
-    "name": ":man_artist_tone2:"
-  },
-  "1f468-1f3fc-1f3eb": {
-    "aliases": [":man_teacher_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f3eb",
-    "name": ":man_teacher_tone2:"
-  },
-  "1f468-1f3fc-1f3ed": {
-    "aliases": [":man_factory_worker_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f3ed",
-    "name": ":man_factory_worker_tone2:"
-  },
-  "1f468-1f3fc-1f4bb": {
-    "aliases": [":man_technologist_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f4bb",
-    "name": ":man_technologist_tone2:"
-  },
-  "1f468-1f3fc-1f4bc": {
-    "aliases": [":man_office_worker_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f4bc",
-    "name": ":man_office_worker_tone2:"
-  },
-  "1f468-1f3fc-1f527": {
-    "aliases": [":man_mechanic_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f527",
-    "name": ":man_mechanic_tone2:"
-  },
-  "1f468-1f3fc-1f52c": {
-    "aliases": [":man_scientist_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f52c",
-    "name": ":man_scientist_tone2:"
-  },
-  "1f468-1f3fc-1f680": {
-    "aliases": [":man_astronaut_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f680",
-    "name": ":man_astronaut_tone2:"
-  },
-  "1f468-1f3fc-1f692": {
-    "aliases": [":man_firefighter_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f692",
-    "name": ":man_firefighter_tone2:"
-  },
-  "1f468-1f3fc-1f91d-1f468-1f3fb": {
-    "aliases": [":men_holding_hands_medium_light_skin_tone_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":men_holding_hands_tone2_tone1:"
-  },
-  "1f468-1f3fc-1f91d-1f468-1f3fd": {
-    "aliases": [":men_holding_hands_medium_light_skin_tone_medium_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":men_holding_hands_tone2_tone3:"
-  },
-  "1f468-1f3fc-1f91d-1f468-1f3fe": {
-    "aliases": [":men_holding_hands_medium_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":men_holding_hands_tone2_tone4:"
-  },
-  "1f468-1f3fc-1f91d-1f468-1f3ff": {
-    "aliases": [":men_holding_hands_medium_light_skin_tone_dark_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":men_holding_hands_tone2_tone5:"
-  },
-  "1f468-1f3fc-1f9af": {
-    "aliases": [":man_with_probing_cane_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9af",
-    "name": ":man_with_probing_cane_tone2:"
-  },
-  "1f468-1f3fc-1f9b0": {
-    "aliases": [":man_red_haired_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9b0",
-    "name": ":man_red_haired_tone2:"
-  },
-  "1f468-1f3fc-1f9b1": {
-    "aliases": [":man_curly_haired_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9b1",
-    "name": ":man_curly_haired_tone2:"
-  },
-  "1f468-1f3fc-1f9b2": {
-    "aliases": [":man_bald_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9b2",
-    "name": ":man_bald_tone2:"
-  },
-  "1f468-1f3fc-1f9b3": {
-    "aliases": [":man_white_haired_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9b3",
-    "name": ":man_white_haired_tone2:"
-  },
-  "1f468-1f3fc-1f9bc": {
-    "aliases": [":man_in_motorized_wheelchair_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair_tone2:"
-  },
-  "1f468-1f3fc-1f9bd": {
-    "aliases": [":man_in_manual_wheelchair_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair_tone2:"
-  },
-  "1f468-1f3fc-2695": {
-    "aliases": [":man_health_worker_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-2695-fe0f",
-    "name": ":man_health_worker_tone2:"
-  },
-  "1f468-1f3fc-2696": {
-    "aliases": [":man_judge_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-2696-fe0f",
-    "name": ":man_judge_tone2:"
-  },
-  "1f468-1f3fc-2708": {
-    "aliases": [":man_pilot_medium_light_skin_tone:"],
-    "code": "1f468-1f3fc-200d-2708-fe0f",
-    "name": ":man_pilot_tone2:"
-  },
-  "1f468-1f3fd": {
-    "aliases": [],
-    "code": "1f468-1f3fd",
-    "name": ":man_tone3:"
-  },
-  "1f468-1f3fd-1f33e": {
-    "aliases": [":man_farmer_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f33e",
-    "name": ":man_farmer_tone3:"
-  },
-  "1f468-1f3fd-1f373": {
-    "aliases": [":man_cook_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f373",
-    "name": ":man_cook_tone3:"
-  },
-  "1f468-1f3fd-1f393": {
-    "aliases": [":man_student_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f393",
-    "name": ":man_student_tone3:"
-  },
-  "1f468-1f3fd-1f3a4": {
-    "aliases": [":man_singer_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f3a4",
-    "name": ":man_singer_tone3:"
-  },
-  "1f468-1f3fd-1f3a8": {
-    "aliases": [":man_artist_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f3a8",
-    "name": ":man_artist_tone3:"
-  },
-  "1f468-1f3fd-1f3eb": {
-    "aliases": [":man_teacher_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f3eb",
-    "name": ":man_teacher_tone3:"
-  },
-  "1f468-1f3fd-1f3ed": {
-    "aliases": [":man_factory_worker_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f3ed",
-    "name": ":man_factory_worker_tone3:"
-  },
-  "1f468-1f3fd-1f4bb": {
-    "aliases": [":man_technologist_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f4bb",
-    "name": ":man_technologist_tone3:"
-  },
-  "1f468-1f3fd-1f4bc": {
-    "aliases": [":man_office_worker_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f4bc",
-    "name": ":man_office_worker_tone3:"
-  },
-  "1f468-1f3fd-1f527": {
-    "aliases": [":man_mechanic_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f527",
-    "name": ":man_mechanic_tone3:"
-  },
-  "1f468-1f3fd-1f52c": {
-    "aliases": [":man_scientist_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f52c",
-    "name": ":man_scientist_tone3:"
-  },
-  "1f468-1f3fd-1f680": {
-    "aliases": [":man_astronaut_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f680",
-    "name": ":man_astronaut_tone3:"
-  },
-  "1f468-1f3fd-1f692": {
-    "aliases": [":man_firefighter_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f692",
-    "name": ":man_firefighter_tone3:"
-  },
-  "1f468-1f3fd-1f91d-1f468-1f3fb": {
-    "aliases": [":men_holding_hands_medium_skin_tone_light_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":men_holding_hands_tone3_tone1:"
-  },
-  "1f468-1f3fd-1f91d-1f468-1f3fc": {
-    "aliases": [":men_holding_hands_medium_skin_tone_medium_light_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":men_holding_hands_tone3_tone2:"
-  },
-  "1f468-1f3fd-1f91d-1f468-1f3fe": {
-    "aliases": [":men_holding_hands_medium_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":men_holding_hands_tone3_tone4:"
-  },
-  "1f468-1f3fd-1f91d-1f468-1f3ff": {
-    "aliases": [":men_holding_hands_medium_skin_tone_dark_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":men_holding_hands_tone3_tone5:"
-  },
-  "1f468-1f3fd-1f9af": {
-    "aliases": [":man_with_probing_cane_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9af",
-    "name": ":man_with_probing_cane_tone3:"
-  },
-  "1f468-1f3fd-1f9b0": {
-    "aliases": [":man_red_haired_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9b0",
-    "name": ":man_red_haired_tone3:"
-  },
-  "1f468-1f3fd-1f9b1": {
-    "aliases": [":man_curly_haired_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9b1",
-    "name": ":man_curly_haired_tone3:"
-  },
-  "1f468-1f3fd-1f9b2": {
-    "aliases": [":man_bald_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9b2",
-    "name": ":man_bald_tone3:"
-  },
-  "1f468-1f3fd-1f9b3": {
-    "aliases": [":man_white_haired_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9b3",
-    "name": ":man_white_haired_tone3:"
-  },
-  "1f468-1f3fd-1f9bc": {
-    "aliases": [":man_in_motorized_wheelchair_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair_tone3:"
-  },
-  "1f468-1f3fd-1f9bd": {
-    "aliases": [":man_in_manual_wheelchair_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair_tone3:"
-  },
-  "1f468-1f3fd-2695": {
-    "aliases": [":man_health_worker_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-2695-fe0f",
-    "name": ":man_health_worker_tone3:"
-  },
-  "1f468-1f3fd-2696": {
-    "aliases": [":man_judge_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-2696-fe0f",
-    "name": ":man_judge_tone3:"
-  },
-  "1f468-1f3fd-2708": {
-    "aliases": [":man_pilot_medium_skin_tone:"],
-    "code": "1f468-1f3fd-200d-2708-fe0f",
-    "name": ":man_pilot_tone3:"
-  },
-  "1f468-1f3fe": {
-    "aliases": [],
-    "code": "1f468-1f3fe",
-    "name": ":man_tone4:"
-  },
-  "1f468-1f3fe-1f33e": {
-    "aliases": [":man_farmer_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f33e",
-    "name": ":man_farmer_tone4:"
-  },
-  "1f468-1f3fe-1f373": {
-    "aliases": [":man_cook_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f373",
-    "name": ":man_cook_tone4:"
-  },
-  "1f468-1f3fe-1f393": {
-    "aliases": [":man_student_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f393",
-    "name": ":man_student_tone4:"
-  },
-  "1f468-1f3fe-1f3a4": {
-    "aliases": [":man_singer_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f3a4",
-    "name": ":man_singer_tone4:"
-  },
-  "1f468-1f3fe-1f3a8": {
-    "aliases": [":man_artist_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f3a8",
-    "name": ":man_artist_tone4:"
-  },
-  "1f468-1f3fe-1f3eb": {
-    "aliases": [":man_teacher_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f3eb",
-    "name": ":man_teacher_tone4:"
-  },
-  "1f468-1f3fe-1f3ed": {
-    "aliases": [":man_factory_worker_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f3ed",
-    "name": ":man_factory_worker_tone4:"
-  },
-  "1f468-1f3fe-1f4bb": {
-    "aliases": [":man_technologist_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f4bb",
-    "name": ":man_technologist_tone4:"
-  },
-  "1f468-1f3fe-1f4bc": {
-    "aliases": [":man_office_worker_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f4bc",
-    "name": ":man_office_worker_tone4:"
-  },
-  "1f468-1f3fe-1f527": {
-    "aliases": [":man_mechanic_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f527",
-    "name": ":man_mechanic_tone4:"
-  },
-  "1f468-1f3fe-1f52c": {
-    "aliases": [":man_scientist_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f52c",
-    "name": ":man_scientist_tone4:"
-  },
-  "1f468-1f3fe-1f680": {
-    "aliases": [":man_astronaut_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f680",
-    "name": ":man_astronaut_tone4:"
-  },
-  "1f468-1f3fe-1f692": {
-    "aliases": [":man_firefighter_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f692",
-    "name": ":man_firefighter_tone4:"
-  },
-  "1f468-1f3fe-1f91d-1f468-1f3fb": {
-    "aliases": [":men_holding_hands_medium_dark_skin_tone_light_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":men_holding_hands_tone4_tone1:"
-  },
-  "1f468-1f3fe-1f91d-1f468-1f3fc": {
-    "aliases": [":men_holding_hands_medium_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":men_holding_hands_tone4_tone2:"
-  },
-  "1f468-1f3fe-1f91d-1f468-1f3fd": {
-    "aliases": [":men_holding_hands_medium_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":men_holding_hands_tone4_tone3:"
-  },
-  "1f468-1f3fe-1f91d-1f468-1f3ff": {
-    "aliases": [":men_holding_hands_medium_dark_skin_tone_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":men_holding_hands_tone4_tone5:"
-  },
-  "1f468-1f3fe-1f9af": {
-    "aliases": [":man_with_probing_cane_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9af",
-    "name": ":man_with_probing_cane_tone4:"
-  },
-  "1f468-1f3fe-1f9b0": {
-    "aliases": [":man_red_haired_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9b0",
-    "name": ":man_red_haired_tone4:"
-  },
-  "1f468-1f3fe-1f9b1": {
-    "aliases": [":man_curly_haired_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9b1",
-    "name": ":man_curly_haired_tone4:"
-  },
-  "1f468-1f3fe-1f9b2": {
-    "aliases": [":man_bald_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9b2",
-    "name": ":man_bald_tone4:"
-  },
-  "1f468-1f3fe-1f9b3": {
-    "aliases": [":man_white_haired_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9b3",
-    "name": ":man_white_haired_tone4:"
-  },
-  "1f468-1f3fe-1f9bc": {
-    "aliases": [":man_in_motorized_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair_tone4:"
-  },
-  "1f468-1f3fe-1f9bd": {
-    "aliases": [":man_in_manual_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair_tone4:"
-  },
-  "1f468-1f3fe-2695": {
-    "aliases": [":man_health_worker_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-2695-fe0f",
-    "name": ":man_health_worker_tone4:"
-  },
-  "1f468-1f3fe-2696": {
-    "aliases": [":man_judge_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-2696-fe0f",
-    "name": ":man_judge_tone4:"
-  },
-  "1f468-1f3fe-2708": {
-    "aliases": [":man_pilot_medium_dark_skin_tone:"],
-    "code": "1f468-1f3fe-200d-2708-fe0f",
-    "name": ":man_pilot_tone4:"
-  },
-  "1f468-1f3ff": {
-    "aliases": [],
-    "code": "1f468-1f3ff",
-    "name": ":man_tone5:"
-  },
-  "1f468-1f3ff-1f33e": {
-    "aliases": [":man_farmer_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f33e",
-    "name": ":man_farmer_tone5:"
-  },
-  "1f468-1f3ff-1f373": {
-    "aliases": [":man_cook_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f373",
-    "name": ":man_cook_tone5:"
-  },
-  "1f468-1f3ff-1f393": {
-    "aliases": [":man_student_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f393",
-    "name": ":man_student_tone5:"
-  },
-  "1f468-1f3ff-1f3a4": {
-    "aliases": [":man_singer_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f3a4",
-    "name": ":man_singer_tone5:"
-  },
-  "1f468-1f3ff-1f3a8": {
-    "aliases": [":man_artist_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f3a8",
-    "name": ":man_artist_tone5:"
-  },
-  "1f468-1f3ff-1f3eb": {
-    "aliases": [":man_teacher_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f3eb",
-    "name": ":man_teacher_tone5:"
-  },
-  "1f468-1f3ff-1f3ed": {
-    "aliases": [":man_factory_worker_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f3ed",
-    "name": ":man_factory_worker_tone5:"
-  },
-  "1f468-1f3ff-1f4bb": {
-    "aliases": [":man_technologist_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f4bb",
-    "name": ":man_technologist_tone5:"
-  },
-  "1f468-1f3ff-1f4bc": {
-    "aliases": [":man_office_worker_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f4bc",
-    "name": ":man_office_worker_tone5:"
-  },
-  "1f468-1f3ff-1f527": {
-    "aliases": [":man_mechanic_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f527",
-    "name": ":man_mechanic_tone5:"
-  },
-  "1f468-1f3ff-1f52c": {
-    "aliases": [":man_scientist_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f52c",
-    "name": ":man_scientist_tone5:"
-  },
-  "1f468-1f3ff-1f680": {
-    "aliases": [":man_astronaut_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f680",
-    "name": ":man_astronaut_tone5:"
-  },
-  "1f468-1f3ff-1f692": {
-    "aliases": [":man_firefighter_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f692",
-    "name": ":man_firefighter_tone5:"
-  },
-  "1f468-1f3ff-1f91d-1f468-1f3fb": {
-    "aliases": [":men_holding_hands_dark_skin_tone_light_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":men_holding_hands_tone5_tone1:"
-  },
-  "1f468-1f3ff-1f91d-1f468-1f3fc": {
-    "aliases": [":men_holding_hands_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":men_holding_hands_tone5_tone2:"
-  },
-  "1f468-1f3ff-1f91d-1f468-1f3fd": {
-    "aliases": [":men_holding_hands_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":men_holding_hands_tone5_tone3:"
-  },
-  "1f468-1f3ff-1f91d-1f468-1f3fe": {
-    "aliases": [":men_holding_hands_dark_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":men_holding_hands_tone5_tone4:"
-  },
-  "1f468-1f3ff-1f9af": {
-    "aliases": [":man_with_probing_cane_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9af",
-    "name": ":man_with_probing_cane_tone5:"
-  },
-  "1f468-1f3ff-1f9b0": {
-    "aliases": [":man_red_haired_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9b0",
-    "name": ":man_red_haired_tone5:"
-  },
-  "1f468-1f3ff-1f9b1": {
-    "aliases": [":man_curly_haired_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9b1",
-    "name": ":man_curly_haired_tone5:"
-  },
-  "1f468-1f3ff-1f9b2": {
-    "aliases": [":man_bald_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9b2",
-    "name": ":man_bald_tone5:"
-  },
-  "1f468-1f3ff-1f9b3": {
-    "aliases": [":man_white_haired_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9b3",
-    "name": ":man_white_haired_tone5:"
-  },
-  "1f468-1f3ff-1f9bc": {
-    "aliases": [":man_in_motorized_wheelchair_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair_tone5:"
-  },
-  "1f468-1f3ff-1f9bd": {
-    "aliases": [":man_in_manual_wheelchair_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair_tone5:"
-  },
-  "1f468-1f3ff-2695": {
-    "aliases": [":man_health_worker_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-2695-fe0f",
-    "name": ":man_health_worker_tone5:"
-  },
-  "1f468-1f3ff-2696": {
-    "aliases": [":man_judge_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-2696-fe0f",
-    "name": ":man_judge_tone5:"
-  },
-  "1f468-1f3ff-2708": {
-    "aliases": [":man_pilot_dark_skin_tone:"],
-    "code": "1f468-1f3ff-200d-2708-fe0f",
-    "name": ":man_pilot_tone5:"
-  },
-  "1f468-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f466",
-    "name": ":family_man_boy:"
-  },
-  "1f468-1f466-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f466-200d-1f466",
-    "name": ":family_man_boy_boy:"
-  },
-  "1f468-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f467",
-    "name": ":family_man_girl:"
-  },
-  "1f468-1f467-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f467-200d-1f466",
-    "name": ":family_man_girl_boy:"
-  },
-  "1f468-1f467-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f467-200d-1f467",
-    "name": ":family_man_girl_girl:"
-  },
-  "1f468-1f468-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f468-200d-1f466",
-    "name": ":family_mmb:"
-  },
-  "1f468-1f468-1f466-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f468-200d-1f466-200d-1f466",
-    "name": ":family_mmbb:"
-  },
-  "1f468-1f468-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f468-200d-1f467",
-    "name": ":family_mmg:"
-  },
-  "1f468-1f468-1f467-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f468-200d-1f467-200d-1f466",
-    "name": ":family_mmgb:"
-  },
-  "1f468-1f468-1f467-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f468-200d-1f467-200d-1f467",
-    "name": ":family_mmgg:"
-  },
-  "1f468-1f469-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f469-200d-1f466",
-    "name": ":family_man_woman_boy:"
-  },
-  "1f468-1f469-1f466-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f469-200d-1f466-200d-1f466",
-    "name": ":family_mwbb:"
-  },
-  "1f468-1f469-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f469-200d-1f467",
-    "name": ":family_mwg:"
-  },
-  "1f468-1f469-1f467-1f466": {
-    "aliases": [],
-    "code": "1f468-200d-1f469-200d-1f467-200d-1f466",
-    "name": ":family_mwgb:"
-  },
-  "1f468-1f469-1f467-1f467": {
-    "aliases": [],
-    "code": "1f468-200d-1f469-200d-1f467-200d-1f467",
-    "name": ":family_mwgg:"
-  },
-  "1f468-1f4bb": {
-    "aliases": [],
-    "code": "1f468-200d-1f4bb",
-    "name": ":man_technologist:"
-  },
-  "1f468-1f4bc": {
-    "aliases": [],
-    "code": "1f468-200d-1f4bc",
-    "name": ":man_office_worker:"
-  },
-  "1f468-1f527": {
-    "aliases": [],
-    "code": "1f468-200d-1f527",
-    "name": ":man_mechanic:"
-  },
-  "1f468-1f52c": {
-    "aliases": [],
-    "code": "1f468-200d-1f52c",
-    "name": ":man_scientist:"
-  },
-  "1f468-1f680": {
-    "aliases": [],
-    "code": "1f468-200d-1f680",
-    "name": ":man_astronaut:"
-  },
-  "1f468-1f692": {
-    "aliases": [],
-    "code": "1f468-200d-1f692",
-    "name": ":man_firefighter:"
-  },
-  "1f468-1f9af": {
-    "aliases": [],
-    "code": "1f468-200d-1f9af",
-    "name": ":man_with_probing_cane:"
-  },
-  "1f468-1f9b0": {
-    "aliases": [],
-    "code": "1f468-200d-1f9b0",
-    "name": ":man_red_haired:"
-  },
-  "1f468-1f9b1": {
-    "aliases": [],
-    "code": "1f468-200d-1f9b1",
-    "name": ":man_curly_haired:"
-  },
-  "1f468-1f9b2": {
-    "aliases": [],
-    "code": "1f468-200d-1f9b2",
-    "name": ":man_bald:"
-  },
-  "1f468-1f9b3": {
-    "aliases": [],
-    "code": "1f468-200d-1f9b3",
-    "name": ":man_white_haired:"
-  },
-  "1f468-1f9bc": {
-    "aliases": [],
-    "code": "1f468-200d-1f9bc",
-    "name": ":man_in_motorized_wheelchair:"
-  },
-  "1f468-1f9bd": {
-    "aliases": [],
-    "code": "1f468-200d-1f9bd",
-    "name": ":man_in_manual_wheelchair:"
-  },
-  "1f468-2695": {
-    "aliases": [],
-    "code": "1f468-200d-2695-fe0f",
-    "name": ":man_health_worker:"
-  },
-  "1f468-2696": {
-    "aliases": [],
-    "code": "1f468-200d-2696-fe0f",
-    "name": ":man_judge:"
-  },
-  "1f468-2708": {
-    "aliases": [],
-    "code": "1f468-200d-2708-fe0f",
-    "name": ":man_pilot:"
-  },
-  "1f468-2764-1f468": {
-    "aliases": [":couple_with_heart_mm:"],
-    "code": "1f468-200d-2764-fe0f-200d-1f468",
-    "name": ":couple_mm:"
-  },
-  "1f468-2764-1f48b-1f468": {
-    "aliases": [":couplekiss_mm:"],
-    "code": "1f468-200d-2764-fe0f-200d-1f48b-200d-1f468",
-    "name": ":kiss_mm:"
-  },
-  "1f469": {
-    "aliases": [],
-    "code": "1f469",
-    "name": ":woman:"
-  },
-  "1f469-1f33e": {
-    "aliases": [],
-    "code": "1f469-200d-1f33e",
-    "name": ":woman_farmer:"
-  },
-  "1f469-1f373": {
-    "aliases": [],
-    "code": "1f469-200d-1f373",
-    "name": ":woman_cook:"
-  },
-  "1f469-1f393": {
-    "aliases": [],
-    "code": "1f469-200d-1f393",
-    "name": ":woman_student:"
-  },
-  "1f469-1f3a4": {
-    "aliases": [],
-    "code": "1f469-200d-1f3a4",
-    "name": ":woman_singer:"
-  },
-  "1f469-1f3a8": {
-    "aliases": [],
-    "code": "1f469-200d-1f3a8",
-    "name": ":woman_artist:"
-  },
-  "1f469-1f3eb": {
-    "aliases": [],
-    "code": "1f469-200d-1f3eb",
-    "name": ":woman_teacher:"
-  },
-  "1f469-1f3ed": {
-    "aliases": [],
-    "code": "1f469-200d-1f3ed",
-    "name": ":woman_factory_worker:"
-  },
-  "1f469-1f3fb": {
-    "aliases": [],
-    "code": "1f469-1f3fb",
-    "name": ":woman_tone1:"
-  },
-  "1f469-1f3fb-1f33e": {
-    "aliases": [":woman_farmer_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f33e",
-    "name": ":woman_farmer_tone1:"
-  },
-  "1f469-1f3fb-1f373": {
-    "aliases": [":woman_cook_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f373",
-    "name": ":woman_cook_tone1:"
-  },
-  "1f469-1f3fb-1f393": {
-    "aliases": [":woman_student_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f393",
-    "name": ":woman_student_tone1:"
-  },
-  "1f469-1f3fb-1f3a4": {
-    "aliases": [":woman_singer_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f3a4",
-    "name": ":woman_singer_tone1:"
-  },
-  "1f469-1f3fb-1f3a8": {
-    "aliases": [":woman_artist_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f3a8",
-    "name": ":woman_artist_tone1:"
-  },
-  "1f469-1f3fb-1f3eb": {
-    "aliases": [":woman_teacher_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f3eb",
-    "name": ":woman_teacher_tone1:"
-  },
-  "1f469-1f3fb-1f3ed": {
-    "aliases": [":woman_factory_worker_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f3ed",
-    "name": ":woman_factory_worker_tone1:"
-  },
-  "1f469-1f3fb-1f4bb": {
-    "aliases": [":woman_technologist_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f4bb",
-    "name": ":woman_technologist_tone1:"
-  },
-  "1f469-1f3fb-1f4bc": {
-    "aliases": [":woman_office_worker_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f4bc",
-    "name": ":woman_office_worker_tone1:"
-  },
-  "1f469-1f3fb-1f527": {
-    "aliases": [":woman_mechanic_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f527",
-    "name": ":woman_mechanic_tone1:"
-  },
-  "1f469-1f3fb-1f52c": {
-    "aliases": [":woman_scientist_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f52c",
-    "name": ":woman_scientist_tone1:"
-  },
-  "1f469-1f3fb-1f680": {
-    "aliases": [":woman_astronaut_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f680",
-    "name": ":woman_astronaut_tone1:"
-  },
-  "1f469-1f3fb-1f692": {
-    "aliases": [":woman_firefighter_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f692",
-    "name": ":woman_firefighter_tone1:"
-  },
-  "1f469-1f3fb-1f91d-1f468-1f3fc": {
-    "aliases": [":woman_and_man_holding_hands_light_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":woman_and_man_holding_hands_tone1_tone2:"
-  },
-  "1f469-1f3fb-1f91d-1f468-1f3fd": {
-    "aliases": [":woman_and_man_holding_hands_light_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":woman_and_man_holding_hands_tone1_tone3:"
-  },
-  "1f469-1f3fb-1f91d-1f468-1f3fe": {
-    "aliases": [":woman_and_man_holding_hands_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":woman_and_man_holding_hands_tone1_tone4:"
-  },
-  "1f469-1f3fb-1f91d-1f468-1f3ff": {
-    "aliases": [":woman_and_man_holding_hands_light_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":woman_and_man_holding_hands_tone1_tone5:"
-  },
-  "1f469-1f3fb-1f91d-1f469-1f3fc": {
-    "aliases": [":women_holding_hands_light_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fc",
-    "name": ":women_holding_hands_tone1_tone2:"
-  },
-  "1f469-1f3fb-1f91d-1f469-1f3fd": {
-    "aliases": [":women_holding_hands_light_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fd",
-    "name": ":women_holding_hands_tone1_tone3:"
-  },
-  "1f469-1f3fb-1f91d-1f469-1f3fe": {
-    "aliases": [":women_holding_hands_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3fe",
-    "name": ":women_holding_hands_tone1_tone4:"
-  },
-  "1f469-1f3fb-1f91d-1f469-1f3ff": {
-    "aliases": [":women_holding_hands_light_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f91d-200d-1f469-1f3ff",
-    "name": ":women_holding_hands_tone1_tone5:"
-  },
-  "1f469-1f3fb-1f9af": {
-    "aliases": [":woman_with_probing_cane_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9af",
-    "name": ":woman_with_probing_cane_tone1:"
-  },
-  "1f469-1f3fb-1f9b0": {
-    "aliases": [":woman_red_haired_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9b0",
-    "name": ":woman_red_haired_tone1:"
-  },
-  "1f469-1f3fb-1f9b1": {
-    "aliases": [":woman_curly_haired_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9b1",
-    "name": ":woman_curly_haired_tone1:"
-  },
-  "1f469-1f3fb-1f9b2": {
-    "aliases": [":woman_bald_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9b2",
-    "name": ":woman_bald_tone1:"
-  },
-  "1f469-1f3fb-1f9b3": {
-    "aliases": [":woman_white_haired_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9b3",
-    "name": ":woman_white_haired_tone1:"
-  },
-  "1f469-1f3fb-1f9bc": {
-    "aliases": [":woman_in_motorized_wheelchair_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair_tone1:"
-  },
-  "1f469-1f3fb-1f9bd": {
-    "aliases": [":woman_in_manual_wheelchair_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair_tone1:"
-  },
-  "1f469-1f3fb-2695": {
-    "aliases": [":woman_health_worker_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-2695-fe0f",
-    "name": ":woman_health_worker_tone1:"
-  },
-  "1f469-1f3fb-2696": {
-    "aliases": [":woman_judge_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-2696-fe0f",
-    "name": ":woman_judge_tone1:"
-  },
-  "1f469-1f3fb-2708": {
-    "aliases": [":woman_pilot_light_skin_tone:"],
-    "code": "1f469-1f3fb-200d-2708-fe0f",
-    "name": ":woman_pilot_tone1:"
-  },
-  "1f469-1f3fc": {
-    "aliases": [],
-    "code": "1f469-1f3fc",
-    "name": ":woman_tone2:"
-  },
-  "1f469-1f3fc-1f33e": {
-    "aliases": [":woman_farmer_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f33e",
-    "name": ":woman_farmer_tone2:"
-  },
-  "1f469-1f3fc-1f373": {
-    "aliases": [":woman_cook_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f373",
-    "name": ":woman_cook_tone2:"
-  },
-  "1f469-1f3fc-1f393": {
-    "aliases": [":woman_student_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f393",
-    "name": ":woman_student_tone2:"
-  },
-  "1f469-1f3fc-1f3a4": {
-    "aliases": [":woman_singer_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f3a4",
-    "name": ":woman_singer_tone2:"
-  },
-  "1f469-1f3fc-1f3a8": {
-    "aliases": [":woman_artist_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f3a8",
-    "name": ":woman_artist_tone2:"
-  },
-  "1f469-1f3fc-1f3eb": {
-    "aliases": [":woman_teacher_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f3eb",
-    "name": ":woman_teacher_tone2:"
-  },
-  "1f469-1f3fc-1f3ed": {
-    "aliases": [":woman_factory_worker_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f3ed",
-    "name": ":woman_factory_worker_tone2:"
-  },
-  "1f469-1f3fc-1f4bb": {
-    "aliases": [":woman_technologist_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f4bb",
-    "name": ":woman_technologist_tone2:"
-  },
-  "1f469-1f3fc-1f4bc": {
-    "aliases": [":woman_office_worker_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f4bc",
-    "name": ":woman_office_worker_tone2:"
-  },
-  "1f469-1f3fc-1f527": {
-    "aliases": [":woman_mechanic_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f527",
-    "name": ":woman_mechanic_tone2:"
-  },
-  "1f469-1f3fc-1f52c": {
-    "aliases": [":woman_scientist_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f52c",
-    "name": ":woman_scientist_tone2:"
-  },
-  "1f469-1f3fc-1f680": {
-    "aliases": [":woman_astronaut_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f680",
-    "name": ":woman_astronaut_tone2:"
-  },
-  "1f469-1f3fc-1f692": {
-    "aliases": [":woman_firefighter_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f692",
-    "name": ":woman_firefighter_tone2:"
-  },
-  "1f469-1f3fc-1f91d-1f468-1f3fb": {
-    "aliases": [":woman_and_man_holding_hands_medium_light_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":woman_and_man_holding_hands_tone2_tone1:"
-  },
-  "1f469-1f3fc-1f91d-1f468-1f3fd": {
-    "aliases": [":woman_and_man_holding_hands_medium_light_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":woman_and_man_holding_hands_tone2_tone3:"
-  },
-  "1f469-1f3fc-1f91d-1f468-1f3fe": {
-    "aliases": [":woman_and_man_holding_hands_medium_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":woman_and_man_holding_hands_tone2_tone4:"
-  },
-  "1f469-1f3fc-1f91d-1f468-1f3ff": {
-    "aliases": [":woman_and_man_holding_hands_medium_light_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":woman_and_man_holding_hands_tone2_tone5:"
-  },
-  "1f469-1f3fc-1f91d-1f469-1f3fb": {
-    "aliases": [":women_holding_hands_medium_light_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fb",
-    "name": ":women_holding_hands_tone2_tone1:"
-  },
-  "1f469-1f3fc-1f91d-1f469-1f3fd": {
-    "aliases": [":women_holding_hands_medium_light_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fd",
-    "name": ":women_holding_hands_tone2_tone3:"
-  },
-  "1f469-1f3fc-1f91d-1f469-1f3fe": {
-    "aliases": [":women_holding_hands_medium_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3fe",
-    "name": ":women_holding_hands_tone2_tone4:"
-  },
-  "1f469-1f3fc-1f91d-1f469-1f3ff": {
-    "aliases": [":women_holding_hands_medium_light_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f91d-200d-1f469-1f3ff",
-    "name": ":women_holding_hands_tone2_tone5:"
-  },
-  "1f469-1f3fc-1f9af": {
-    "aliases": [":woman_with_probing_cane_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9af",
-    "name": ":woman_with_probing_cane_tone2:"
-  },
-  "1f469-1f3fc-1f9b0": {
-    "aliases": [":woman_red_haired_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9b0",
-    "name": ":woman_red_haired_tone2:"
-  },
-  "1f469-1f3fc-1f9b1": {
-    "aliases": [":woman_curly_haired_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9b1",
-    "name": ":woman_curly_haired_tone2:"
-  },
-  "1f469-1f3fc-1f9b2": {
-    "aliases": [":woman_bald_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9b2",
-    "name": ":woman_bald_tone2:"
-  },
-  "1f469-1f3fc-1f9b3": {
-    "aliases": [":woman_white_haired_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9b3",
-    "name": ":woman_white_haired_tone2:"
-  },
-  "1f469-1f3fc-1f9bc": {
-    "aliases": [":woman_in_motorized_wheelchair_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair_tone2:"
-  },
-  "1f469-1f3fc-1f9bd": {
-    "aliases": [":woman_in_manual_wheelchair_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair_tone2:"
-  },
-  "1f469-1f3fc-2695": {
-    "aliases": [":woman_health_worker_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-2695-fe0f",
-    "name": ":woman_health_worker_tone2:"
-  },
-  "1f469-1f3fc-2696": {
-    "aliases": [":woman_judge_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-2696-fe0f",
-    "name": ":woman_judge_tone2:"
-  },
-  "1f469-1f3fc-2708": {
-    "aliases": [":woman_pilot_medium_light_skin_tone:"],
-    "code": "1f469-1f3fc-200d-2708-fe0f",
-    "name": ":woman_pilot_tone2:"
-  },
-  "1f469-1f3fd": {
-    "aliases": [],
-    "code": "1f469-1f3fd",
-    "name": ":woman_tone3:"
-  },
-  "1f469-1f3fd-1f33e": {
-    "aliases": [":woman_farmer_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f33e",
-    "name": ":woman_farmer_tone3:"
-  },
-  "1f469-1f3fd-1f373": {
-    "aliases": [":woman_cook_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f373",
-    "name": ":woman_cook_tone3:"
-  },
-  "1f469-1f3fd-1f393": {
-    "aliases": [":woman_student_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f393",
-    "name": ":woman_student_tone3:"
-  },
-  "1f469-1f3fd-1f3a4": {
-    "aliases": [":woman_singer_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f3a4",
-    "name": ":woman_singer_tone3:"
-  },
-  "1f469-1f3fd-1f3a8": {
-    "aliases": [":woman_artist_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f3a8",
-    "name": ":woman_artist_tone3:"
-  },
-  "1f469-1f3fd-1f3eb": {
-    "aliases": [":woman_teacher_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f3eb",
-    "name": ":woman_teacher_tone3:"
-  },
-  "1f469-1f3fd-1f3ed": {
-    "aliases": [":woman_factory_worker_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f3ed",
-    "name": ":woman_factory_worker_tone3:"
-  },
-  "1f469-1f3fd-1f4bb": {
-    "aliases": [":woman_technologist_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f4bb",
-    "name": ":woman_technologist_tone3:"
-  },
-  "1f469-1f3fd-1f4bc": {
-    "aliases": [":woman_office_worker_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f4bc",
-    "name": ":woman_office_worker_tone3:"
-  },
-  "1f469-1f3fd-1f527": {
-    "aliases": [":woman_mechanic_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f527",
-    "name": ":woman_mechanic_tone3:"
-  },
-  "1f469-1f3fd-1f52c": {
-    "aliases": [":woman_scientist_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f52c",
-    "name": ":woman_scientist_tone3:"
-  },
-  "1f469-1f3fd-1f680": {
-    "aliases": [":woman_astronaut_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f680",
-    "name": ":woman_astronaut_tone3:"
-  },
-  "1f469-1f3fd-1f692": {
-    "aliases": [":woman_firefighter_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f692",
-    "name": ":woman_firefighter_tone3:"
-  },
-  "1f469-1f3fd-1f91d-1f468-1f3fb": {
-    "aliases": [":woman_and_man_holding_hands_medium_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":woman_and_man_holding_hands_tone3_tone1:"
-  },
-  "1f469-1f3fd-1f91d-1f468-1f3fc": {
-    "aliases": [":woman_and_man_holding_hands_medium_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":woman_and_man_holding_hands_tone3_tone2:"
-  },
-  "1f469-1f3fd-1f91d-1f468-1f3fe": {
-    "aliases": [":woman_and_man_holding_hands_medium_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":woman_and_man_holding_hands_tone3_tone4:"
-  },
-  "1f469-1f3fd-1f91d-1f468-1f3ff": {
-    "aliases": [":woman_and_man_holding_hands_medium_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":woman_and_man_holding_hands_tone3_tone5:"
-  },
-  "1f469-1f3fd-1f91d-1f469-1f3fb": {
-    "aliases": [":women_holding_hands_medium_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fb",
-    "name": ":women_holding_hands_tone3_tone1:"
-  },
-  "1f469-1f3fd-1f91d-1f469-1f3fc": {
-    "aliases": [":women_holding_hands_medium_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fc",
-    "name": ":women_holding_hands_tone3_tone2:"
-  },
-  "1f469-1f3fd-1f91d-1f469-1f3fe": {
-    "aliases": [":women_holding_hands_medium_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3fe",
-    "name": ":women_holding_hands_tone3_tone4:"
-  },
-  "1f469-1f3fd-1f91d-1f469-1f3ff": {
-    "aliases": [":women_holding_hands_medium_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f91d-200d-1f469-1f3ff",
-    "name": ":women_holding_hands_tone3_tone5:"
-  },
-  "1f469-1f3fd-1f9af": {
-    "aliases": [":woman_with_probing_cane_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9af",
-    "name": ":woman_with_probing_cane_tone3:"
-  },
-  "1f469-1f3fd-1f9b0": {
-    "aliases": [":woman_red_haired_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9b0",
-    "name": ":woman_red_haired_tone3:"
-  },
-  "1f469-1f3fd-1f9b1": {
-    "aliases": [":woman_curly_haired_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9b1",
-    "name": ":woman_curly_haired_tone3:"
-  },
-  "1f469-1f3fd-1f9b2": {
-    "aliases": [":woman_bald_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9b2",
-    "name": ":woman_bald_tone3:"
-  },
-  "1f469-1f3fd-1f9b3": {
-    "aliases": [":woman_white_haired_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9b3",
-    "name": ":woman_white_haired_tone3:"
-  },
-  "1f469-1f3fd-1f9bc": {
-    "aliases": [":woman_in_motorized_wheelchair_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair_tone3:"
-  },
-  "1f469-1f3fd-1f9bd": {
-    "aliases": [":woman_in_manual_wheelchair_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair_tone3:"
-  },
-  "1f469-1f3fd-2695": {
-    "aliases": [":woman_health_worker_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-2695-fe0f",
-    "name": ":woman_health_worker_tone3:"
-  },
-  "1f469-1f3fd-2696": {
-    "aliases": [":woman_judge_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-2696-fe0f",
-    "name": ":woman_judge_tone3:"
-  },
-  "1f469-1f3fd-2708": {
-    "aliases": [":woman_pilot_medium_skin_tone:"],
-    "code": "1f469-1f3fd-200d-2708-fe0f",
-    "name": ":woman_pilot_tone3:"
-  },
-  "1f469-1f3fe": {
-    "aliases": [],
-    "code": "1f469-1f3fe",
-    "name": ":woman_tone4:"
-  },
-  "1f469-1f3fe-1f33e": {
-    "aliases": [":woman_farmer_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f33e",
-    "name": ":woman_farmer_tone4:"
-  },
-  "1f469-1f3fe-1f373": {
-    "aliases": [":woman_cook_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f373",
-    "name": ":woman_cook_tone4:"
-  },
-  "1f469-1f3fe-1f393": {
-    "aliases": [":woman_student_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f393",
-    "name": ":woman_student_tone4:"
-  },
-  "1f469-1f3fe-1f3a4": {
-    "aliases": [":woman_singer_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f3a4",
-    "name": ":woman_singer_tone4:"
-  },
-  "1f469-1f3fe-1f3a8": {
-    "aliases": [":woman_artist_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f3a8",
-    "name": ":woman_artist_tone4:"
-  },
-  "1f469-1f3fe-1f3eb": {
-    "aliases": [":woman_teacher_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f3eb",
-    "name": ":woman_teacher_tone4:"
-  },
-  "1f469-1f3fe-1f3ed": {
-    "aliases": [":woman_factory_worker_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f3ed",
-    "name": ":woman_factory_worker_tone4:"
-  },
-  "1f469-1f3fe-1f4bb": {
-    "aliases": [":woman_technologist_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f4bb",
-    "name": ":woman_technologist_tone4:"
-  },
-  "1f469-1f3fe-1f4bc": {
-    "aliases": [":woman_office_worker_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f4bc",
-    "name": ":woman_office_worker_tone4:"
-  },
-  "1f469-1f3fe-1f527": {
-    "aliases": [":woman_mechanic_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f527",
-    "name": ":woman_mechanic_tone4:"
-  },
-  "1f469-1f3fe-1f52c": {
-    "aliases": [":woman_scientist_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f52c",
-    "name": ":woman_scientist_tone4:"
-  },
-  "1f469-1f3fe-1f680": {
-    "aliases": [":woman_astronaut_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f680",
-    "name": ":woman_astronaut_tone4:"
-  },
-  "1f469-1f3fe-1f692": {
-    "aliases": [":woman_firefighter_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f692",
-    "name": ":woman_firefighter_tone4:"
-  },
-  "1f469-1f3fe-1f91d-1f468-1f3fb": {
-    "aliases": [":woman_and_man_holding_hands_medium_dark_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":woman_and_man_holding_hands_tone4_tone1:"
-  },
-  "1f469-1f3fe-1f91d-1f468-1f3fc": {
-    "aliases": [":woman_and_man_holding_hands_medium_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":woman_and_man_holding_hands_tone4_tone2:"
-  },
-  "1f469-1f3fe-1f91d-1f468-1f3fd": {
-    "aliases": [":woman_and_man_holding_hands_medium_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":woman_and_man_holding_hands_tone4_tone3:"
-  },
-  "1f469-1f3fe-1f91d-1f468-1f3ff": {
-    "aliases": [":woman_and_man_holding_hands_medium_dark_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f468-1f3ff",
-    "name": ":woman_and_man_holding_hands_tone4_tone5:"
-  },
-  "1f469-1f3fe-1f91d-1f469-1f3fb": {
-    "aliases": [":women_holding_hands_medium_dark_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fb",
-    "name": ":women_holding_hands_tone4_tone1:"
-  },
-  "1f469-1f3fe-1f91d-1f469-1f3fc": {
-    "aliases": [":women_holding_hands_medium_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fc",
-    "name": ":women_holding_hands_tone4_tone2:"
-  },
-  "1f469-1f3fe-1f91d-1f469-1f3fd": {
-    "aliases": [":women_holding_hands_medium_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3fd",
-    "name": ":women_holding_hands_tone4_tone3:"
-  },
-  "1f469-1f3fe-1f91d-1f469-1f3ff": {
-    "aliases": [":women_holding_hands_medium_dark_skin_tone_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f91d-200d-1f469-1f3ff",
-    "name": ":women_holding_hands_tone4_tone5:"
-  },
-  "1f469-1f3fe-1f9af": {
-    "aliases": [":woman_with_probing_cane_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9af",
-    "name": ":woman_with_probing_cane_tone4:"
-  },
-  "1f469-1f3fe-1f9b0": {
-    "aliases": [":woman_red_haired_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9b0",
-    "name": ":woman_red_haired_tone4:"
-  },
-  "1f469-1f3fe-1f9b1": {
-    "aliases": [":woman_curly_haired_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9b1",
-    "name": ":woman_curly_haired_tone4:"
-  },
-  "1f469-1f3fe-1f9b2": {
-    "aliases": [":woman_bald_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9b2",
-    "name": ":woman_bald_tone4:"
-  },
-  "1f469-1f3fe-1f9b3": {
-    "aliases": [":woman_white_haired_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9b3",
-    "name": ":woman_white_haired_tone4:"
-  },
-  "1f469-1f3fe-1f9bc": {
-    "aliases": [":woman_in_motorized_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair_tone4:"
-  },
-  "1f469-1f3fe-1f9bd": {
-    "aliases": [":woman_in_manual_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair_tone4:"
-  },
-  "1f469-1f3fe-2695": {
-    "aliases": [":woman_health_worker_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-2695-fe0f",
-    "name": ":woman_health_worker_tone4:"
-  },
-  "1f469-1f3fe-2696": {
-    "aliases": [":woman_judge_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-2696-fe0f",
-    "name": ":woman_judge_tone4:"
-  },
-  "1f469-1f3fe-2708": {
-    "aliases": [":woman_pilot_medium_dark_skin_tone:"],
-    "code": "1f469-1f3fe-200d-2708-fe0f",
-    "name": ":woman_pilot_tone4:"
-  },
-  "1f469-1f3ff": {
-    "aliases": [],
-    "code": "1f469-1f3ff",
-    "name": ":woman_tone5:"
-  },
-  "1f469-1f3ff-1f33e": {
-    "aliases": [":woman_farmer_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f33e",
-    "name": ":woman_farmer_tone5:"
-  },
-  "1f469-1f3ff-1f373": {
-    "aliases": [":woman_cook_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f373",
-    "name": ":woman_cook_tone5:"
-  },
-  "1f469-1f3ff-1f393": {
-    "aliases": [":woman_student_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f393",
-    "name": ":woman_student_tone5:"
-  },
-  "1f469-1f3ff-1f3a4": {
-    "aliases": [":woman_singer_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f3a4",
-    "name": ":woman_singer_tone5:"
-  },
-  "1f469-1f3ff-1f3a8": {
-    "aliases": [":woman_artist_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f3a8",
-    "name": ":woman_artist_tone5:"
-  },
-  "1f469-1f3ff-1f3eb": {
-    "aliases": [":woman_teacher_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f3eb",
-    "name": ":woman_teacher_tone5:"
-  },
-  "1f469-1f3ff-1f3ed": {
-    "aliases": [":woman_factory_worker_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f3ed",
-    "name": ":woman_factory_worker_tone5:"
-  },
-  "1f469-1f3ff-1f4bb": {
-    "aliases": [":woman_technologist_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f4bb",
-    "name": ":woman_technologist_tone5:"
-  },
-  "1f469-1f3ff-1f4bc": {
-    "aliases": [":woman_office_worker_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f4bc",
-    "name": ":woman_office_worker_tone5:"
-  },
-  "1f469-1f3ff-1f527": {
-    "aliases": [":woman_mechanic_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f527",
-    "name": ":woman_mechanic_tone5:"
-  },
-  "1f469-1f3ff-1f52c": {
-    "aliases": [":woman_scientist_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f52c",
-    "name": ":woman_scientist_tone5:"
-  },
-  "1f469-1f3ff-1f680": {
-    "aliases": [":woman_astronaut_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f680",
-    "name": ":woman_astronaut_tone5:"
-  },
-  "1f469-1f3ff-1f692": {
-    "aliases": [":woman_firefighter_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f692",
-    "name": ":woman_firefighter_tone5:"
-  },
-  "1f469-1f3ff-1f91d-1f468-1f3fb": {
-    "aliases": [":woman_and_man_holding_hands_dark_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fb",
-    "name": ":woman_and_man_holding_hands_tone5_tone1:"
-  },
-  "1f469-1f3ff-1f91d-1f468-1f3fc": {
-    "aliases": [":woman_and_man_holding_hands_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fc",
-    "name": ":woman_and_man_holding_hands_tone5_tone2:"
-  },
-  "1f469-1f3ff-1f91d-1f468-1f3fd": {
-    "aliases": [":woman_and_man_holding_hands_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fd",
-    "name": ":woman_and_man_holding_hands_tone5_tone3:"
-  },
-  "1f469-1f3ff-1f91d-1f468-1f3fe": {
-    "aliases": [":woman_and_man_holding_hands_dark_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f468-1f3fe",
-    "name": ":woman_and_man_holding_hands_tone5_tone4:"
-  },
-  "1f469-1f3ff-1f91d-1f469-1f3fb": {
-    "aliases": [":women_holding_hands_dark_skin_tone_light_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fb",
-    "name": ":women_holding_hands_tone5_tone1:"
-  },
-  "1f469-1f3ff-1f91d-1f469-1f3fc": {
-    "aliases": [":women_holding_hands_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fc",
-    "name": ":women_holding_hands_tone5_tone2:"
-  },
-  "1f469-1f3ff-1f91d-1f469-1f3fd": {
-    "aliases": [":women_holding_hands_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fd",
-    "name": ":women_holding_hands_tone5_tone3:"
-  },
-  "1f469-1f3ff-1f91d-1f469-1f3fe": {
-    "aliases": [":women_holding_hands_dark_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f91d-200d-1f469-1f3fe",
-    "name": ":women_holding_hands_tone5_tone4:"
-  },
-  "1f469-1f3ff-1f9af": {
-    "aliases": [":woman_with_probing_cane_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9af",
-    "name": ":woman_with_probing_cane_tone5:"
-  },
-  "1f469-1f3ff-1f9b0": {
-    "aliases": [":woman_red_haired_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9b0",
-    "name": ":woman_red_haired_tone5:"
-  },
-  "1f469-1f3ff-1f9b1": {
-    "aliases": [":woman_curly_haired_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9b1",
-    "name": ":woman_curly_haired_tone5:"
-  },
-  "1f469-1f3ff-1f9b2": {
-    "aliases": [":woman_bald_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9b2",
-    "name": ":woman_bald_tone5:"
-  },
-  "1f469-1f3ff-1f9b3": {
-    "aliases": [":woman_white_haired_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9b3",
-    "name": ":woman_white_haired_tone5:"
-  },
-  "1f469-1f3ff-1f9bc": {
-    "aliases": [":woman_in_motorized_wheelchair_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair_tone5:"
-  },
-  "1f469-1f3ff-1f9bd": {
-    "aliases": [":woman_in_manual_wheelchair_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair_tone5:"
-  },
-  "1f469-1f3ff-2695": {
-    "aliases": [":woman_health_worker_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-2695-fe0f",
-    "name": ":woman_health_worker_tone5:"
-  },
-  "1f469-1f3ff-2696": {
-    "aliases": [":woman_judge_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-2696-fe0f",
-    "name": ":woman_judge_tone5:"
-  },
-  "1f469-1f3ff-2708": {
-    "aliases": [":woman_pilot_dark_skin_tone:"],
-    "code": "1f469-1f3ff-200d-2708-fe0f",
-    "name": ":woman_pilot_tone5:"
-  },
-  "1f469-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f466",
-    "name": ":family_woman_boy:"
-  },
-  "1f469-1f466-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f466-200d-1f466",
-    "name": ":family_woman_boy_boy:"
-  },
-  "1f469-1f467": {
-    "aliases": [],
-    "code": "1f469-200d-1f467",
-    "name": ":family_woman_girl:"
-  },
-  "1f469-1f467-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f467-200d-1f466",
-    "name": ":family_woman_girl_boy:"
-  },
-  "1f469-1f467-1f467": {
-    "aliases": [],
-    "code": "1f469-200d-1f467-200d-1f467",
-    "name": ":family_woman_girl_girl:"
-  },
-  "1f469-1f469-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f469-200d-1f466",
-    "name": ":family_wwb:"
-  },
-  "1f469-1f469-1f466-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f469-200d-1f466-200d-1f466",
-    "name": ":family_wwbb:"
-  },
-  "1f469-1f469-1f467": {
-    "aliases": [],
-    "code": "1f469-200d-1f469-200d-1f467",
-    "name": ":family_wwg:"
-  },
-  "1f469-1f469-1f467-1f466": {
-    "aliases": [],
-    "code": "1f469-200d-1f469-200d-1f467-200d-1f466",
-    "name": ":family_wwgb:"
-  },
-  "1f469-1f469-1f467-1f467": {
-    "aliases": [],
-    "code": "1f469-200d-1f469-200d-1f467-200d-1f467",
-    "name": ":family_wwgg:"
-  },
-  "1f469-1f4bb": {
-    "aliases": [],
-    "code": "1f469-200d-1f4bb",
-    "name": ":woman_technologist:"
-  },
-  "1f469-1f4bc": {
-    "aliases": [],
-    "code": "1f469-200d-1f4bc",
-    "name": ":woman_office_worker:"
-  },
-  "1f469-1f527": {
-    "aliases": [],
-    "code": "1f469-200d-1f527",
-    "name": ":woman_mechanic:"
-  },
-  "1f469-1f52c": {
-    "aliases": [],
-    "code": "1f469-200d-1f52c",
-    "name": ":woman_scientist:"
-  },
-  "1f469-1f680": {
-    "aliases": [],
-    "code": "1f469-200d-1f680",
-    "name": ":woman_astronaut:"
-  },
-  "1f469-1f692": {
-    "aliases": [],
-    "code": "1f469-200d-1f692",
-    "name": ":woman_firefighter:"
-  },
-  "1f469-1f9af": {
-    "aliases": [],
-    "code": "1f469-200d-1f9af",
-    "name": ":woman_with_probing_cane:"
-  },
-  "1f469-1f9b0": {
-    "aliases": [],
-    "code": "1f469-200d-1f9b0",
-    "name": ":woman_red_haired:"
-  },
-  "1f469-1f9b1": {
-    "aliases": [],
-    "code": "1f469-200d-1f9b1",
-    "name": ":woman_curly_haired:"
-  },
-  "1f469-1f9b2": {
-    "aliases": [],
-    "code": "1f469-200d-1f9b2",
-    "name": ":woman_bald:"
-  },
-  "1f469-1f9b3": {
-    "aliases": [],
-    "code": "1f469-200d-1f9b3",
-    "name": ":woman_white_haired:"
-  },
-  "1f469-1f9bc": {
-    "aliases": [],
-    "code": "1f469-200d-1f9bc",
-    "name": ":woman_in_motorized_wheelchair:"
-  },
-  "1f469-1f9bd": {
-    "aliases": [],
-    "code": "1f469-200d-1f9bd",
-    "name": ":woman_in_manual_wheelchair:"
-  },
-  "1f469-2695": {
-    "aliases": [],
-    "code": "1f469-200d-2695-fe0f",
-    "name": ":woman_health_worker:"
-  },
-  "1f469-2696": {
-    "aliases": [],
-    "code": "1f469-200d-2696-fe0f",
-    "name": ":woman_judge:"
-  },
-  "1f469-2708": {
-    "aliases": [],
-    "code": "1f469-200d-2708-fe0f",
-    "name": ":woman_pilot:"
-  },
-  "1f469-2764-1f468": {
-    "aliases": [],
-    "code": "1f469-200d-2764-fe0f-200d-1f468",
-    "name": ":couple_with_heart_woman_man:"
-  },
-  "1f469-2764-1f469": {
-    "aliases": [":couple_with_heart_ww:"],
-    "code": "1f469-200d-2764-fe0f-200d-1f469",
-    "name": ":couple_ww:"
-  },
-  "1f469-2764-1f48b-1f468": {
-    "aliases": [],
-    "code": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f468",
-    "name": ":kiss_woman_man:"
-  },
-  "1f469-2764-1f48b-1f469": {
-    "aliases": [":couplekiss_ww:"],
-    "code": "1f469-200d-2764-fe0f-200d-1f48b-200d-1f469",
-    "name": ":kiss_ww:"
-  },
-  "1f46a": {
-    "aliases": [],
-    "code": "1f46a",
-    "name": ":family:"
-  },
-  "1f46b": {
-    "aliases": [],
-    "code": "1f46b",
-    "name": ":couple:"
-  },
-  "1f46b-1f3fb": {
-    "aliases": [":woman_and_man_holding_hands_light_skin_tone:"],
-    "code": "1f46b-1f3fb",
-    "name": ":woman_and_man_holding_hands_tone1:"
-  },
-  "1f46b-1f3fc": {
-    "aliases": [":woman_and_man_holding_hands_medium_light_skin_tone:"],
-    "code": "1f46b-1f3fc",
-    "name": ":woman_and_man_holding_hands_tone2:"
-  },
-  "1f46b-1f3fd": {
-    "aliases": [":woman_and_man_holding_hands_medium_skin_tone:"],
-    "code": "1f46b-1f3fd",
-    "name": ":woman_and_man_holding_hands_tone3:"
-  },
-  "1f46b-1f3fe": {
-    "aliases": [":woman_and_man_holding_hands_medium_dark_skin_tone:"],
-    "code": "1f46b-1f3fe",
-    "name": ":woman_and_man_holding_hands_tone4:"
-  },
-  "1f46b-1f3ff": {
-    "aliases": [":woman_and_man_holding_hands_dark_skin_tone:"],
-    "code": "1f46b-1f3ff",
-    "name": ":woman_and_man_holding_hands_tone5:"
-  },
-  "1f46c": {
-    "aliases": [],
-    "code": "1f46c",
-    "name": ":two_men_holding_hands:"
-  },
-  "1f46c-1f3fb": {
-    "aliases": [":men_holding_hands_light_skin_tone:"],
-    "code": "1f46c-1f3fb",
-    "name": ":men_holding_hands_tone1:"
-  },
-  "1f46c-1f3fc": {
-    "aliases": [":men_holding_hands_medium_light_skin_tone:"],
-    "code": "1f46c-1f3fc",
-    "name": ":men_holding_hands_tone2:"
-  },
-  "1f46c-1f3fd": {
-    "aliases": [":men_holding_hands_medium_skin_tone:"],
-    "code": "1f46c-1f3fd",
-    "name": ":men_holding_hands_tone3:"
-  },
-  "1f46c-1f3fe": {
-    "aliases": [":men_holding_hands_medium_dark_skin_tone:"],
-    "code": "1f46c-1f3fe",
-    "name": ":men_holding_hands_tone4:"
-  },
-  "1f46c-1f3ff": {
-    "aliases": [":men_holding_hands_dark_skin_tone:"],
-    "code": "1f46c-1f3ff",
-    "name": ":men_holding_hands_tone5:"
-  },
-  "1f46d": {
-    "aliases": [],
-    "code": "1f46d",
-    "name": ":two_women_holding_hands:"
-  },
-  "1f46d-1f3fb": {
-    "aliases": [":women_holding_hands_light_skin_tone:"],
-    "code": "1f46d-1f3fb",
-    "name": ":women_holding_hands_tone1:"
-  },
-  "1f46d-1f3fc": {
-    "aliases": [":women_holding_hands_medium_light_skin_tone:"],
-    "code": "1f46d-1f3fc",
-    "name": ":women_holding_hands_tone2:"
-  },
-  "1f46d-1f3fd": {
-    "aliases": [":women_holding_hands_medium_skin_tone:"],
-    "code": "1f46d-1f3fd",
-    "name": ":women_holding_hands_tone3:"
-  },
-  "1f46d-1f3fe": {
-    "aliases": [":women_holding_hands_medium_dark_skin_tone:"],
-    "code": "1f46d-1f3fe",
-    "name": ":women_holding_hands_tone4:"
-  },
-  "1f46d-1f3ff": {
-    "aliases": [":women_holding_hands_dark_skin_tone:"],
-    "code": "1f46d-1f3ff",
-    "name": ":women_holding_hands_tone5:"
-  },
-  "1f46e": {
-    "aliases": [":cop:"],
-    "code": "1f46e",
-    "name": ":police_officer:"
-  },
-  "1f46e-1f3fb": {
-    "aliases": [":cop_tone1:"],
-    "code": "1f46e-1f3fb",
-    "name": ":police_officer_tone1:"
-  },
-  "1f46e-1f3fb-2640": {
-    "aliases": [":woman_police_officer_light_skin_tone:"],
-    "code": "1f46e-1f3fb-200d-2640-fe0f",
-    "name": ":woman_police_officer_tone1:"
-  },
-  "1f46e-1f3fb-2642": {
-    "aliases": [":man_police_officer_light_skin_tone:"],
-    "code": "1f46e-1f3fb-200d-2642-fe0f",
-    "name": ":man_police_officer_tone1:"
-  },
-  "1f46e-1f3fc": {
-    "aliases": [":cop_tone2:"],
-    "code": "1f46e-1f3fc",
-    "name": ":police_officer_tone2:"
-  },
-  "1f46e-1f3fc-2640": {
-    "aliases": [":woman_police_officer_medium_light_skin_tone:"],
-    "code": "1f46e-1f3fc-200d-2640-fe0f",
-    "name": ":woman_police_officer_tone2:"
-  },
-  "1f46e-1f3fc-2642": {
-    "aliases": [":man_police_officer_medium_light_skin_tone:"],
-    "code": "1f46e-1f3fc-200d-2642-fe0f",
-    "name": ":man_police_officer_tone2:"
-  },
-  "1f46e-1f3fd": {
-    "aliases": [":cop_tone3:"],
-    "code": "1f46e-1f3fd",
-    "name": ":police_officer_tone3:"
-  },
-  "1f46e-1f3fd-2640": {
-    "aliases": [":woman_police_officer_medium_skin_tone:"],
-    "code": "1f46e-1f3fd-200d-2640-fe0f",
-    "name": ":woman_police_officer_tone3:"
-  },
-  "1f46e-1f3fd-2642": {
-    "aliases": [":man_police_officer_medium_skin_tone:"],
-    "code": "1f46e-1f3fd-200d-2642-fe0f",
-    "name": ":man_police_officer_tone3:"
-  },
-  "1f46e-1f3fe": {
-    "aliases": [":cop_tone4:"],
-    "code": "1f46e-1f3fe",
-    "name": ":police_officer_tone4:"
-  },
-  "1f46e-1f3fe-2640": {
-    "aliases": [":woman_police_officer_medium_dark_skin_tone:"],
-    "code": "1f46e-1f3fe-200d-2640-fe0f",
-    "name": ":woman_police_officer_tone4:"
-  },
-  "1f46e-1f3fe-2642": {
-    "aliases": [":man_police_officer_medium_dark_skin_tone:"],
-    "code": "1f46e-1f3fe-200d-2642-fe0f",
-    "name": ":man_police_officer_tone4:"
-  },
-  "1f46e-1f3ff": {
-    "aliases": [":cop_tone5:"],
-    "code": "1f46e-1f3ff",
-    "name": ":police_officer_tone5:"
-  },
-  "1f46e-1f3ff-2640": {
-    "aliases": [":woman_police_officer_dark_skin_tone:"],
-    "code": "1f46e-1f3ff-200d-2640-fe0f",
-    "name": ":woman_police_officer_tone5:"
-  },
-  "1f46e-1f3ff-2642": {
-    "aliases": [":man_police_officer_dark_skin_tone:"],
-    "code": "1f46e-1f3ff-200d-2642-fe0f",
-    "name": ":man_police_officer_tone5:"
-  },
-  "1f46e-2640": {
-    "aliases": [],
-    "code": "1f46e-200d-2640-fe0f",
-    "name": ":woman_police_officer:"
-  },
-  "1f46e-2642": {
-    "aliases": [],
-    "code": "1f46e-200d-2642-fe0f",
-    "name": ":man_police_officer:"
-  },
-  "1f46f": {
-    "aliases": [":dancers:"],
-    "code": "1f46f",
-    "name": ":people_with_bunny_ears_partying:"
-  },
-  "1f46f-2640": {
-    "aliases": [],
-    "code": "1f46f-200d-2640-fe0f",
-    "name": ":women_with_bunny_ears_partying:"
-  },
-  "1f46f-2642": {
-    "aliases": [],
-    "code": "1f46f-200d-2642-fe0f",
-    "name": ":men_with_bunny_ears_partying:"
-  },
-  "1f470": {
-    "aliases": [],
-    "code": "1f470",
-    "name": ":bride_with_veil:"
-  },
-  "1f470-1f3fb": {
-    "aliases": [],
-    "code": "1f470-1f3fb",
-    "name": ":bride_with_veil_tone1:"
-  },
-  "1f470-1f3fc": {
-    "aliases": [],
-    "code": "1f470-1f3fc",
-    "name": ":bride_with_veil_tone2:"
-  },
-  "1f470-1f3fd": {
-    "aliases": [],
-    "code": "1f470-1f3fd",
-    "name": ":bride_with_veil_tone3:"
-  },
-  "1f470-1f3fe": {
-    "aliases": [],
-    "code": "1f470-1f3fe",
-    "name": ":bride_with_veil_tone4:"
-  },
-  "1f470-1f3ff": {
-    "aliases": [],
-    "code": "1f470-1f3ff",
-    "name": ":bride_with_veil_tone5:"
-  },
-  "1f471": {
-    "aliases": [":person_with_blond_hair:"],
-    "code": "1f471",
-    "name": ":blond_haired_person:"
-  },
-  "1f471-1f3fb": {
-    "aliases": [":person_with_blond_hair_tone1:"],
-    "code": "1f471-1f3fb",
-    "name": ":blond_haired_person_tone1:"
-  },
-  "1f471-1f3fb-2640": {
-    "aliases": [":blond-haired_woman_light_skin_tone:"],
-    "code": "1f471-1f3fb-200d-2640-fe0f",
-    "name": ":blond-haired_woman_tone1:"
-  },
-  "1f471-1f3fb-2642": {
-    "aliases": [":blond-haired_man_light_skin_tone:"],
-    "code": "1f471-1f3fb-200d-2642-fe0f",
-    "name": ":blond-haired_man_tone1:"
-  },
-  "1f471-1f3fc": {
-    "aliases": [":person_with_blond_hair_tone2:"],
-    "code": "1f471-1f3fc",
-    "name": ":blond_haired_person_tone2:"
-  },
-  "1f471-1f3fc-2640": {
-    "aliases": [":blond-haired_woman_medium_light_skin_tone:"],
-    "code": "1f471-1f3fc-200d-2640-fe0f",
-    "name": ":blond-haired_woman_tone2:"
-  },
-  "1f471-1f3fc-2642": {
-    "aliases": [":blond-haired_man_medium_light_skin_tone:"],
-    "code": "1f471-1f3fc-200d-2642-fe0f",
-    "name": ":blond-haired_man_tone2:"
-  },
-  "1f471-1f3fd": {
-    "aliases": [":person_with_blond_hair_tone3:"],
-    "code": "1f471-1f3fd",
-    "name": ":blond_haired_person_tone3:"
-  },
-  "1f471-1f3fd-2640": {
-    "aliases": [":blond-haired_woman_medium_skin_tone:"],
-    "code": "1f471-1f3fd-200d-2640-fe0f",
-    "name": ":blond-haired_woman_tone3:"
-  },
-  "1f471-1f3fd-2642": {
-    "aliases": [":blond-haired_man_medium_skin_tone:"],
-    "code": "1f471-1f3fd-200d-2642-fe0f",
-    "name": ":blond-haired_man_tone3:"
-  },
-  "1f471-1f3fe": {
-    "aliases": [":person_with_blond_hair_tone4:"],
-    "code": "1f471-1f3fe",
-    "name": ":blond_haired_person_tone4:"
-  },
-  "1f471-1f3fe-2640": {
-    "aliases": [":blond-haired_woman_medium_dark_skin_tone:"],
-    "code": "1f471-1f3fe-200d-2640-fe0f",
-    "name": ":blond-haired_woman_tone4:"
-  },
-  "1f471-1f3fe-2642": {
-    "aliases": [":blond-haired_man_medium_dark_skin_tone:"],
-    "code": "1f471-1f3fe-200d-2642-fe0f",
-    "name": ":blond-haired_man_tone4:"
-  },
-  "1f471-1f3ff": {
-    "aliases": [":person_with_blond_hair_tone5:"],
-    "code": "1f471-1f3ff",
-    "name": ":blond_haired_person_tone5:"
-  },
-  "1f471-1f3ff-2640": {
-    "aliases": [":blond-haired_woman_dark_skin_tone:"],
-    "code": "1f471-1f3ff-200d-2640-fe0f",
-    "name": ":blond-haired_woman_tone5:"
-  },
-  "1f471-1f3ff-2642": {
-    "aliases": [":blond-haired_man_dark_skin_tone:"],
-    "code": "1f471-1f3ff-200d-2642-fe0f",
-    "name": ":blond-haired_man_tone5:"
-  },
-  "1f471-2640": {
-    "aliases": [],
-    "code": "1f471-200d-2640-fe0f",
-    "name": ":blond-haired_woman:"
-  },
-  "1f471-2642": {
-    "aliases": [],
-    "code": "1f471-200d-2642-fe0f",
-    "name": ":blond-haired_man:"
-  },
-  "1f472": {
-    "aliases": [":man_with_gua_pi_mao:"],
-    "code": "1f472",
-    "name": ":man_with_chinese_cap:"
-  },
-  "1f472-1f3fb": {
-    "aliases": [":man_with_gua_pi_mao_tone1:"],
-    "code": "1f472-1f3fb",
-    "name": ":man_with_chinese_cap_tone1:"
-  },
-  "1f472-1f3fc": {
-    "aliases": [":man_with_gua_pi_mao_tone2:"],
-    "code": "1f472-1f3fc",
-    "name": ":man_with_chinese_cap_tone2:"
-  },
-  "1f472-1f3fd": {
-    "aliases": [":man_with_gua_pi_mao_tone3:"],
-    "code": "1f472-1f3fd",
-    "name": ":man_with_chinese_cap_tone3:"
-  },
-  "1f472-1f3fe": {
-    "aliases": [":man_with_gua_pi_mao_tone4:"],
-    "code": "1f472-1f3fe",
-    "name": ":man_with_chinese_cap_tone4:"
-  },
-  "1f472-1f3ff": {
-    "aliases": [":man_with_gua_pi_mao_tone5:"],
-    "code": "1f472-1f3ff",
-    "name": ":man_with_chinese_cap_tone5:"
-  },
-  "1f473": {
-    "aliases": [":man_with_turban:"],
-    "code": "1f473",
-    "name": ":person_wearing_turban:"
-  },
-  "1f473-1f3fb": {
-    "aliases": [":man_with_turban_tone1:"],
-    "code": "1f473-1f3fb",
-    "name": ":person_wearing_turban_tone1:"
-  },
-  "1f473-1f3fb-2640": {
-    "aliases": [":woman_wearing_turban_light_skin_tone:"],
-    "code": "1f473-1f3fb-200d-2640-fe0f",
-    "name": ":woman_wearing_turban_tone1:"
-  },
-  "1f473-1f3fb-2642": {
-    "aliases": [":man_wearing_turban_light_skin_tone:"],
-    "code": "1f473-1f3fb-200d-2642-fe0f",
-    "name": ":man_wearing_turban_tone1:"
-  },
-  "1f473-1f3fc": {
-    "aliases": [":man_with_turban_tone2:"],
-    "code": "1f473-1f3fc",
-    "name": ":person_wearing_turban_tone2:"
-  },
-  "1f473-1f3fc-2640": {
-    "aliases": [":woman_wearing_turban_medium_light_skin_tone:"],
-    "code": "1f473-1f3fc-200d-2640-fe0f",
-    "name": ":woman_wearing_turban_tone2:"
-  },
-  "1f473-1f3fc-2642": {
-    "aliases": [":man_wearing_turban_medium_light_skin_tone:"],
-    "code": "1f473-1f3fc-200d-2642-fe0f",
-    "name": ":man_wearing_turban_tone2:"
-  },
-  "1f473-1f3fd": {
-    "aliases": [":man_with_turban_tone3:"],
-    "code": "1f473-1f3fd",
-    "name": ":person_wearing_turban_tone3:"
-  },
-  "1f473-1f3fd-2640": {
-    "aliases": [":woman_wearing_turban_medium_skin_tone:"],
-    "code": "1f473-1f3fd-200d-2640-fe0f",
-    "name": ":woman_wearing_turban_tone3:"
-  },
-  "1f473-1f3fd-2642": {
-    "aliases": [":man_wearing_turban_medium_skin_tone:"],
-    "code": "1f473-1f3fd-200d-2642-fe0f",
-    "name": ":man_wearing_turban_tone3:"
-  },
-  "1f473-1f3fe": {
-    "aliases": [":man_with_turban_tone4:"],
-    "code": "1f473-1f3fe",
-    "name": ":person_wearing_turban_tone4:"
-  },
-  "1f473-1f3fe-2640": {
-    "aliases": [":woman_wearing_turban_medium_dark_skin_tone:"],
-    "code": "1f473-1f3fe-200d-2640-fe0f",
-    "name": ":woman_wearing_turban_tone4:"
-  },
-  "1f473-1f3fe-2642": {
-    "aliases": [":man_wearing_turban_medium_dark_skin_tone:"],
-    "code": "1f473-1f3fe-200d-2642-fe0f",
-    "name": ":man_wearing_turban_tone4:"
-  },
-  "1f473-1f3ff": {
-    "aliases": [":man_with_turban_tone5:"],
-    "code": "1f473-1f3ff",
-    "name": ":person_wearing_turban_tone5:"
-  },
-  "1f473-1f3ff-2640": {
-    "aliases": [":woman_wearing_turban_dark_skin_tone:"],
-    "code": "1f473-1f3ff-200d-2640-fe0f",
-    "name": ":woman_wearing_turban_tone5:"
-  },
-  "1f473-1f3ff-2642": {
-    "aliases": [":man_wearing_turban_dark_skin_tone:"],
-    "code": "1f473-1f3ff-200d-2642-fe0f",
-    "name": ":man_wearing_turban_tone5:"
-  },
-  "1f473-2640": {
-    "aliases": [],
-    "code": "1f473-200d-2640-fe0f",
-    "name": ":woman_wearing_turban:"
-  },
-  "1f473-2642": {
-    "aliases": [],
-    "code": "1f473-200d-2642-fe0f",
-    "name": ":man_wearing_turban:"
-  },
-  "1f474": {
-    "aliases": [],
-    "code": "1f474",
-    "name": ":older_man:"
-  },
-  "1f474-1f3fb": {
-    "aliases": [],
-    "code": "1f474-1f3fb",
-    "name": ":older_man_tone1:"
-  },
-  "1f474-1f3fc": {
-    "aliases": [],
-    "code": "1f474-1f3fc",
-    "name": ":older_man_tone2:"
-  },
-  "1f474-1f3fd": {
-    "aliases": [],
-    "code": "1f474-1f3fd",
-    "name": ":older_man_tone3:"
-  },
-  "1f474-1f3fe": {
-    "aliases": [],
-    "code": "1f474-1f3fe",
-    "name": ":older_man_tone4:"
-  },
-  "1f474-1f3ff": {
-    "aliases": [],
-    "code": "1f474-1f3ff",
-    "name": ":older_man_tone5:"
-  },
-  "1f475": {
-    "aliases": [":grandma:"],
-    "code": "1f475",
-    "name": ":older_woman:"
-  },
-  "1f475-1f3fb": {
-    "aliases": [":grandma_tone1:"],
-    "code": "1f475-1f3fb",
-    "name": ":older_woman_tone1:"
-  },
-  "1f475-1f3fc": {
-    "aliases": [":grandma_tone2:"],
-    "code": "1f475-1f3fc",
-    "name": ":older_woman_tone2:"
-  },
-  "1f475-1f3fd": {
-    "aliases": [":grandma_tone3:"],
-    "code": "1f475-1f3fd",
-    "name": ":older_woman_tone3:"
-  },
-  "1f475-1f3fe": {
-    "aliases": [":grandma_tone4:"],
-    "code": "1f475-1f3fe",
-    "name": ":older_woman_tone4:"
-  },
-  "1f475-1f3ff": {
-    "aliases": [":grandma_tone5:"],
-    "code": "1f475-1f3ff",
-    "name": ":older_woman_tone5:"
-  },
-  "1f476": {
-    "aliases": [],
-    "code": "1f476",
-    "name": ":baby:"
-  },
-  "1f476-1f3fb": {
-    "aliases": [],
-    "code": "1f476-1f3fb",
-    "name": ":baby_tone1:"
-  },
-  "1f476-1f3fc": {
-    "aliases": [],
-    "code": "1f476-1f3fc",
-    "name": ":baby_tone2:"
-  },
-  "1f476-1f3fd": {
-    "aliases": [],
-    "code": "1f476-1f3fd",
-    "name": ":baby_tone3:"
-  },
-  "1f476-1f3fe": {
-    "aliases": [],
-    "code": "1f476-1f3fe",
-    "name": ":baby_tone4:"
-  },
-  "1f476-1f3ff": {
-    "aliases": [],
-    "code": "1f476-1f3ff",
-    "name": ":baby_tone5:"
-  },
-  "1f477": {
-    "aliases": [],
-    "code": "1f477",
-    "name": ":construction_worker:"
-  },
-  "1f477-1f3fb": {
-    "aliases": [],
-    "code": "1f477-1f3fb",
-    "name": ":construction_worker_tone1:"
-  },
-  "1f477-1f3fb-2640": {
-    "aliases": [":woman_construction_worker_light_skin_tone:"],
-    "code": "1f477-1f3fb-200d-2640-fe0f",
-    "name": ":woman_construction_worker_tone1:"
-  },
-  "1f477-1f3fb-2642": {
-    "aliases": [":man_construction_worker_light_skin_tone:"],
-    "code": "1f477-1f3fb-200d-2642-fe0f",
-    "name": ":man_construction_worker_tone1:"
-  },
-  "1f477-1f3fc": {
-    "aliases": [],
-    "code": "1f477-1f3fc",
-    "name": ":construction_worker_tone2:"
-  },
-  "1f477-1f3fc-2640": {
-    "aliases": [":woman_construction_worker_medium_light_skin_tone:"],
-    "code": "1f477-1f3fc-200d-2640-fe0f",
-    "name": ":woman_construction_worker_tone2:"
-  },
-  "1f477-1f3fc-2642": {
-    "aliases": [":man_construction_worker_medium_light_skin_tone:"],
-    "code": "1f477-1f3fc-200d-2642-fe0f",
-    "name": ":man_construction_worker_tone2:"
-  },
-  "1f477-1f3fd": {
-    "aliases": [],
-    "code": "1f477-1f3fd",
-    "name": ":construction_worker_tone3:"
-  },
-  "1f477-1f3fd-2640": {
-    "aliases": [":woman_construction_worker_medium_skin_tone:"],
-    "code": "1f477-1f3fd-200d-2640-fe0f",
-    "name": ":woman_construction_worker_tone3:"
-  },
-  "1f477-1f3fd-2642": {
-    "aliases": [":man_construction_worker_medium_skin_tone:"],
-    "code": "1f477-1f3fd-200d-2642-fe0f",
-    "name": ":man_construction_worker_tone3:"
-  },
-  "1f477-1f3fe": {
-    "aliases": [],
-    "code": "1f477-1f3fe",
-    "name": ":construction_worker_tone4:"
-  },
-  "1f477-1f3fe-2640": {
-    "aliases": [":woman_construction_worker_medium_dark_skin_tone:"],
-    "code": "1f477-1f3fe-200d-2640-fe0f",
-    "name": ":woman_construction_worker_tone4:"
-  },
-  "1f477-1f3fe-2642": {
-    "aliases": [":man_construction_worker_medium_dark_skin_tone:"],
-    "code": "1f477-1f3fe-200d-2642-fe0f",
-    "name": ":man_construction_worker_tone4:"
-  },
-  "1f477-1f3ff": {
-    "aliases": [],
-    "code": "1f477-1f3ff",
-    "name": ":construction_worker_tone5:"
-  },
-  "1f477-1f3ff-2640": {
-    "aliases": [":woman_construction_worker_dark_skin_tone:"],
-    "code": "1f477-1f3ff-200d-2640-fe0f",
-    "name": ":woman_construction_worker_tone5:"
-  },
-  "1f477-1f3ff-2642": {
-    "aliases": [":man_construction_worker_dark_skin_tone:"],
-    "code": "1f477-1f3ff-200d-2642-fe0f",
-    "name": ":man_construction_worker_tone5:"
-  },
-  "1f477-2640": {
-    "aliases": [],
-    "code": "1f477-200d-2640-fe0f",
-    "name": ":woman_construction_worker:"
-  },
-  "1f477-2642": {
-    "aliases": [],
-    "code": "1f477-200d-2642-fe0f",
-    "name": ":man_construction_worker:"
-  },
-  "1f478": {
-    "aliases": [],
-    "code": "1f478",
-    "name": ":princess:"
-  },
-  "1f478-1f3fb": {
-    "aliases": [],
-    "code": "1f478-1f3fb",
-    "name": ":princess_tone1:"
-  },
-  "1f478-1f3fc": {
-    "aliases": [],
-    "code": "1f478-1f3fc",
-    "name": ":princess_tone2:"
-  },
-  "1f478-1f3fd": {
-    "aliases": [],
-    "code": "1f478-1f3fd",
-    "name": ":princess_tone3:"
-  },
-  "1f478-1f3fe": {
-    "aliases": [],
-    "code": "1f478-1f3fe",
-    "name": ":princess_tone4:"
-  },
-  "1f478-1f3ff": {
-    "aliases": [],
-    "code": "1f478-1f3ff",
-    "name": ":princess_tone5:"
-  },
-  "1f479": {
-    "aliases": [],
-    "code": "1f479",
-    "name": ":japanese_ogre:"
-  },
-  "1f47a": {
-    "aliases": [],
-    "code": "1f47a",
-    "name": ":japanese_goblin:"
-  },
-  "1f47b": {
-    "aliases": [],
-    "code": "1f47b",
-    "name": ":ghost:"
-  },
-  "1f47c": {
-    "aliases": [],
-    "code": "1f47c",
-    "name": ":angel:"
-  },
-  "1f47c-1f3fb": {
-    "aliases": [],
-    "code": "1f47c-1f3fb",
-    "name": ":angel_tone1:"
-  },
-  "1f47c-1f3fc": {
-    "aliases": [],
-    "code": "1f47c-1f3fc",
-    "name": ":angel_tone2:"
-  },
-  "1f47c-1f3fd": {
-    "aliases": [],
-    "code": "1f47c-1f3fd",
-    "name": ":angel_tone3:"
-  },
-  "1f47c-1f3fe": {
-    "aliases": [],
-    "code": "1f47c-1f3fe",
-    "name": ":angel_tone4:"
-  },
-  "1f47c-1f3ff": {
-    "aliases": [],
-    "code": "1f47c-1f3ff",
-    "name": ":angel_tone5:"
-  },
-  "1f47d": {
-    "aliases": [],
-    "code": "1f47d",
-    "name": ":alien:"
-  },
-  "1f47e": {
-    "aliases": [],
-    "code": "1f47e",
-    "name": ":space_invader:"
-  },
-  "1f47f": {
-    "aliases": [],
-    "code": "1f47f",
-    "name": ":imp:"
-  },
-  "1f480": {
-    "aliases": [":skeleton:"],
-    "code": "1f480",
-    "name": ":skull:"
-  },
-  "1f481": {
-    "aliases": [":information_desk_person:"],
-    "code": "1f481",
-    "name": ":person_tipping_hand:"
-  },
-  "1f481-1f3fb": {
-    "aliases": [":information_desk_person_tone1:"],
-    "code": "1f481-1f3fb",
-    "name": ":person_tipping_hand_tone1:"
-  },
-  "1f481-1f3fb-2640": {
-    "aliases": [":woman_tipping_hand_light_skin_tone:"],
-    "code": "1f481-1f3fb-200d-2640-fe0f",
-    "name": ":woman_tipping_hand_tone1:"
-  },
-  "1f481-1f3fb-2642": {
-    "aliases": [":man_tipping_hand_light_skin_tone:"],
-    "code": "1f481-1f3fb-200d-2642-fe0f",
-    "name": ":man_tipping_hand_tone1:"
-  },
-  "1f481-1f3fc": {
-    "aliases": [":information_desk_person_tone2:"],
-    "code": "1f481-1f3fc",
-    "name": ":person_tipping_hand_tone2:"
-  },
-  "1f481-1f3fc-2640": {
-    "aliases": [":woman_tipping_hand_medium_light_skin_tone:"],
-    "code": "1f481-1f3fc-200d-2640-fe0f",
-    "name": ":woman_tipping_hand_tone2:"
-  },
-  "1f481-1f3fc-2642": {
-    "aliases": [":man_tipping_hand_medium_light_skin_tone:"],
-    "code": "1f481-1f3fc-200d-2642-fe0f",
-    "name": ":man_tipping_hand_tone2:"
-  },
-  "1f481-1f3fd": {
-    "aliases": [":information_desk_person_tone3:"],
-    "code": "1f481-1f3fd",
-    "name": ":person_tipping_hand_tone3:"
-  },
-  "1f481-1f3fd-2640": {
-    "aliases": [":woman_tipping_hand_medium_skin_tone:"],
-    "code": "1f481-1f3fd-200d-2640-fe0f",
-    "name": ":woman_tipping_hand_tone3:"
-  },
-  "1f481-1f3fd-2642": {
-    "aliases": [":man_tipping_hand_medium_skin_tone:"],
-    "code": "1f481-1f3fd-200d-2642-fe0f",
-    "name": ":man_tipping_hand_tone3:"
-  },
-  "1f481-1f3fe": {
-    "aliases": [":information_desk_person_tone4:"],
-    "code": "1f481-1f3fe",
-    "name": ":person_tipping_hand_tone4:"
-  },
-  "1f481-1f3fe-2640": {
-    "aliases": [":woman_tipping_hand_medium_dark_skin_tone:"],
-    "code": "1f481-1f3fe-200d-2640-fe0f",
-    "name": ":woman_tipping_hand_tone4:"
-  },
-  "1f481-1f3fe-2642": {
-    "aliases": [":man_tipping_hand_medium_dark_skin_tone:"],
-    "code": "1f481-1f3fe-200d-2642-fe0f",
-    "name": ":man_tipping_hand_tone4:"
-  },
-  "1f481-1f3ff": {
-    "aliases": [":information_desk_person_tone5:"],
-    "code": "1f481-1f3ff",
-    "name": ":person_tipping_hand_tone5:"
-  },
-  "1f481-1f3ff-2640": {
-    "aliases": [":woman_tipping_hand_dark_skin_tone:"],
-    "code": "1f481-1f3ff-200d-2640-fe0f",
-    "name": ":woman_tipping_hand_tone5:"
-  },
-  "1f481-1f3ff-2642": {
-    "aliases": [":man_tipping_hand_dark_skin_tone:"],
-    "code": "1f481-1f3ff-200d-2642-fe0f",
-    "name": ":man_tipping_hand_tone5:"
-  },
-  "1f481-2640": {
-    "aliases": [],
-    "code": "1f481-200d-2640-fe0f",
-    "name": ":woman_tipping_hand:"
-  },
-  "1f481-2642": {
-    "aliases": [],
-    "code": "1f481-200d-2642-fe0f",
-    "name": ":man_tipping_hand:"
-  },
-  "1f482": {
-    "aliases": [":guardsman:"],
-    "code": "1f482",
-    "name": ":guard:"
-  },
-  "1f482-1f3fb": {
-    "aliases": [":guardsman_tone1:"],
-    "code": "1f482-1f3fb",
-    "name": ":guard_tone1:"
-  },
-  "1f482-1f3fb-2640": {
-    "aliases": [":woman_guard_light_skin_tone:"],
-    "code": "1f482-1f3fb-200d-2640-fe0f",
-    "name": ":woman_guard_tone1:"
-  },
-  "1f482-1f3fb-2642": {
-    "aliases": [":man_guard_light_skin_tone:"],
-    "code": "1f482-1f3fb-200d-2642-fe0f",
-    "name": ":man_guard_tone1:"
-  },
-  "1f482-1f3fc": {
-    "aliases": [":guardsman_tone2:"],
-    "code": "1f482-1f3fc",
-    "name": ":guard_tone2:"
-  },
-  "1f482-1f3fc-2640": {
-    "aliases": [":woman_guard_medium_light_skin_tone:"],
-    "code": "1f482-1f3fc-200d-2640-fe0f",
-    "name": ":woman_guard_tone2:"
-  },
-  "1f482-1f3fc-2642": {
-    "aliases": [":man_guard_medium_light_skin_tone:"],
-    "code": "1f482-1f3fc-200d-2642-fe0f",
-    "name": ":man_guard_tone2:"
-  },
-  "1f482-1f3fd": {
-    "aliases": [":guardsman_tone3:"],
-    "code": "1f482-1f3fd",
-    "name": ":guard_tone3:"
-  },
-  "1f482-1f3fd-2640": {
-    "aliases": [":woman_guard_medium_skin_tone:"],
-    "code": "1f482-1f3fd-200d-2640-fe0f",
-    "name": ":woman_guard_tone3:"
-  },
-  "1f482-1f3fd-2642": {
-    "aliases": [":man_guard_medium_skin_tone:"],
-    "code": "1f482-1f3fd-200d-2642-fe0f",
-    "name": ":man_guard_tone3:"
-  },
-  "1f482-1f3fe": {
-    "aliases": [":guardsman_tone4:"],
-    "code": "1f482-1f3fe",
-    "name": ":guard_tone4:"
-  },
-  "1f482-1f3fe-2640": {
-    "aliases": [":woman_guard_medium_dark_skin_tone:"],
-    "code": "1f482-1f3fe-200d-2640-fe0f",
-    "name": ":woman_guard_tone4:"
-  },
-  "1f482-1f3fe-2642": {
-    "aliases": [":man_guard_medium_dark_skin_tone:"],
-    "code": "1f482-1f3fe-200d-2642-fe0f",
-    "name": ":man_guard_tone4:"
-  },
-  "1f482-1f3ff": {
-    "aliases": [":guardsman_tone5:"],
-    "code": "1f482-1f3ff",
-    "name": ":guard_tone5:"
-  },
-  "1f482-1f3ff-2640": {
-    "aliases": [":woman_guard_dark_skin_tone:"],
-    "code": "1f482-1f3ff-200d-2640-fe0f",
-    "name": ":woman_guard_tone5:"
-  },
-  "1f482-1f3ff-2642": {
-    "aliases": [":man_guard_dark_skin_tone:"],
-    "code": "1f482-1f3ff-200d-2642-fe0f",
-    "name": ":man_guard_tone5:"
-  },
-  "1f482-2640": {
-    "aliases": [],
-    "code": "1f482-200d-2640-fe0f",
-    "name": ":woman_guard:"
-  },
-  "1f482-2642": {
-    "aliases": [],
-    "code": "1f482-200d-2642-fe0f",
-    "name": ":man_guard:"
-  },
-  "1f483": {
-    "aliases": [],
-    "code": "1f483",
-    "name": ":dancer:"
-  },
-  "1f483-1f3fb": {
-    "aliases": [],
-    "code": "1f483-1f3fb",
-    "name": ":dancer_tone1:"
-  },
-  "1f483-1f3fc": {
-    "aliases": [],
-    "code": "1f483-1f3fc",
-    "name": ":dancer_tone2:"
-  },
-  "1f483-1f3fd": {
-    "aliases": [],
-    "code": "1f483-1f3fd",
-    "name": ":dancer_tone3:"
-  },
-  "1f483-1f3fe": {
-    "aliases": [],
-    "code": "1f483-1f3fe",
-    "name": ":dancer_tone4:"
-  },
-  "1f483-1f3ff": {
-    "aliases": [],
-    "code": "1f483-1f3ff",
-    "name": ":dancer_tone5:"
-  },
-  "1f484": {
-    "aliases": [],
-    "code": "1f484",
-    "name": ":lipstick:"
-  },
-  "1f485": {
-    "aliases": [],
-    "code": "1f485",
-    "name": ":nail_care:"
-  },
-  "1f485-1f3fb": {
-    "aliases": [],
-    "code": "1f485-1f3fb",
-    "name": ":nail_care_tone1:"
-  },
-  "1f485-1f3fc": {
-    "aliases": [],
-    "code": "1f485-1f3fc",
-    "name": ":nail_care_tone2:"
-  },
-  "1f485-1f3fd": {
-    "aliases": [],
-    "code": "1f485-1f3fd",
-    "name": ":nail_care_tone3:"
-  },
-  "1f485-1f3fe": {
-    "aliases": [],
-    "code": "1f485-1f3fe",
-    "name": ":nail_care_tone4:"
-  },
-  "1f485-1f3ff": {
-    "aliases": [],
-    "code": "1f485-1f3ff",
-    "name": ":nail_care_tone5:"
-  },
-  "1f486": {
-    "aliases": [":massage:"],
-    "code": "1f486",
-    "name": ":person_getting_massage:"
-  },
-  "1f486-1f3fb": {
-    "aliases": [":massage_tone1:"],
-    "code": "1f486-1f3fb",
-    "name": ":person_getting_massage_tone1:"
-  },
-  "1f486-1f3fb-2640": {
-    "aliases": [":woman_getting_face_massage_light_skin_tone:"],
-    "code": "1f486-1f3fb-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage_tone1:"
-  },
-  "1f486-1f3fb-2642": {
-    "aliases": [":man_getting_face_massage_light_skin_tone:"],
-    "code": "1f486-1f3fb-200d-2642-fe0f",
-    "name": ":man_getting_face_massage_tone1:"
-  },
-  "1f486-1f3fc": {
-    "aliases": [":massage_tone2:"],
-    "code": "1f486-1f3fc",
-    "name": ":person_getting_massage_tone2:"
-  },
-  "1f486-1f3fc-2640": {
-    "aliases": [":woman_getting_face_massage_medium_light_skin_tone:"],
-    "code": "1f486-1f3fc-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage_tone2:"
-  },
-  "1f486-1f3fc-2642": {
-    "aliases": [":man_getting_face_massage_medium_light_skin_tone:"],
-    "code": "1f486-1f3fc-200d-2642-fe0f",
-    "name": ":man_getting_face_massage_tone2:"
-  },
-  "1f486-1f3fd": {
-    "aliases": [":massage_tone3:"],
-    "code": "1f486-1f3fd",
-    "name": ":person_getting_massage_tone3:"
-  },
-  "1f486-1f3fd-2640": {
-    "aliases": [":woman_getting_face_massage_medium_skin_tone:"],
-    "code": "1f486-1f3fd-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage_tone3:"
-  },
-  "1f486-1f3fd-2642": {
-    "aliases": [":man_getting_face_massage_medium_skin_tone:"],
-    "code": "1f486-1f3fd-200d-2642-fe0f",
-    "name": ":man_getting_face_massage_tone3:"
-  },
-  "1f486-1f3fe": {
-    "aliases": [":massage_tone4:"],
-    "code": "1f486-1f3fe",
-    "name": ":person_getting_massage_tone4:"
-  },
-  "1f486-1f3fe-2640": {
-    "aliases": [":woman_getting_face_massage_medium_dark_skin_tone:"],
-    "code": "1f486-1f3fe-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage_tone4:"
-  },
-  "1f486-1f3fe-2642": {
-    "aliases": [":man_getting_face_massage_medium_dark_skin_tone:"],
-    "code": "1f486-1f3fe-200d-2642-fe0f",
-    "name": ":man_getting_face_massage_tone4:"
-  },
-  "1f486-1f3ff": {
-    "aliases": [":massage_tone5:"],
-    "code": "1f486-1f3ff",
-    "name": ":person_getting_massage_tone5:"
-  },
-  "1f486-1f3ff-2640": {
-    "aliases": [":woman_getting_face_massage_dark_skin_tone:"],
-    "code": "1f486-1f3ff-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage_tone5:"
-  },
-  "1f486-1f3ff-2642": {
-    "aliases": [":man_getting_face_massage_dark_skin_tone:"],
-    "code": "1f486-1f3ff-200d-2642-fe0f",
-    "name": ":man_getting_face_massage_tone5:"
-  },
-  "1f486-2640": {
-    "aliases": [],
-    "code": "1f486-200d-2640-fe0f",
-    "name": ":woman_getting_face_massage:"
-  },
-  "1f486-2642": {
-    "aliases": [],
-    "code": "1f486-200d-2642-fe0f",
-    "name": ":man_getting_face_massage:"
-  },
-  "1f487": {
-    "aliases": [":haircut:"],
-    "code": "1f487",
-    "name": ":person_getting_haircut:"
-  },
-  "1f487-1f3fb": {
-    "aliases": [":haircut_tone1:"],
-    "code": "1f487-1f3fb",
-    "name": ":person_getting_haircut_tone1:"
-  },
-  "1f487-1f3fb-2640": {
-    "aliases": [":woman_getting_haircut_light_skin_tone:"],
-    "code": "1f487-1f3fb-200d-2640-fe0f",
-    "name": ":woman_getting_haircut_tone1:"
-  },
-  "1f487-1f3fb-2642": {
-    "aliases": [":man_getting_haircut_light_skin_tone:"],
-    "code": "1f487-1f3fb-200d-2642-fe0f",
-    "name": ":man_getting_haircut_tone1:"
-  },
-  "1f487-1f3fc": {
-    "aliases": [":haircut_tone2:"],
-    "code": "1f487-1f3fc",
-    "name": ":person_getting_haircut_tone2:"
-  },
-  "1f487-1f3fc-2640": {
-    "aliases": [":woman_getting_haircut_medium_light_skin_tone:"],
-    "code": "1f487-1f3fc-200d-2640-fe0f",
-    "name": ":woman_getting_haircut_tone2:"
-  },
-  "1f487-1f3fc-2642": {
-    "aliases": [":man_getting_haircut_medium_light_skin_tone:"],
-    "code": "1f487-1f3fc-200d-2642-fe0f",
-    "name": ":man_getting_haircut_tone2:"
-  },
-  "1f487-1f3fd": {
-    "aliases": [":haircut_tone3:"],
-    "code": "1f487-1f3fd",
-    "name": ":person_getting_haircut_tone3:"
-  },
-  "1f487-1f3fd-2640": {
-    "aliases": [":woman_getting_haircut_medium_skin_tone:"],
-    "code": "1f487-1f3fd-200d-2640-fe0f",
-    "name": ":woman_getting_haircut_tone3:"
-  },
-  "1f487-1f3fd-2642": {
-    "aliases": [":man_getting_haircut_medium_skin_tone:"],
-    "code": "1f487-1f3fd-200d-2642-fe0f",
-    "name": ":man_getting_haircut_tone3:"
-  },
-  "1f487-1f3fe": {
-    "aliases": [":haircut_tone4:"],
-    "code": "1f487-1f3fe",
-    "name": ":person_getting_haircut_tone4:"
-  },
-  "1f487-1f3fe-2640": {
-    "aliases": [":woman_getting_haircut_medium_dark_skin_tone:"],
-    "code": "1f487-1f3fe-200d-2640-fe0f",
-    "name": ":woman_getting_haircut_tone4:"
-  },
-  "1f487-1f3fe-2642": {
-    "aliases": [":man_getting_haircut_medium_dark_skin_tone:"],
-    "code": "1f487-1f3fe-200d-2642-fe0f",
-    "name": ":man_getting_haircut_tone4:"
-  },
-  "1f487-1f3ff": {
-    "aliases": [":haircut_tone5:"],
-    "code": "1f487-1f3ff",
-    "name": ":person_getting_haircut_tone5:"
-  },
-  "1f487-1f3ff-2640": {
-    "aliases": [":woman_getting_haircut_dark_skin_tone:"],
-    "code": "1f487-1f3ff-200d-2640-fe0f",
-    "name": ":woman_getting_haircut_tone5:"
-  },
-  "1f487-1f3ff-2642": {
-    "aliases": [":man_getting_haircut_dark_skin_tone:"],
-    "code": "1f487-1f3ff-200d-2642-fe0f",
-    "name": ":man_getting_haircut_tone5:"
-  },
-  "1f487-2640": {
-    "aliases": [],
-    "code": "1f487-200d-2640-fe0f",
-    "name": ":woman_getting_haircut:"
-  },
-  "1f487-2642": {
-    "aliases": [],
-    "code": "1f487-200d-2642-fe0f",
-    "name": ":man_getting_haircut:"
-  },
-  "1f488": {
-    "aliases": [],
-    "code": "1f488",
-    "name": ":barber:"
-  },
-  "1f489": {
-    "aliases": [],
-    "code": "1f489",
-    "name": ":syringe:"
-  },
-  "1f48a": {
-    "aliases": [],
-    "code": "1f48a",
-    "name": ":pill:"
-  },
-  "1f48b": {
-    "aliases": [],
-    "code": "1f48b",
-    "name": ":kiss:"
-  },
-  "1f48c": {
-    "aliases": [],
-    "code": "1f48c",
-    "name": ":love_letter:"
-  },
-  "1f48d": {
-    "aliases": [],
-    "code": "1f48d",
-    "name": ":ring:"
-  },
-  "1f48e": {
-    "aliases": [],
-    "code": "1f48e",
-    "name": ":gem:"
-  },
-  "1f48f": {
-    "aliases": [],
-    "code": "1f48f",
-    "name": ":couplekiss:"
-  },
-  "1f490": {
-    "aliases": [],
-    "code": "1f490",
-    "name": ":bouquet:"
-  },
-  "1f491": {
-    "aliases": [],
-    "code": "1f491",
-    "name": ":couple_with_heart:"
-  },
-  "1f492": {
-    "aliases": [],
-    "code": "1f492",
-    "name": ":wedding:"
-  },
-  "1f493": {
-    "aliases": [],
-    "code": "1f493",
-    "name": ":heartbeat:"
-  },
-  "1f494": {
-    "aliases": [],
-    "code": "1f494",
-    "name": ":broken_heart:"
-  },
-  "1f495": {
-    "aliases": [],
-    "code": "1f495",
-    "name": ":two_hearts:"
-  },
-  "1f496": {
-    "aliases": [],
-    "code": "1f496",
-    "name": ":sparkling_heart:"
-  },
-  "1f497": {
-    "aliases": [],
-    "code": "1f497",
-    "name": ":heartpulse:"
-  },
-  "1f498": {
-    "aliases": [],
-    "code": "1f498",
-    "name": ":cupid:"
-  },
-  "1f499": {
-    "aliases": [],
-    "code": "1f499",
-    "name": ":blue_heart:"
-  },
-  "1f49a": {
-    "aliases": [],
-    "code": "1f49a",
-    "name": ":green_heart:"
-  },
-  "1f49b": {
-    "aliases": [],
-    "code": "1f49b",
-    "name": ":yellow_heart:"
-  },
-  "1f49c": {
-    "aliases": [],
-    "code": "1f49c",
-    "name": ":purple_heart:"
-  },
-  "1f49d": {
-    "aliases": [],
-    "code": "1f49d",
-    "name": ":gift_heart:"
-  },
-  "1f49e": {
-    "aliases": [],
-    "code": "1f49e",
-    "name": ":revolving_hearts:"
-  },
-  "1f49f": {
-    "aliases": [],
-    "code": "1f49f",
-    "name": ":heart_decoration:"
-  },
-  "1f4a0": {
-    "aliases": [],
-    "code": "1f4a0",
-    "name": ":diamond_shape_with_a_dot_inside:"
-  },
-  "1f4a1": {
-    "aliases": [],
-    "code": "1f4a1",
-    "name": ":bulb:"
-  },
-  "1f4a2": {
-    "aliases": [],
-    "code": "1f4a2",
-    "name": ":anger:"
-  },
-  "1f4a3": {
-    "aliases": [],
-    "code": "1f4a3",
-    "name": ":bomb:"
-  },
-  "1f4a4": {
-    "aliases": [],
-    "code": "1f4a4",
-    "name": ":zzz:"
-  },
-  "1f4a5": {
-    "aliases": [],
-    "code": "1f4a5",
-    "name": ":boom:"
-  },
-  "1f4a6": {
-    "aliases": [],
-    "code": "1f4a6",
-    "name": ":sweat_drops:"
-  },
-  "1f4a7": {
-    "aliases": [],
-    "code": "1f4a7",
-    "name": ":droplet:"
-  },
-  "1f4a8": {
-    "aliases": [],
-    "code": "1f4a8",
-    "name": ":dash:"
-  },
-  "1f4a9": {
-    "aliases": [":shit:", ":hankey:", ":poo:"],
-    "code": "1f4a9",
-    "name": ":poop:"
-  },
-  "1f4aa": {
-    "aliases": [],
-    "code": "1f4aa",
-    "name": ":muscle:"
-  },
-  "1f4aa-1f3fb": {
-    "aliases": [],
-    "code": "1f4aa-1f3fb",
-    "name": ":muscle_tone1:"
-  },
-  "1f4aa-1f3fc": {
-    "aliases": [],
-    "code": "1f4aa-1f3fc",
-    "name": ":muscle_tone2:"
-  },
-  "1f4aa-1f3fd": {
-    "aliases": [],
-    "code": "1f4aa-1f3fd",
-    "name": ":muscle_tone3:"
-  },
-  "1f4aa-1f3fe": {
-    "aliases": [],
-    "code": "1f4aa-1f3fe",
-    "name": ":muscle_tone4:"
-  },
-  "1f4aa-1f3ff": {
-    "aliases": [],
-    "code": "1f4aa-1f3ff",
-    "name": ":muscle_tone5:"
-  },
-  "1f4ab": {
-    "aliases": [],
-    "code": "1f4ab",
-    "name": ":dizzy:"
-  },
-  "1f4ac": {
-    "aliases": [],
-    "code": "1f4ac",
-    "name": ":speech_balloon:"
-  },
-  "1f4ad": {
-    "aliases": [],
-    "code": "1f4ad",
-    "name": ":thought_balloon:"
-  },
-  "1f4ae": {
-    "aliases": [],
-    "code": "1f4ae",
-    "name": ":white_flower:"
-  },
-  "1f4af": {
-    "aliases": [],
-    "code": "1f4af",
-    "name": ":100:"
-  },
-  "1f4b0": {
-    "aliases": [],
-    "code": "1f4b0",
-    "name": ":moneybag:"
-  },
-  "1f4b1": {
-    "aliases": [],
-    "code": "1f4b1",
-    "name": ":currency_exchange:"
-  },
-  "1f4b2": {
-    "aliases": [],
-    "code": "1f4b2",
-    "name": ":heavy_dollar_sign:"
-  },
-  "1f4b3": {
-    "aliases": [],
-    "code": "1f4b3",
-    "name": ":credit_card:"
-  },
-  "1f4b4": {
-    "aliases": [],
-    "code": "1f4b4",
-    "name": ":yen:"
-  },
-  "1f4b5": {
-    "aliases": [],
-    "code": "1f4b5",
-    "name": ":dollar:"
-  },
-  "1f4b6": {
-    "aliases": [],
-    "code": "1f4b6",
-    "name": ":euro:"
-  },
-  "1f4b7": {
-    "aliases": [],
-    "code": "1f4b7",
-    "name": ":pound:"
-  },
-  "1f4b8": {
-    "aliases": [],
-    "code": "1f4b8",
-    "name": ":money_with_wings:"
-  },
-  "1f4b9": {
-    "aliases": [],
-    "code": "1f4b9",
-    "name": ":chart:"
-  },
-  "1f4ba": {
-    "aliases": [],
-    "code": "1f4ba",
-    "name": ":seat:"
-  },
-  "1f4bb": {
-    "aliases": [],
-    "code": "1f4bb",
-    "name": ":computer:"
-  },
-  "1f4bc": {
-    "aliases": [],
-    "code": "1f4bc",
-    "name": ":briefcase:"
-  },
-  "1f4bd": {
-    "aliases": [],
-    "code": "1f4bd",
-    "name": ":minidisc:"
-  },
-  "1f4be": {
-    "aliases": [],
-    "code": "1f4be",
-    "name": ":floppy_disk:"
-  },
-  "1f4bf": {
-    "aliases": [],
-    "code": "1f4bf",
-    "name": ":cd:"
-  },
-  "1f4c0": {
-    "aliases": [],
-    "code": "1f4c0",
-    "name": ":dvd:"
-  },
-  "1f4c1": {
-    "aliases": [],
-    "code": "1f4c1",
-    "name": ":file_folder:"
-  },
-  "1f4c2": {
-    "aliases": [],
-    "code": "1f4c2",
-    "name": ":open_file_folder:"
-  },
-  "1f4c3": {
-    "aliases": [],
-    "code": "1f4c3",
-    "name": ":page_with_curl:"
-  },
-  "1f4c4": {
-    "aliases": [],
-    "code": "1f4c4",
-    "name": ":page_facing_up:"
-  },
-  "1f4c5": {
-    "aliases": [],
-    "code": "1f4c5",
-    "name": ":date:"
-  },
-  "1f4c6": {
-    "aliases": [],
-    "code": "1f4c6",
-    "name": ":calendar:"
-  },
-  "1f4c7": {
-    "aliases": [],
-    "code": "1f4c7",
-    "name": ":card_index:"
-  },
-  "1f4c8": {
-    "aliases": [],
-    "code": "1f4c8",
-    "name": ":chart_with_upwards_trend:"
-  },
-  "1f4c9": {
-    "aliases": [],
-    "code": "1f4c9",
-    "name": ":chart_with_downwards_trend:"
-  },
-  "1f4ca": {
-    "aliases": [],
-    "code": "1f4ca",
-    "name": ":bar_chart:"
-  },
-  "1f4cb": {
-    "aliases": [],
-    "code": "1f4cb",
-    "name": ":clipboard:"
-  },
-  "1f4cc": {
-    "aliases": [],
-    "code": "1f4cc",
-    "name": ":pushpin:"
-  },
-  "1f4cd": {
-    "aliases": [],
-    "code": "1f4cd",
-    "name": ":round_pushpin:"
-  },
-  "1f4ce": {
-    "aliases": [],
-    "code": "1f4ce",
-    "name": ":paperclip:"
-  },
-  "1f4cf": {
-    "aliases": [],
-    "code": "1f4cf",
-    "name": ":straight_ruler:"
-  },
-  "1f4d0": {
-    "aliases": [],
-    "code": "1f4d0",
-    "name": ":triangular_ruler:"
-  },
-  "1f4d1": {
-    "aliases": [],
-    "code": "1f4d1",
-    "name": ":bookmark_tabs:"
-  },
-  "1f4d2": {
-    "aliases": [],
-    "code": "1f4d2",
-    "name": ":ledger:"
-  },
-  "1f4d3": {
-    "aliases": [],
-    "code": "1f4d3",
-    "name": ":notebook:"
-  },
-  "1f4d4": {
-    "aliases": [],
-    "code": "1f4d4",
-    "name": ":notebook_with_decorative_cover:"
-  },
-  "1f4d5": {
-    "aliases": [],
-    "code": "1f4d5",
-    "name": ":closed_book:"
-  },
-  "1f4d6": {
-    "aliases": [],
-    "code": "1f4d6",
-    "name": ":book:"
-  },
-  "1f4d7": {
-    "aliases": [],
-    "code": "1f4d7",
-    "name": ":green_book:"
-  },
-  "1f4d8": {
-    "aliases": [],
-    "code": "1f4d8",
-    "name": ":blue_book:"
-  },
-  "1f4d9": {
-    "aliases": [],
-    "code": "1f4d9",
-    "name": ":orange_book:"
-  },
-  "1f4da": {
-    "aliases": [],
-    "code": "1f4da",
-    "name": ":books:"
-  },
-  "1f4db": {
-    "aliases": [],
-    "code": "1f4db",
-    "name": ":name_badge:"
-  },
-  "1f4dc": {
-    "aliases": [],
-    "code": "1f4dc",
-    "name": ":scroll:"
-  },
-  "1f4dd": {
-    "aliases": [":memo:"],
-    "code": "1f4dd",
-    "name": ":pencil:"
-  },
-  "1f4de": {
-    "aliases": [],
-    "code": "1f4de",
-    "name": ":telephone_receiver:"
-  },
-  "1f4df": {
-    "aliases": [],
-    "code": "1f4df",
-    "name": ":pager:"
-  },
-  "1f4e0": {
-    "aliases": [],
-    "code": "1f4e0",
-    "name": ":fax:"
-  },
-  "1f4e1": {
-    "aliases": [],
-    "code": "1f4e1",
-    "name": ":satellite:"
-  },
-  "1f4e2": {
-    "aliases": [],
-    "code": "1f4e2",
-    "name": ":loudspeaker:"
-  },
-  "1f4e3": {
-    "aliases": [],
-    "code": "1f4e3",
-    "name": ":mega:"
-  },
-  "1f4e4": {
-    "aliases": [],
-    "code": "1f4e4",
-    "name": ":outbox_tray:"
-  },
-  "1f4e5": {
-    "aliases": [],
-    "code": "1f4e5",
-    "name": ":inbox_tray:"
-  },
-  "1f4e6": {
-    "aliases": [],
-    "code": "1f4e6",
-    "name": ":package:"
-  },
-  "1f4e7": {
-    "aliases": [":email:"],
-    "code": "1f4e7",
-    "name": ":e-mail:"
-  },
-  "1f4e8": {
-    "aliases": [],
-    "code": "1f4e8",
-    "name": ":incoming_envelope:"
-  },
-  "1f4e9": {
-    "aliases": [],
-    "code": "1f4e9",
-    "name": ":envelope_with_arrow:"
-  },
-  "1f4ea": {
-    "aliases": [],
-    "code": "1f4ea",
-    "name": ":mailbox_closed:"
-  },
-  "1f4eb": {
-    "aliases": [],
-    "code": "1f4eb",
-    "name": ":mailbox:"
-  },
-  "1f4ec": {
-    "aliases": [],
-    "code": "1f4ec",
-    "name": ":mailbox_with_mail:"
-  },
-  "1f4ed": {
-    "aliases": [],
-    "code": "1f4ed",
-    "name": ":mailbox_with_no_mail:"
-  },
-  "1f4ee": {
-    "aliases": [],
-    "code": "1f4ee",
-    "name": ":postbox:"
-  },
-  "1f4ef": {
-    "aliases": [],
-    "code": "1f4ef",
-    "name": ":postal_horn:"
-  },
-  "1f4f0": {
-    "aliases": [],
-    "code": "1f4f0",
-    "name": ":newspaper:"
-  },
-  "1f4f1": {
-    "aliases": [],
-    "code": "1f4f1",
-    "name": ":mobile_phone:"
-  },
-  "1f4f2": {
-    "aliases": [],
-    "code": "1f4f2",
-    "name": ":calling:"
-  },
-  "1f4f3": {
-    "aliases": [],
-    "code": "1f4f3",
-    "name": ":vibration_mode:"
-  },
-  "1f4f4": {
-    "aliases": [],
-    "code": "1f4f4",
-    "name": ":mobile_phone_off:"
-  },
-  "1f4f5": {
-    "aliases": [],
-    "code": "1f4f5",
-    "name": ":no_mobile_phones:"
-  },
-  "1f4f6": {
-    "aliases": [],
-    "code": "1f4f6",
-    "name": ":signal_strength:"
-  },
-  "1f4f7": {
-    "aliases": [],
-    "code": "1f4f7",
-    "name": ":camera:"
-  },
-  "1f4f8": {
-    "aliases": [],
-    "code": "1f4f8",
-    "name": ":camera_with_flash:"
-  },
-  "1f4f9": {
-    "aliases": [],
-    "code": "1f4f9",
-    "name": ":video_camera:"
-  },
-  "1f4fa": {
-    "aliases": [],
-    "code": "1f4fa",
-    "name": ":tv:"
-  },
-  "1f4fb": {
-    "aliases": [],
-    "code": "1f4fb",
-    "name": ":radio:"
-  },
-  "1f4fc": {
-    "aliases": [],
-    "code": "1f4fc",
-    "name": ":vhs:"
-  },
-  "1f4fd": {
-    "aliases": [":film_projector:"],
-    "code": "1f4fd-fe0f",
-    "name": ":projector:"
-  },
-  "1f4ff": {
-    "aliases": [],
-    "code": "1f4ff",
-    "name": ":prayer_beads:"
-  },
-  "1f500": {
-    "aliases": [],
-    "code": "1f500",
-    "name": ":twisted_rightwards_arrows:"
-  },
-  "1f501": {
-    "aliases": [],
-    "code": "1f501",
-    "name": ":repeat:"
-  },
-  "1f502": {
-    "aliases": [],
-    "code": "1f502",
-    "name": ":repeat_one:"
-  },
-  "1f503": {
-    "aliases": [],
-    "code": "1f503",
-    "name": ":arrows_clockwise:"
-  },
-  "1f504": {
-    "aliases": [],
-    "code": "1f504",
-    "name": ":arrows_counterclockwise:"
-  },
-  "1f505": {
-    "aliases": [],
-    "code": "1f505",
-    "name": ":low_brightness:"
-  },
-  "1f506": {
-    "aliases": [],
-    "code": "1f506",
-    "name": ":high_brightness:"
-  },
-  "1f507": {
-    "aliases": [],
-    "code": "1f507",
-    "name": ":mute:"
-  },
-  "1f508": {
-    "aliases": [],
-    "code": "1f508",
-    "name": ":speaker:"
-  },
-  "1f509": {
-    "aliases": [],
-    "code": "1f509",
-    "name": ":sound:"
-  },
-  "1f50a": {
-    "aliases": [],
-    "code": "1f50a",
-    "name": ":loud_sound:"
-  },
-  "1f50b": {
-    "aliases": [],
-    "code": "1f50b",
-    "name": ":battery:"
-  },
-  "1f50c": {
-    "aliases": [],
-    "code": "1f50c",
-    "name": ":electric_plug:"
-  },
-  "1f50d": {
-    "aliases": [],
-    "code": "1f50d",
-    "name": ":mag:"
-  },
-  "1f50e": {
-    "aliases": [],
-    "code": "1f50e",
-    "name": ":mag_right:"
-  },
-  "1f50f": {
-    "aliases": [],
-    "code": "1f50f",
-    "name": ":lock_with_ink_pen:"
-  },
-  "1f510": {
-    "aliases": [],
-    "code": "1f510",
-    "name": ":closed_lock_with_key:"
-  },
-  "1f511": {
-    "aliases": [],
-    "code": "1f511",
-    "name": ":key:"
-  },
-  "1f512": {
-    "aliases": [],
-    "code": "1f512",
-    "name": ":lock:"
-  },
-  "1f513": {
-    "aliases": [],
-    "code": "1f513",
-    "name": ":unlock:"
-  },
-  "1f514": {
-    "aliases": [],
-    "code": "1f514",
-    "name": ":bell:"
-  },
-  "1f515": {
-    "aliases": [],
-    "code": "1f515",
-    "name": ":no_bell:"
-  },
-  "1f516": {
-    "aliases": [],
-    "code": "1f516",
-    "name": ":bookmark:"
-  },
-  "1f517": {
-    "aliases": [],
-    "code": "1f517",
-    "name": ":link:"
-  },
-  "1f518": {
-    "aliases": [],
-    "code": "1f518",
-    "name": ":radio_button:"
-  },
-  "1f519": {
-    "aliases": [],
-    "code": "1f519",
-    "name": ":back:"
-  },
-  "1f51a": {
-    "aliases": [],
-    "code": "1f51a",
-    "name": ":end:"
-  },
-  "1f51b": {
-    "aliases": [],
-    "code": "1f51b",
-    "name": ":on:"
-  },
-  "1f51c": {
-    "aliases": [],
-    "code": "1f51c",
-    "name": ":soon:"
-  },
-  "1f51d": {
-    "aliases": [],
-    "code": "1f51d",
-    "name": ":top:"
-  },
-  "1f51e": {
-    "aliases": [],
-    "code": "1f51e",
-    "name": ":underage:"
-  },
-  "1f51f": {
-    "aliases": [],
-    "code": "1f51f",
-    "name": ":keycap_ten:"
-  },
-  "1f520": {
-    "aliases": [],
-    "code": "1f520",
-    "name": ":capital_abcd:"
-  },
-  "1f521": {
-    "aliases": [],
-    "code": "1f521",
-    "name": ":abcd:"
-  },
-  "1f522": {
-    "aliases": [],
-    "code": "1f522",
-    "name": ":1234:"
-  },
-  "1f523": {
-    "aliases": [],
-    "code": "1f523",
-    "name": ":symbols:"
-  },
-  "1f524": {
-    "aliases": [],
-    "code": "1f524",
-    "name": ":abc:"
-  },
-  "1f525": {
-    "aliases": [":flame:"],
-    "code": "1f525",
-    "name": ":fire:"
-  },
-  "1f526": {
-    "aliases": [],
-    "code": "1f526",
-    "name": ":flashlight:"
-  },
-  "1f527": {
-    "aliases": [],
-    "code": "1f527",
-    "name": ":wrench:"
-  },
-  "1f528": {
-    "aliases": [],
-    "code": "1f528",
-    "name": ":hammer:"
-  },
-  "1f529": {
-    "aliases": [],
-    "code": "1f529",
-    "name": ":nut_and_bolt:"
-  },
-  "1f52a": {
-    "aliases": [],
-    "code": "1f52a",
-    "name": ":knife:"
-  },
-  "1f52b": {
-    "aliases": [],
-    "code": "1f52b",
-    "name": ":gun:"
-  },
-  "1f52c": {
-    "aliases": [],
-    "code": "1f52c",
-    "name": ":microscope:"
-  },
-  "1f52d": {
-    "aliases": [],
-    "code": "1f52d",
-    "name": ":telescope:"
-  },
-  "1f52e": {
-    "aliases": [],
-    "code": "1f52e",
-    "name": ":crystal_ball:"
-  },
-  "1f52f": {
-    "aliases": [],
-    "code": "1f52f",
-    "name": ":six_pointed_star:"
-  },
-  "1f530": {
-    "aliases": [],
-    "code": "1f530",
-    "name": ":beginner:"
-  },
-  "1f531": {
-    "aliases": [],
-    "code": "1f531",
-    "name": ":trident:"
-  },
-  "1f532": {
-    "aliases": [],
-    "code": "1f532",
-    "name": ":black_square_button:"
-  },
-  "1f533": {
-    "aliases": [],
-    "code": "1f533",
-    "name": ":white_square_button:"
-  },
-  "1f534": {
-    "aliases": [],
-    "code": "1f534",
-    "name": ":red_circle:"
-  },
-  "1f535": {
-    "aliases": [],
-    "code": "1f535",
-    "name": ":blue_circle:"
-  },
-  "1f536": {
-    "aliases": [],
-    "code": "1f536",
-    "name": ":large_orange_diamond:"
-  },
-  "1f537": {
-    "aliases": [],
-    "code": "1f537",
-    "name": ":large_blue_diamond:"
-  },
-  "1f538": {
-    "aliases": [],
-    "code": "1f538",
-    "name": ":small_orange_diamond:"
-  },
-  "1f539": {
-    "aliases": [],
-    "code": "1f539",
-    "name": ":small_blue_diamond:"
-  },
-  "1f53a": {
-    "aliases": [],
-    "code": "1f53a",
-    "name": ":small_red_triangle:"
-  },
-  "1f53b": {
-    "aliases": [],
-    "code": "1f53b",
-    "name": ":small_red_triangle_down:"
-  },
-  "1f53c": {
-    "aliases": [],
-    "code": "1f53c",
-    "name": ":arrow_up_small:"
-  },
-  "1f53d": {
-    "aliases": [],
-    "code": "1f53d",
-    "name": ":arrow_down_small:"
-  },
-  "1f549": {
-    "aliases": [],
-    "code": "1f549-fe0f",
-    "name": ":om_symbol:"
-  },
-  "1f54a": {
-    "aliases": [":dove_of_peace:"],
-    "code": "1f54a-fe0f",
-    "name": ":dove:"
-  },
-  "1f54b": {
-    "aliases": [],
-    "code": "1f54b",
-    "name": ":kaaba:"
-  },
-  "1f54c": {
-    "aliases": [],
-    "code": "1f54c",
-    "name": ":mosque:"
-  },
-  "1f54d": {
-    "aliases": [],
-    "code": "1f54d",
-    "name": ":synagogue:"
-  },
-  "1f54e": {
-    "aliases": [],
-    "code": "1f54e",
-    "name": ":menorah:"
-  },
-  "1f550": {
-    "aliases": [],
-    "code": "1f550",
-    "name": ":clock1:"
-  },
-  "1f551": {
-    "aliases": [],
-    "code": "1f551",
-    "name": ":clock2:"
-  },
-  "1f552": {
-    "aliases": [],
-    "code": "1f552",
-    "name": ":clock3:"
-  },
-  "1f553": {
-    "aliases": [],
-    "code": "1f553",
-    "name": ":clock4:"
-  },
-  "1f554": {
-    "aliases": [],
-    "code": "1f554",
-    "name": ":clock5:"
-  },
-  "1f555": {
-    "aliases": [],
-    "code": "1f555",
-    "name": ":clock6:"
-  },
-  "1f556": {
-    "aliases": [],
-    "code": "1f556",
-    "name": ":clock7:"
-  },
-  "1f557": {
-    "aliases": [],
-    "code": "1f557",
-    "name": ":clock8:"
-  },
-  "1f558": {
-    "aliases": [],
-    "code": "1f558",
-    "name": ":clock9:"
-  },
-  "1f559": {
-    "aliases": [],
-    "code": "1f559",
-    "name": ":clock10:"
-  },
-  "1f55a": {
-    "aliases": [],
-    "code": "1f55a",
-    "name": ":clock11:"
-  },
-  "1f55b": {
-    "aliases": [],
-    "code": "1f55b",
-    "name": ":clock12:"
-  },
-  "1f55c": {
-    "aliases": [],
-    "code": "1f55c",
-    "name": ":clock130:"
-  },
-  "1f55d": {
-    "aliases": [],
-    "code": "1f55d",
-    "name": ":clock230:"
-  },
-  "1f55e": {
-    "aliases": [],
-    "code": "1f55e",
-    "name": ":clock330:"
-  },
-  "1f55f": {
-    "aliases": [],
-    "code": "1f55f",
-    "name": ":clock430:"
-  },
-  "1f560": {
-    "aliases": [],
-    "code": "1f560",
-    "name": ":clock530:"
-  },
-  "1f561": {
-    "aliases": [],
-    "code": "1f561",
-    "name": ":clock630:"
-  },
-  "1f562": {
-    "aliases": [],
-    "code": "1f562",
-    "name": ":clock730:"
-  },
-  "1f563": {
-    "aliases": [],
-    "code": "1f563",
-    "name": ":clock830:"
-  },
-  "1f564": {
-    "aliases": [],
-    "code": "1f564",
-    "name": ":clock930:"
-  },
-  "1f565": {
-    "aliases": [],
-    "code": "1f565",
-    "name": ":clock1030:"
-  },
-  "1f566": {
-    "aliases": [],
-    "code": "1f566",
-    "name": ":clock1130:"
-  },
-  "1f567": {
-    "aliases": [],
-    "code": "1f567",
-    "name": ":clock1230:"
-  },
-  "1f56f": {
-    "aliases": [],
-    "code": "1f56f-fe0f",
-    "name": ":candle:"
-  },
-  "1f570": {
-    "aliases": [":mantlepiece_clock:"],
-    "code": "1f570-fe0f",
-    "name": ":clock:"
-  },
-  "1f573": {
-    "aliases": [],
-    "code": "1f573-fe0f",
-    "name": ":hole:"
-  },
-  "1f574": {
-    "aliases": [":man_in_business_suit_levitating:"],
-    "code": "1f574-fe0f",
-    "name": ":levitate:"
-  },
-  "1f574-1f3fb": {
-    "aliases": [":man_in_business_suit_levitating_tone1:", ":man_in_business_suit_levitating_light_skin_tone:"],
-    "code": "1f574-1f3fb",
-    "name": ":levitate_tone1:"
-  },
-  "1f574-1f3fc": {
-    "aliases": [":man_in_business_suit_levitating_tone2:", ":man_in_business_suit_levitating_medium_light_skin_tone:"],
-    "code": "1f574-1f3fc",
-    "name": ":levitate_tone2:"
-  },
-  "1f574-1f3fd": {
-    "aliases": [":man_in_business_suit_levitating_tone3:", ":man_in_business_suit_levitating_medium_skin_tone:"],
-    "code": "1f574-1f3fd",
-    "name": ":levitate_tone3:"
-  },
-  "1f574-1f3fe": {
-    "aliases": [":man_in_business_suit_levitating_tone4:", ":man_in_business_suit_levitating_medium_dark_skin_tone:"],
-    "code": "1f574-1f3fe",
-    "name": ":levitate_tone4:"
-  },
-  "1f574-1f3ff": {
-    "aliases": [":man_in_business_suit_levitating_tone5:", ":man_in_business_suit_levitating_dark_skin_tone:"],
-    "code": "1f574-1f3ff",
-    "name": ":levitate_tone5:"
-  },
-  "1f575": {
-    "aliases": [":spy:", ":sleuth_or_spy:"],
-    "code": "1f575",
-    "name": ":detective:"
-  },
-  "1f575-1f3fb": {
-    "aliases": [":spy_tone1:", ":sleuth_or_spy_tone1:"],
-    "code": "1f575-1f3fb",
-    "name": ":detective_tone1:"
-  },
-  "1f575-1f3fb-2640": {
-    "aliases": [":woman_detective_light_skin_tone:"],
-    "code": "1f575-1f3fb-200d-2640-fe0f",
-    "name": ":woman_detective_tone1:"
-  },
-  "1f575-1f3fb-2642": {
-    "aliases": [":man_detective_light_skin_tone:"],
-    "code": "1f575-1f3fb-200d-2642-fe0f",
-    "name": ":man_detective_tone1:"
-  },
-  "1f575-1f3fc": {
-    "aliases": [":spy_tone2:", ":sleuth_or_spy_tone2:"],
-    "code": "1f575-1f3fc",
-    "name": ":detective_tone2:"
-  },
-  "1f575-1f3fc-2640": {
-    "aliases": [":woman_detective_medium_light_skin_tone:"],
-    "code": "1f575-1f3fc-200d-2640-fe0f",
-    "name": ":woman_detective_tone2:"
-  },
-  "1f575-1f3fc-2642": {
-    "aliases": [":man_detective_medium_light_skin_tone:"],
-    "code": "1f575-1f3fc-200d-2642-fe0f",
-    "name": ":man_detective_tone2:"
-  },
-  "1f575-1f3fd": {
-    "aliases": [":spy_tone3:", ":sleuth_or_spy_tone3:"],
-    "code": "1f575-1f3fd",
-    "name": ":detective_tone3:"
-  },
-  "1f575-1f3fd-2640": {
-    "aliases": [":woman_detective_medium_skin_tone:"],
-    "code": "1f575-1f3fd-200d-2640-fe0f",
-    "name": ":woman_detective_tone3:"
-  },
-  "1f575-1f3fd-2642": {
-    "aliases": [":man_detective_medium_skin_tone:"],
-    "code": "1f575-1f3fd-200d-2642-fe0f",
-    "name": ":man_detective_tone3:"
-  },
-  "1f575-1f3fe": {
-    "aliases": [":spy_tone4:", ":sleuth_or_spy_tone4:"],
-    "code": "1f575-1f3fe",
-    "name": ":detective_tone4:"
-  },
-  "1f575-1f3fe-2640": {
-    "aliases": [":woman_detective_medium_dark_skin_tone:"],
-    "code": "1f575-1f3fe-200d-2640-fe0f",
-    "name": ":woman_detective_tone4:"
-  },
-  "1f575-1f3fe-2642": {
-    "aliases": [":man_detective_medium_dark_skin_tone:"],
-    "code": "1f575-1f3fe-200d-2642-fe0f",
-    "name": ":man_detective_tone4:"
-  },
-  "1f575-1f3ff": {
-    "aliases": [":spy_tone5:", ":sleuth_or_spy_tone5:"],
-    "code": "1f575-1f3ff",
-    "name": ":detective_tone5:"
-  },
-  "1f575-1f3ff-2640": {
-    "aliases": [":woman_detective_dark_skin_tone:"],
-    "code": "1f575-1f3ff-200d-2640-fe0f",
-    "name": ":woman_detective_tone5:"
-  },
-  "1f575-1f3ff-2642": {
-    "aliases": [":man_detective_dark_skin_tone:"],
-    "code": "1f575-1f3ff-200d-2642-fe0f",
-    "name": ":man_detective_tone5:"
-  },
-  "1f575-2640": {
-    "aliases": [],
-    "code": "1f575-fe0f-200d-2640-fe0f",
-    "name": ":woman_detective:"
-  },
-  "1f575-2642": {
-    "aliases": [],
-    "code": "1f575-fe0f-200d-2642-fe0f",
-    "name": ":man_detective:"
-  },
-  "1f576": {
-    "aliases": [],
-    "code": "1f576-fe0f",
-    "name": ":dark_sunglasses:"
-  },
-  "1f577": {
-    "aliases": [],
-    "code": "1f577-fe0f",
-    "name": ":spider:"
-  },
-  "1f578": {
-    "aliases": [],
-    "code": "1f578-fe0f",
-    "name": ":spider_web:"
-  },
-  "1f579": {
-    "aliases": [],
-    "code": "1f579-fe0f",
-    "name": ":joystick:"
-  },
-  "1f57a": {
-    "aliases": [":male_dancer:"],
-    "code": "1f57a",
-    "name": ":man_dancing:"
-  },
-  "1f57a-1f3fb": {
-    "aliases": [":male_dancer_tone1:"],
-    "code": "1f57a-1f3fb",
-    "name": ":man_dancing_tone1:"
-  },
-  "1f57a-1f3fc": {
-    "aliases": [":male_dancer_tone2:"],
-    "code": "1f57a-1f3fc",
-    "name": ":man_dancing_tone2:"
-  },
-  "1f57a-1f3fd": {
-    "aliases": [":male_dancer_tone3:"],
-    "code": "1f57a-1f3fd",
-    "name": ":man_dancing_tone3:"
-  },
-  "1f57a-1f3fe": {
-    "aliases": [":male_dancer_tone4:"],
-    "code": "1f57a-1f3fe",
-    "name": ":man_dancing_tone4:"
-  },
-  "1f57a-1f3ff": {
-    "aliases": [":male_dancer_tone5:"],
-    "code": "1f57a-1f3ff",
-    "name": ":man_dancing_tone5:"
-  },
-  "1f587": {
-    "aliases": [":linked_paperclips:"],
-    "code": "1f587-fe0f",
-    "name": ":paperclips:"
-  },
-  "1f58a": {
-    "aliases": [":lower_left_ballpoint_pen:"],
-    "code": "1f58a-fe0f",
-    "name": ":pen_ballpoint:"
-  },
-  "1f58b": {
-    "aliases": [":lower_left_fountain_pen:"],
-    "code": "1f58b-fe0f",
-    "name": ":pen_fountain:"
-  },
-  "1f58c": {
-    "aliases": [":lower_left_paintbrush:"],
-    "code": "1f58c-fe0f",
-    "name": ":paintbrush:"
-  },
-  "1f58d": {
-    "aliases": [":lower_left_crayon:"],
-    "code": "1f58d-fe0f",
-    "name": ":crayon:"
-  },
-  "1f590": {
-    "aliases": [":raised_hand_with_fingers_splayed:"],
-    "code": "1f590",
-    "name": ":hand_splayed:"
-  },
-  "1f590-1f3fb": {
-    "aliases": [":raised_hand_with_fingers_splayed_tone1:"],
-    "code": "1f590-1f3fb",
-    "name": ":hand_splayed_tone1:"
-  },
-  "1f590-1f3fc": {
-    "aliases": [":raised_hand_with_fingers_splayed_tone2:"],
-    "code": "1f590-1f3fc",
-    "name": ":hand_splayed_tone2:"
-  },
-  "1f590-1f3fd": {
-    "aliases": [":raised_hand_with_fingers_splayed_tone3:"],
-    "code": "1f590-1f3fd",
-    "name": ":hand_splayed_tone3:"
-  },
-  "1f590-1f3fe": {
-    "aliases": [":raised_hand_with_fingers_splayed_tone4:"],
-    "code": "1f590-1f3fe",
-    "name": ":hand_splayed_tone4:"
-  },
-  "1f590-1f3ff": {
-    "aliases": [":raised_hand_with_fingers_splayed_tone5:"],
-    "code": "1f590-1f3ff",
-    "name": ":hand_splayed_tone5:"
-  },
-  "1f595": {
-    "aliases": [":reversed_hand_with_middle_finger_extended:"],
-    "code": "1f595",
-    "name": ":middle_finger:"
-  },
-  "1f595-1f3fb": {
-    "aliases": [":reversed_hand_with_middle_finger_extended_tone1:"],
-    "code": "1f595-1f3fb",
-    "name": ":middle_finger_tone1:"
-  },
-  "1f595-1f3fc": {
-    "aliases": [":reversed_hand_with_middle_finger_extended_tone2:"],
-    "code": "1f595-1f3fc",
-    "name": ":middle_finger_tone2:"
-  },
-  "1f595-1f3fd": {
-    "aliases": [":reversed_hand_with_middle_finger_extended_tone3:"],
-    "code": "1f595-1f3fd",
-    "name": ":middle_finger_tone3:"
-  },
-  "1f595-1f3fe": {
-    "aliases": [":reversed_hand_with_middle_finger_extended_tone4:"],
-    "code": "1f595-1f3fe",
-    "name": ":middle_finger_tone4:"
-  },
-  "1f595-1f3ff": {
-    "aliases": [":reversed_hand_with_middle_finger_extended_tone5:"],
-    "code": "1f595-1f3ff",
-    "name": ":middle_finger_tone5:"
-  },
-  "1f596": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers:"],
-    "code": "1f596",
-    "name": ":vulcan:"
-  },
-  "1f596-1f3fb": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers_tone1:"],
-    "code": "1f596-1f3fb",
-    "name": ":vulcan_tone1:"
-  },
-  "1f596-1f3fc": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers_tone2:"],
-    "code": "1f596-1f3fc",
-    "name": ":vulcan_tone2:"
-  },
-  "1f596-1f3fd": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers_tone3:"],
-    "code": "1f596-1f3fd",
-    "name": ":vulcan_tone3:"
-  },
-  "1f596-1f3fe": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers_tone4:"],
-    "code": "1f596-1f3fe",
-    "name": ":vulcan_tone4:"
-  },
-  "1f596-1f3ff": {
-    "aliases": [":raised_hand_with_part_between_middle_and_ring_fingers_tone5:"],
-    "code": "1f596-1f3ff",
-    "name": ":vulcan_tone5:"
-  },
-  "1f5a4": {
-    "aliases": [],
-    "code": "1f5a4",
-    "name": ":black_heart:"
-  },
-  "1f5a5": {
-    "aliases": [":desktop_computer:"],
-    "code": "1f5a5-fe0f",
-    "name": ":desktop:"
-  },
-  "1f5a8": {
-    "aliases": [],
-    "code": "1f5a8-fe0f",
-    "name": ":printer:"
-  },
-  "1f5b1": {
-    "aliases": [":three_button_mouse:"],
-    "code": "1f5b1-fe0f",
-    "name": ":mouse_three_button:"
-  },
-  "1f5b2": {
-    "aliases": [],
-    "code": "1f5b2-fe0f",
-    "name": ":trackball:"
-  },
-  "1f5bc": {
-    "aliases": [":frame_with_picture:"],
-    "code": "1f5bc-fe0f",
-    "name": ":frame_photo:"
-  },
-  "1f5c2": {
-    "aliases": [":card_index_dividers:"],
-    "code": "1f5c2-fe0f",
-    "name": ":dividers:"
-  },
-  "1f5c3": {
-    "aliases": [":card_file_box:"],
-    "code": "1f5c3-fe0f",
-    "name": ":card_box:"
-  },
-  "1f5c4": {
-    "aliases": [],
-    "code": "1f5c4-fe0f",
-    "name": ":file_cabinet:"
-  },
-  "1f5d1": {
-    "aliases": [],
-    "code": "1f5d1-fe0f",
-    "name": ":wastebasket:"
-  },
-  "1f5d2": {
-    "aliases": [":spiral_note_pad:"],
-    "code": "1f5d2-fe0f",
-    "name": ":notepad_spiral:"
-  },
-  "1f5d3": {
-    "aliases": [":spiral_calendar_pad:"],
-    "code": "1f5d3-fe0f",
-    "name": ":calendar_spiral:"
-  },
-  "1f5dc": {
-    "aliases": [],
-    "code": "1f5dc-fe0f",
-    "name": ":compression:"
-  },
-  "1f5dd": {
-    "aliases": [":old_key:"],
-    "code": "1f5dd-fe0f",
-    "name": ":key2:"
-  },
-  "1f5de": {
-    "aliases": [":rolled_up_newspaper:"],
-    "code": "1f5de-fe0f",
-    "name": ":newspaper2:"
-  },
-  "1f5e1": {
-    "aliases": [":dagger_knife:"],
-    "code": "1f5e1-fe0f",
-    "name": ":dagger:"
-  },
-  "1f5e3": {
-    "aliases": [":speaking_head_in_silhouette:"],
-    "code": "1f5e3-fe0f",
-    "name": ":speaking_head:"
-  },
-  "1f5e8": {
-    "aliases": [":left_speech_bubble:"],
-    "code": "1f5e8-fe0f",
-    "name": ":speech_left:"
-  },
-  "1f5ef": {
-    "aliases": [":right_anger_bubble:"],
-    "code": "1f5ef-fe0f",
-    "name": ":anger_right:"
-  },
-  "1f5f3": {
-    "aliases": [":ballot_box_with_ballot:"],
-    "code": "1f5f3-fe0f",
-    "name": ":ballot_box:"
-  },
-  "1f5fa": {
-    "aliases": [":world_map:"],
-    "code": "1f5fa-fe0f",
-    "name": ":map:"
-  },
-  "1f5fb": {
-    "aliases": [],
-    "code": "1f5fb",
-    "name": ":mount_fuji:"
-  },
-  "1f5fc": {
-    "aliases": [],
-    "code": "1f5fc",
-    "name": ":tokyo_tower:"
-  },
-  "1f5fd": {
-    "aliases": [],
-    "code": "1f5fd",
-    "name": ":statue_of_liberty:"
-  },
-  "1f5fe": {
-    "aliases": [],
-    "code": "1f5fe",
-    "name": ":japan:"
-  },
-  "1f5ff": {
-    "aliases": [],
-    "code": "1f5ff",
-    "name": ":moyai:"
-  },
-  "1f600": {
-    "aliases": [],
-    "code": "1f600",
-    "name": ":grinning:"
-  },
-  "1f601": {
-    "aliases": [],
-    "code": "1f601",
-    "name": ":grin:"
-  },
-  "1f602": {
-    "aliases": [],
-    "code": "1f602",
-    "name": ":joy:"
-  },
-  "1f603": {
-    "aliases": [],
-    "code": "1f603",
-    "name": ":smiley:"
-  },
-  "1f604": {
-    "aliases": [],
-    "code": "1f604",
-    "name": ":smile:"
-  },
-  "1f605": {
-    "aliases": [],
-    "code": "1f605",
-    "name": ":sweat_smile:"
-  },
-  "1f606": {
-    "aliases": [":satisfied:"],
-    "code": "1f606",
-    "name": ":laughing:"
-  },
-  "1f607": {
-    "aliases": [],
-    "code": "1f607",
-    "name": ":innocent:"
-  },
-  "1f608": {
-    "aliases": [],
-    "code": "1f608",
-    "name": ":smiling_imp:"
-  },
-  "1f609": {
-    "aliases": [],
-    "code": "1f609",
-    "name": ":wink:"
-  },
-  "1f60a": {
-    "aliases": [],
-    "code": "1f60a",
-    "name": ":blush:"
-  },
-  "1f60b": {
-    "aliases": [],
-    "code": "1f60b",
-    "name": ":yum:"
-  },
-  "1f60c": {
-    "aliases": [],
-    "code": "1f60c",
-    "name": ":relieved:"
-  },
-  "1f60d": {
-    "aliases": [],
-    "code": "1f60d",
-    "name": ":heart_eyes:"
-  },
-  "1f60e": {
-    "aliases": [],
-    "code": "1f60e",
-    "name": ":sunglasses:"
-  },
-  "1f60f": {
-    "aliases": [],
-    "code": "1f60f",
-    "name": ":smirk:"
-  },
-  "1f610": {
-    "aliases": [],
-    "code": "1f610",
-    "name": ":neutral_face:"
-  },
-  "1f611": {
-    "aliases": [],
-    "code": "1f611",
-    "name": ":expressionless:"
-  },
-  "1f612": {
-    "aliases": [],
-    "code": "1f612",
-    "name": ":unamused:"
-  },
-  "1f613": {
-    "aliases": [],
-    "code": "1f613",
-    "name": ":sweat:"
-  },
-  "1f614": {
-    "aliases": [],
-    "code": "1f614",
-    "name": ":pensive:"
-  },
-  "1f615": {
-    "aliases": [],
-    "code": "1f615",
-    "name": ":confused:"
-  },
-  "1f616": {
-    "aliases": [],
-    "code": "1f616",
-    "name": ":confounded:"
-  },
-  "1f617": {
-    "aliases": [],
-    "code": "1f617",
-    "name": ":kissing:"
-  },
-  "1f618": {
-    "aliases": [],
-    "code": "1f618",
-    "name": ":kissing_heart:"
-  },
-  "1f619": {
-    "aliases": [],
-    "code": "1f619",
-    "name": ":kissing_smiling_eyes:"
-  },
-  "1f61a": {
-    "aliases": [],
-    "code": "1f61a",
-    "name": ":kissing_closed_eyes:"
-  },
-  "1f61b": {
-    "aliases": [],
-    "code": "1f61b",
-    "name": ":stuck_out_tongue:"
-  },
-  "1f61c": {
-    "aliases": [],
-    "code": "1f61c",
-    "name": ":stuck_out_tongue_winking_eye:"
-  },
-  "1f61d": {
-    "aliases": [],
-    "code": "1f61d",
-    "name": ":stuck_out_tongue_closed_eyes:"
-  },
-  "1f61e": {
-    "aliases": [],
-    "code": "1f61e",
-    "name": ":disappointed:"
-  },
-  "1f61f": {
-    "aliases": [],
-    "code": "1f61f",
-    "name": ":worried:"
-  },
-  "1f620": {
-    "aliases": [],
-    "code": "1f620",
-    "name": ":angry:"
-  },
-  "1f621": {
-    "aliases": [],
-    "code": "1f621",
-    "name": ":rage:"
-  },
-  "1f622": {
-    "aliases": [],
-    "code": "1f622",
-    "name": ":cry:"
-  },
-  "1f623": {
-    "aliases": [],
-    "code": "1f623",
-    "name": ":persevere:"
-  },
-  "1f624": {
-    "aliases": [],
-    "code": "1f624",
-    "name": ":triumph:"
-  },
-  "1f625": {
-    "aliases": [],
-    "code": "1f625",
-    "name": ":disappointed_relieved:"
-  },
-  "1f626": {
-    "aliases": [],
-    "code": "1f626",
-    "name": ":frowning:"
-  },
-  "1f627": {
-    "aliases": [],
-    "code": "1f627",
-    "name": ":anguished:"
-  },
-  "1f628": {
-    "aliases": [],
-    "code": "1f628",
-    "name": ":fearful:"
-  },
-  "1f629": {
-    "aliases": [],
-    "code": "1f629",
-    "name": ":weary:"
-  },
-  "1f62a": {
-    "aliases": [],
-    "code": "1f62a",
-    "name": ":sleepy:"
-  },
-  "1f62b": {
-    "aliases": [],
-    "code": "1f62b",
-    "name": ":tired_face:"
-  },
-  "1f62c": {
-    "aliases": [],
-    "code": "1f62c",
-    "name": ":grimacing:"
-  },
-  "1f62d": {
-    "aliases": [],
-    "code": "1f62d",
-    "name": ":sob:"
-  },
-  "1f62e": {
-    "aliases": [],
-    "code": "1f62e",
-    "name": ":open_mouth:"
-  },
-  "1f62f": {
-    "aliases": [],
-    "code": "1f62f",
-    "name": ":hushed:"
-  },
-  "1f630": {
-    "aliases": [],
-    "code": "1f630",
-    "name": ":cold_sweat:"
-  },
-  "1f631": {
-    "aliases": [],
-    "code": "1f631",
-    "name": ":scream:"
-  },
-  "1f632": {
-    "aliases": [],
-    "code": "1f632",
-    "name": ":astonished:"
-  },
-  "1f633": {
-    "aliases": [],
-    "code": "1f633",
-    "name": ":flushed:"
-  },
-  "1f634": {
-    "aliases": [],
-    "code": "1f634",
-    "name": ":sleeping:"
-  },
-  "1f635": {
-    "aliases": [],
-    "code": "1f635",
-    "name": ":dizzy_face:"
-  },
-  "1f636": {
-    "aliases": [],
-    "code": "1f636",
-    "name": ":no_mouth:"
-  },
-  "1f637": {
-    "aliases": [],
-    "code": "1f637",
-    "name": ":mask:"
-  },
-  "1f638": {
-    "aliases": [],
-    "code": "1f638",
-    "name": ":smile_cat:"
-  },
-  "1f639": {
-    "aliases": [],
-    "code": "1f639",
-    "name": ":joy_cat:"
-  },
-  "1f63a": {
-    "aliases": [],
-    "code": "1f63a",
-    "name": ":smiley_cat:"
-  },
-  "1f63b": {
-    "aliases": [],
-    "code": "1f63b",
-    "name": ":heart_eyes_cat:"
-  },
-  "1f63c": {
-    "aliases": [],
-    "code": "1f63c",
-    "name": ":smirk_cat:"
-  },
-  "1f63d": {
-    "aliases": [],
-    "code": "1f63d",
-    "name": ":kissing_cat:"
-  },
-  "1f63e": {
-    "aliases": [],
-    "code": "1f63e",
-    "name": ":pouting_cat:"
-  },
-  "1f63f": {
-    "aliases": [],
-    "code": "1f63f",
-    "name": ":crying_cat_face:"
-  },
-  "1f640": {
-    "aliases": [],
-    "code": "1f640",
-    "name": ":scream_cat:"
-  },
-  "1f641": {
-    "aliases": [":slightly_frowning_face:"],
-    "code": "1f641",
-    "name": ":slight_frown:"
-  },
-  "1f642": {
-    "aliases": [":slightly_smiling_face:"],
-    "code": "1f642",
-    "name": ":slight_smile:"
-  },
-  "1f643": {
-    "aliases": [":upside_down_face:"],
-    "code": "1f643",
-    "name": ":upside_down:"
-  },
-  "1f644": {
-    "aliases": [":face_with_rolling_eyes:"],
-    "code": "1f644",
-    "name": ":rolling_eyes:"
-  },
-  "1f645": {
-    "aliases": [":no_good:"],
-    "code": "1f645",
-    "name": ":person_gesturing_no:"
-  },
-  "1f645-1f3fb": {
-    "aliases": [":no_good_tone1:"],
-    "code": "1f645-1f3fb",
-    "name": ":person_gesturing_no_tone1:"
-  },
-  "1f645-1f3fb-2640": {
-    "aliases": [":woman_gesturing_no_light_skin_tone:"],
-    "code": "1f645-1f3fb-200d-2640-fe0f",
-    "name": ":woman_gesturing_no_tone1:"
-  },
-  "1f645-1f3fb-2642": {
-    "aliases": [":man_gesturing_no_light_skin_tone:"],
-    "code": "1f645-1f3fb-200d-2642-fe0f",
-    "name": ":man_gesturing_no_tone1:"
-  },
-  "1f645-1f3fc": {
-    "aliases": [":no_good_tone2:"],
-    "code": "1f645-1f3fc",
-    "name": ":person_gesturing_no_tone2:"
-  },
-  "1f645-1f3fc-2640": {
-    "aliases": [":woman_gesturing_no_medium_light_skin_tone:"],
-    "code": "1f645-1f3fc-200d-2640-fe0f",
-    "name": ":woman_gesturing_no_tone2:"
-  },
-  "1f645-1f3fc-2642": {
-    "aliases": [":man_gesturing_no_medium_light_skin_tone:"],
-    "code": "1f645-1f3fc-200d-2642-fe0f",
-    "name": ":man_gesturing_no_tone2:"
-  },
-  "1f645-1f3fd": {
-    "aliases": [":no_good_tone3:"],
-    "code": "1f645-1f3fd",
-    "name": ":person_gesturing_no_tone3:"
-  },
-  "1f645-1f3fd-2640": {
-    "aliases": [":woman_gesturing_no_medium_skin_tone:"],
-    "code": "1f645-1f3fd-200d-2640-fe0f",
-    "name": ":woman_gesturing_no_tone3:"
-  },
-  "1f645-1f3fd-2642": {
-    "aliases": [":man_gesturing_no_medium_skin_tone:"],
-    "code": "1f645-1f3fd-200d-2642-fe0f",
-    "name": ":man_gesturing_no_tone3:"
-  },
-  "1f645-1f3fe": {
-    "aliases": [":no_good_tone4:"],
-    "code": "1f645-1f3fe",
-    "name": ":person_gesturing_no_tone4:"
-  },
-  "1f645-1f3fe-2640": {
-    "aliases": [":woman_gesturing_no_medium_dark_skin_tone:"],
-    "code": "1f645-1f3fe-200d-2640-fe0f",
-    "name": ":woman_gesturing_no_tone4:"
-  },
-  "1f645-1f3fe-2642": {
-    "aliases": [":man_gesturing_no_medium_dark_skin_tone:"],
-    "code": "1f645-1f3fe-200d-2642-fe0f",
-    "name": ":man_gesturing_no_tone4:"
-  },
-  "1f645-1f3ff": {
-    "aliases": [":no_good_tone5:"],
-    "code": "1f645-1f3ff",
-    "name": ":person_gesturing_no_tone5:"
-  },
-  "1f645-1f3ff-2640": {
-    "aliases": [":woman_gesturing_no_dark_skin_tone:"],
-    "code": "1f645-1f3ff-200d-2640-fe0f",
-    "name": ":woman_gesturing_no_tone5:"
-  },
-  "1f645-1f3ff-2642": {
-    "aliases": [":man_gesturing_no_dark_skin_tone:"],
-    "code": "1f645-1f3ff-200d-2642-fe0f",
-    "name": ":man_gesturing_no_tone5:"
-  },
-  "1f645-2640": {
-    "aliases": [],
-    "code": "1f645-200d-2640-fe0f",
-    "name": ":woman_gesturing_no:"
-  },
-  "1f645-2642": {
-    "aliases": [],
-    "code": "1f645-200d-2642-fe0f",
-    "name": ":man_gesturing_no:"
-  },
-  "1f646": {
-    "aliases": [":ok_woman:"],
-    "code": "1f646",
-    "name": ":person_gesturing_ok:"
-  },
-  "1f646-1f3fb": {
-    "aliases": [":ok_woman_tone1:"],
-    "code": "1f646-1f3fb",
-    "name": ":person_gesturing_ok_tone1:"
-  },
-  "1f646-1f3fb-2640": {
-    "aliases": [":woman_gesturing_ok_light_skin_tone:"],
-    "code": "1f646-1f3fb-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok_tone1:"
-  },
-  "1f646-1f3fb-2642": {
-    "aliases": [":man_gesturing_ok_light_skin_tone:"],
-    "code": "1f646-1f3fb-200d-2642-fe0f",
-    "name": ":man_gesturing_ok_tone1:"
-  },
-  "1f646-1f3fc": {
-    "aliases": [":ok_woman_tone2:"],
-    "code": "1f646-1f3fc",
-    "name": ":person_gesturing_ok_tone2:"
-  },
-  "1f646-1f3fc-2640": {
-    "aliases": [":woman_gesturing_ok_medium_light_skin_tone:"],
-    "code": "1f646-1f3fc-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok_tone2:"
-  },
-  "1f646-1f3fc-2642": {
-    "aliases": [":man_gesturing_ok_medium_light_skin_tone:"],
-    "code": "1f646-1f3fc-200d-2642-fe0f",
-    "name": ":man_gesturing_ok_tone2:"
-  },
-  "1f646-1f3fd": {
-    "aliases": [":ok_woman_tone3:"],
-    "code": "1f646-1f3fd",
-    "name": ":person_gesturing_ok_tone3:"
-  },
-  "1f646-1f3fd-2640": {
-    "aliases": [":woman_gesturing_ok_medium_skin_tone:"],
-    "code": "1f646-1f3fd-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok_tone3:"
-  },
-  "1f646-1f3fd-2642": {
-    "aliases": [":man_gesturing_ok_medium_skin_tone:"],
-    "code": "1f646-1f3fd-200d-2642-fe0f",
-    "name": ":man_gesturing_ok_tone3:"
-  },
-  "1f646-1f3fe": {
-    "aliases": [":ok_woman_tone4:"],
-    "code": "1f646-1f3fe",
-    "name": ":person_gesturing_ok_tone4:"
-  },
-  "1f646-1f3fe-2640": {
-    "aliases": [":woman_gesturing_ok_medium_dark_skin_tone:"],
-    "code": "1f646-1f3fe-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok_tone4:"
-  },
-  "1f646-1f3fe-2642": {
-    "aliases": [":man_gesturing_ok_medium_dark_skin_tone:"],
-    "code": "1f646-1f3fe-200d-2642-fe0f",
-    "name": ":man_gesturing_ok_tone4:"
-  },
-  "1f646-1f3ff": {
-    "aliases": [":ok_woman_tone5:"],
-    "code": "1f646-1f3ff",
-    "name": ":person_gesturing_ok_tone5:"
-  },
-  "1f646-1f3ff-2640": {
-    "aliases": [":woman_gesturing_ok_dark_skin_tone:"],
-    "code": "1f646-1f3ff-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok_tone5:"
-  },
-  "1f646-1f3ff-2642": {
-    "aliases": [":man_gesturing_ok_dark_skin_tone:"],
-    "code": "1f646-1f3ff-200d-2642-fe0f",
-    "name": ":man_gesturing_ok_tone5:"
-  },
-  "1f646-2640": {
-    "aliases": [],
-    "code": "1f646-200d-2640-fe0f",
-    "name": ":woman_gesturing_ok:"
-  },
-  "1f646-2642": {
-    "aliases": [],
-    "code": "1f646-200d-2642-fe0f",
-    "name": ":man_gesturing_ok:"
-  },
-  "1f647": {
-    "aliases": [":bow:"],
-    "code": "1f647",
-    "name": ":person_bowing:"
-  },
-  "1f647-1f3fb": {
-    "aliases": [":bow_tone1:"],
-    "code": "1f647-1f3fb",
-    "name": ":person_bowing_tone1:"
-  },
-  "1f647-1f3fb-2640": {
-    "aliases": [":woman_bowing_light_skin_tone:"],
-    "code": "1f647-1f3fb-200d-2640-fe0f",
-    "name": ":woman_bowing_tone1:"
-  },
-  "1f647-1f3fb-2642": {
-    "aliases": [":man_bowing_light_skin_tone:"],
-    "code": "1f647-1f3fb-200d-2642-fe0f",
-    "name": ":man_bowing_tone1:"
-  },
-  "1f647-1f3fc": {
-    "aliases": [":bow_tone2:"],
-    "code": "1f647-1f3fc",
-    "name": ":person_bowing_tone2:"
-  },
-  "1f647-1f3fc-2640": {
-    "aliases": [":woman_bowing_medium_light_skin_tone:"],
-    "code": "1f647-1f3fc-200d-2640-fe0f",
-    "name": ":woman_bowing_tone2:"
-  },
-  "1f647-1f3fc-2642": {
-    "aliases": [":man_bowing_medium_light_skin_tone:"],
-    "code": "1f647-1f3fc-200d-2642-fe0f",
-    "name": ":man_bowing_tone2:"
-  },
-  "1f647-1f3fd": {
-    "aliases": [":bow_tone3:"],
-    "code": "1f647-1f3fd",
-    "name": ":person_bowing_tone3:"
-  },
-  "1f647-1f3fd-2640": {
-    "aliases": [":woman_bowing_medium_skin_tone:"],
-    "code": "1f647-1f3fd-200d-2640-fe0f",
-    "name": ":woman_bowing_tone3:"
-  },
-  "1f647-1f3fd-2642": {
-    "aliases": [":man_bowing_medium_skin_tone:"],
-    "code": "1f647-1f3fd-200d-2642-fe0f",
-    "name": ":man_bowing_tone3:"
-  },
-  "1f647-1f3fe": {
-    "aliases": [":bow_tone4:"],
-    "code": "1f647-1f3fe",
-    "name": ":person_bowing_tone4:"
-  },
-  "1f647-1f3fe-2640": {
-    "aliases": [":woman_bowing_medium_dark_skin_tone:"],
-    "code": "1f647-1f3fe-200d-2640-fe0f",
-    "name": ":woman_bowing_tone4:"
-  },
-  "1f647-1f3fe-2642": {
-    "aliases": [":man_bowing_medium_dark_skin_tone:"],
-    "code": "1f647-1f3fe-200d-2642-fe0f",
-    "name": ":man_bowing_tone4:"
-  },
-  "1f647-1f3ff": {
-    "aliases": [":bow_tone5:"],
-    "code": "1f647-1f3ff",
-    "name": ":person_bowing_tone5:"
-  },
-  "1f647-1f3ff-2640": {
-    "aliases": [":woman_bowing_dark_skin_tone:"],
-    "code": "1f647-1f3ff-200d-2640-fe0f",
-    "name": ":woman_bowing_tone5:"
-  },
-  "1f647-1f3ff-2642": {
-    "aliases": [":man_bowing_dark_skin_tone:"],
-    "code": "1f647-1f3ff-200d-2642-fe0f",
-    "name": ":man_bowing_tone5:"
-  },
-  "1f647-2640": {
-    "aliases": [],
-    "code": "1f647-200d-2640-fe0f",
-    "name": ":woman_bowing:"
-  },
-  "1f647-2642": {
-    "aliases": [],
-    "code": "1f647-200d-2642-fe0f",
-    "name": ":man_bowing:"
-  },
-  "1f648": {
-    "aliases": [],
-    "code": "1f648",
-    "name": ":see_no_evil:"
-  },
-  "1f649": {
-    "aliases": [],
-    "code": "1f649",
-    "name": ":hear_no_evil:"
-  },
-  "1f64a": {
-    "aliases": [],
-    "code": "1f64a",
-    "name": ":speak_no_evil:"
-  },
-  "1f64b": {
-    "aliases": [":raising_hand:"],
-    "code": "1f64b",
-    "name": ":person_raising_hand:"
-  },
-  "1f64b-1f3fb": {
-    "aliases": [":raising_hand_tone1:"],
-    "code": "1f64b-1f3fb",
-    "name": ":person_raising_hand_tone1:"
-  },
-  "1f64b-1f3fb-2640": {
-    "aliases": [":woman_raising_hand_light_skin_tone:"],
-    "code": "1f64b-1f3fb-200d-2640-fe0f",
-    "name": ":woman_raising_hand_tone1:"
-  },
-  "1f64b-1f3fb-2642": {
-    "aliases": [":man_raising_hand_light_skin_tone:"],
-    "code": "1f64b-1f3fb-200d-2642-fe0f",
-    "name": ":man_raising_hand_tone1:"
-  },
-  "1f64b-1f3fc": {
-    "aliases": [":raising_hand_tone2:"],
-    "code": "1f64b-1f3fc",
-    "name": ":person_raising_hand_tone2:"
-  },
-  "1f64b-1f3fc-2640": {
-    "aliases": [":woman_raising_hand_medium_light_skin_tone:"],
-    "code": "1f64b-1f3fc-200d-2640-fe0f",
-    "name": ":woman_raising_hand_tone2:"
-  },
-  "1f64b-1f3fc-2642": {
-    "aliases": [":man_raising_hand_medium_light_skin_tone:"],
-    "code": "1f64b-1f3fc-200d-2642-fe0f",
-    "name": ":man_raising_hand_tone2:"
-  },
-  "1f64b-1f3fd": {
-    "aliases": [":raising_hand_tone3:"],
-    "code": "1f64b-1f3fd",
-    "name": ":person_raising_hand_tone3:"
-  },
-  "1f64b-1f3fd-2640": {
-    "aliases": [":woman_raising_hand_medium_skin_tone:"],
-    "code": "1f64b-1f3fd-200d-2640-fe0f",
-    "name": ":woman_raising_hand_tone3:"
-  },
-  "1f64b-1f3fd-2642": {
-    "aliases": [":man_raising_hand_medium_skin_tone:"],
-    "code": "1f64b-1f3fd-200d-2642-fe0f",
-    "name": ":man_raising_hand_tone3:"
-  },
-  "1f64b-1f3fe": {
-    "aliases": [":raising_hand_tone4:"],
-    "code": "1f64b-1f3fe",
-    "name": ":person_raising_hand_tone4:"
-  },
-  "1f64b-1f3fe-2640": {
-    "aliases": [":woman_raising_hand_medium_dark_skin_tone:"],
-    "code": "1f64b-1f3fe-200d-2640-fe0f",
-    "name": ":woman_raising_hand_tone4:"
-  },
-  "1f64b-1f3fe-2642": {
-    "aliases": [":man_raising_hand_medium_dark_skin_tone:"],
-    "code": "1f64b-1f3fe-200d-2642-fe0f",
-    "name": ":man_raising_hand_tone4:"
-  },
-  "1f64b-1f3ff": {
-    "aliases": [":raising_hand_tone5:"],
-    "code": "1f64b-1f3ff",
-    "name": ":person_raising_hand_tone5:"
-  },
-  "1f64b-1f3ff-2640": {
-    "aliases": [":woman_raising_hand_dark_skin_tone:"],
-    "code": "1f64b-1f3ff-200d-2640-fe0f",
-    "name": ":woman_raising_hand_tone5:"
-  },
-  "1f64b-1f3ff-2642": {
-    "aliases": [":man_raising_hand_dark_skin_tone:"],
-    "code": "1f64b-1f3ff-200d-2642-fe0f",
-    "name": ":man_raising_hand_tone5:"
-  },
-  "1f64b-2640": {
-    "aliases": [],
-    "code": "1f64b-200d-2640-fe0f",
-    "name": ":woman_raising_hand:"
-  },
-  "1f64b-2642": {
-    "aliases": [],
-    "code": "1f64b-200d-2642-fe0f",
-    "name": ":man_raising_hand:"
-  },
-  "1f64c": {
-    "aliases": [],
-    "code": "1f64c",
-    "name": ":raised_hands:"
-  },
-  "1f64c-1f3fb": {
-    "aliases": [],
-    "code": "1f64c-1f3fb",
-    "name": ":raised_hands_tone1:"
-  },
-  "1f64c-1f3fc": {
-    "aliases": [],
-    "code": "1f64c-1f3fc",
-    "name": ":raised_hands_tone2:"
-  },
-  "1f64c-1f3fd": {
-    "aliases": [],
-    "code": "1f64c-1f3fd",
-    "name": ":raised_hands_tone3:"
-  },
-  "1f64c-1f3fe": {
-    "aliases": [],
-    "code": "1f64c-1f3fe",
-    "name": ":raised_hands_tone4:"
-  },
-  "1f64c-1f3ff": {
-    "aliases": [],
-    "code": "1f64c-1f3ff",
-    "name": ":raised_hands_tone5:"
-  },
-  "1f64d": {
-    "aliases": [],
-    "code": "1f64d",
-    "name": ":person_frowning:"
-  },
-  "1f64d-1f3fb": {
-    "aliases": [],
-    "code": "1f64d-1f3fb",
-    "name": ":person_frowning_tone1:"
-  },
-  "1f64d-1f3fb-2640": {
-    "aliases": [":woman_frowning_light_skin_tone:"],
-    "code": "1f64d-1f3fb-200d-2640-fe0f",
-    "name": ":woman_frowning_tone1:"
-  },
-  "1f64d-1f3fb-2642": {
-    "aliases": [":man_frowning_light_skin_tone:"],
-    "code": "1f64d-1f3fb-200d-2642-fe0f",
-    "name": ":man_frowning_tone1:"
-  },
-  "1f64d-1f3fc": {
-    "aliases": [],
-    "code": "1f64d-1f3fc",
-    "name": ":person_frowning_tone2:"
-  },
-  "1f64d-1f3fc-2640": {
-    "aliases": [":woman_frowning_medium_light_skin_tone:"],
-    "code": "1f64d-1f3fc-200d-2640-fe0f",
-    "name": ":woman_frowning_tone2:"
-  },
-  "1f64d-1f3fc-2642": {
-    "aliases": [":man_frowning_medium_light_skin_tone:"],
-    "code": "1f64d-1f3fc-200d-2642-fe0f",
-    "name": ":man_frowning_tone2:"
-  },
-  "1f64d-1f3fd": {
-    "aliases": [],
-    "code": "1f64d-1f3fd",
-    "name": ":person_frowning_tone3:"
-  },
-  "1f64d-1f3fd-2640": {
-    "aliases": [":woman_frowning_medium_skin_tone:"],
-    "code": "1f64d-1f3fd-200d-2640-fe0f",
-    "name": ":woman_frowning_tone3:"
-  },
-  "1f64d-1f3fd-2642": {
-    "aliases": [":man_frowning_medium_skin_tone:"],
-    "code": "1f64d-1f3fd-200d-2642-fe0f",
-    "name": ":man_frowning_tone3:"
-  },
-  "1f64d-1f3fe": {
-    "aliases": [],
-    "code": "1f64d-1f3fe",
-    "name": ":person_frowning_tone4:"
-  },
-  "1f64d-1f3fe-2640": {
-    "aliases": [":woman_frowning_medium_dark_skin_tone:"],
-    "code": "1f64d-1f3fe-200d-2640-fe0f",
-    "name": ":woman_frowning_tone4:"
-  },
-  "1f64d-1f3fe-2642": {
-    "aliases": [":man_frowning_medium_dark_skin_tone:"],
-    "code": "1f64d-1f3fe-200d-2642-fe0f",
-    "name": ":man_frowning_tone4:"
-  },
-  "1f64d-1f3ff": {
-    "aliases": [],
-    "code": "1f64d-1f3ff",
-    "name": ":person_frowning_tone5:"
-  },
-  "1f64d-1f3ff-2640": {
-    "aliases": [":woman_frowning_dark_skin_tone:"],
-    "code": "1f64d-1f3ff-200d-2640-fe0f",
-    "name": ":woman_frowning_tone5:"
-  },
-  "1f64d-1f3ff-2642": {
-    "aliases": [":man_frowning_dark_skin_tone:"],
-    "code": "1f64d-1f3ff-200d-2642-fe0f",
-    "name": ":man_frowning_tone5:"
-  },
-  "1f64d-2640": {
-    "aliases": [],
-    "code": "1f64d-200d-2640-fe0f",
-    "name": ":woman_frowning:"
-  },
-  "1f64d-2642": {
-    "aliases": [],
-    "code": "1f64d-200d-2642-fe0f",
-    "name": ":man_frowning:"
-  },
-  "1f64e": {
-    "aliases": [":person_with_pouting_face:"],
-    "code": "1f64e",
-    "name": ":person_pouting:"
-  },
-  "1f64e-1f3fb": {
-    "aliases": [":person_with_pouting_face_tone1:"],
-    "code": "1f64e-1f3fb",
-    "name": ":person_pouting_tone1:"
-  },
-  "1f64e-1f3fb-2640": {
-    "aliases": [":woman_pouting_light_skin_tone:"],
-    "code": "1f64e-1f3fb-200d-2640-fe0f",
-    "name": ":woman_pouting_tone1:"
-  },
-  "1f64e-1f3fb-2642": {
-    "aliases": [":man_pouting_light_skin_tone:"],
-    "code": "1f64e-1f3fb-200d-2642-fe0f",
-    "name": ":man_pouting_tone1:"
-  },
-  "1f64e-1f3fc": {
-    "aliases": [":person_with_pouting_face_tone2:"],
-    "code": "1f64e-1f3fc",
-    "name": ":person_pouting_tone2:"
-  },
-  "1f64e-1f3fc-2640": {
-    "aliases": [":woman_pouting_medium_light_skin_tone:"],
-    "code": "1f64e-1f3fc-200d-2640-fe0f",
-    "name": ":woman_pouting_tone2:"
-  },
-  "1f64e-1f3fc-2642": {
-    "aliases": [":man_pouting_medium_light_skin_tone:"],
-    "code": "1f64e-1f3fc-200d-2642-fe0f",
-    "name": ":man_pouting_tone2:"
-  },
-  "1f64e-1f3fd": {
-    "aliases": [":person_with_pouting_face_tone3:"],
-    "code": "1f64e-1f3fd",
-    "name": ":person_pouting_tone3:"
-  },
-  "1f64e-1f3fd-2640": {
-    "aliases": [":woman_pouting_medium_skin_tone:"],
-    "code": "1f64e-1f3fd-200d-2640-fe0f",
-    "name": ":woman_pouting_tone3:"
-  },
-  "1f64e-1f3fd-2642": {
-    "aliases": [":man_pouting_medium_skin_tone:"],
-    "code": "1f64e-1f3fd-200d-2642-fe0f",
-    "name": ":man_pouting_tone3:"
-  },
-  "1f64e-1f3fe": {
-    "aliases": [":person_with_pouting_face_tone4:"],
-    "code": "1f64e-1f3fe",
-    "name": ":person_pouting_tone4:"
-  },
-  "1f64e-1f3fe-2640": {
-    "aliases": [":woman_pouting_medium_dark_skin_tone:"],
-    "code": "1f64e-1f3fe-200d-2640-fe0f",
-    "name": ":woman_pouting_tone4:"
-  },
-  "1f64e-1f3fe-2642": {
-    "aliases": [":man_pouting_medium_dark_skin_tone:"],
-    "code": "1f64e-1f3fe-200d-2642-fe0f",
-    "name": ":man_pouting_tone4:"
-  },
-  "1f64e-1f3ff": {
-    "aliases": [":person_with_pouting_face_tone5:"],
-    "code": "1f64e-1f3ff",
-    "name": ":person_pouting_tone5:"
-  },
-  "1f64e-1f3ff-2640": {
-    "aliases": [":woman_pouting_dark_skin_tone:"],
-    "code": "1f64e-1f3ff-200d-2640-fe0f",
-    "name": ":woman_pouting_tone5:"
-  },
-  "1f64e-1f3ff-2642": {
-    "aliases": [":man_pouting_dark_skin_tone:"],
-    "code": "1f64e-1f3ff-200d-2642-fe0f",
-    "name": ":man_pouting_tone5:"
-  },
-  "1f64e-2640": {
-    "aliases": [],
-    "code": "1f64e-200d-2640-fe0f",
-    "name": ":woman_pouting:"
-  },
-  "1f64e-2642": {
-    "aliases": [],
-    "code": "1f64e-200d-2642-fe0f",
-    "name": ":man_pouting:"
-  },
-  "1f64f": {
-    "aliases": [],
-    "code": "1f64f",
-    "name": ":pray:"
-  },
-  "1f64f-1f3fb": {
-    "aliases": [],
-    "code": "1f64f-1f3fb",
-    "name": ":pray_tone1:"
-  },
-  "1f64f-1f3fc": {
-    "aliases": [],
-    "code": "1f64f-1f3fc",
-    "name": ":pray_tone2:"
-  },
-  "1f64f-1f3fd": {
-    "aliases": [],
-    "code": "1f64f-1f3fd",
-    "name": ":pray_tone3:"
-  },
-  "1f64f-1f3fe": {
-    "aliases": [],
-    "code": "1f64f-1f3fe",
-    "name": ":pray_tone4:"
-  },
-  "1f64f-1f3ff": {
-    "aliases": [],
-    "code": "1f64f-1f3ff",
-    "name": ":pray_tone5:"
-  },
-  "1f680": {
-    "aliases": [],
-    "code": "1f680",
-    "name": ":rocket:"
-  },
-  "1f681": {
-    "aliases": [],
-    "code": "1f681",
-    "name": ":helicopter:"
-  },
-  "1f682": {
-    "aliases": [],
-    "code": "1f682",
-    "name": ":steam_locomotive:"
-  },
-  "1f683": {
-    "aliases": [],
-    "code": "1f683",
-    "name": ":railway_car:"
-  },
-  "1f684": {
-    "aliases": [],
-    "code": "1f684",
-    "name": ":bullettrain_side:"
-  },
-  "1f685": {
-    "aliases": [],
-    "code": "1f685",
-    "name": ":bullettrain_front:"
-  },
-  "1f686": {
-    "aliases": [],
-    "code": "1f686",
-    "name": ":train2:"
-  },
-  "1f687": {
-    "aliases": [],
-    "code": "1f687",
-    "name": ":metro:"
-  },
-  "1f688": {
-    "aliases": [],
-    "code": "1f688",
-    "name": ":light_rail:"
-  },
-  "1f689": {
-    "aliases": [],
-    "code": "1f689",
-    "name": ":station:"
-  },
-  "1f68a": {
-    "aliases": [],
-    "code": "1f68a",
-    "name": ":tram:"
-  },
-  "1f68b": {
-    "aliases": [],
-    "code": "1f68b",
-    "name": ":train:"
-  },
-  "1f68c": {
-    "aliases": [],
-    "code": "1f68c",
-    "name": ":bus:"
-  },
-  "1f68d": {
-    "aliases": [],
-    "code": "1f68d",
-    "name": ":oncoming_bus:"
-  },
-  "1f68e": {
-    "aliases": [],
-    "code": "1f68e",
-    "name": ":trolleybus:"
-  },
-  "1f68f": {
-    "aliases": [],
-    "code": "1f68f",
-    "name": ":busstop:"
-  },
-  "1f690": {
-    "aliases": [],
-    "code": "1f690",
-    "name": ":minibus:"
-  },
-  "1f691": {
-    "aliases": [],
-    "code": "1f691",
-    "name": ":ambulance:"
-  },
-  "1f692": {
-    "aliases": [],
-    "code": "1f692",
-    "name": ":fire_engine:"
-  },
-  "1f693": {
-    "aliases": [],
-    "code": "1f693",
-    "name": ":police_car:"
-  },
-  "1f694": {
-    "aliases": [],
-    "code": "1f694",
-    "name": ":oncoming_police_car:"
-  },
-  "1f695": {
-    "aliases": [],
-    "code": "1f695",
-    "name": ":taxi:"
-  },
-  "1f696": {
-    "aliases": [],
-    "code": "1f696",
-    "name": ":oncoming_taxi:"
-  },
-  "1f697": {
-    "aliases": [],
-    "code": "1f697",
-    "name": ":red_car:"
-  },
-  "1f698": {
-    "aliases": [],
-    "code": "1f698",
-    "name": ":oncoming_automobile:"
-  },
-  "1f699": {
-    "aliases": [],
-    "code": "1f699",
-    "name": ":blue_car:"
-  },
-  "1f69a": {
-    "aliases": [],
-    "code": "1f69a",
-    "name": ":truck:"
-  },
-  "1f69b": {
-    "aliases": [],
-    "code": "1f69b",
-    "name": ":articulated_lorry:"
-  },
-  "1f69c": {
-    "aliases": [],
-    "code": "1f69c",
-    "name": ":tractor:"
-  },
-  "1f69d": {
-    "aliases": [],
-    "code": "1f69d",
-    "name": ":monorail:"
-  },
-  "1f69e": {
-    "aliases": [],
-    "code": "1f69e",
-    "name": ":mountain_railway:"
-  },
-  "1f69f": {
-    "aliases": [],
-    "code": "1f69f",
-    "name": ":suspension_railway:"
-  },
-  "1f6a0": {
-    "aliases": [],
-    "code": "1f6a0",
-    "name": ":mountain_cableway:"
-  },
-  "1f6a1": {
-    "aliases": [],
-    "code": "1f6a1",
-    "name": ":aerial_tramway:"
-  },
-  "1f6a2": {
-    "aliases": [],
-    "code": "1f6a2",
-    "name": ":ship:"
-  },
-  "1f6a3": {
-    "aliases": [":rowboat:"],
-    "code": "1f6a3",
-    "name": ":person_rowing_boat:"
-  },
-  "1f6a3-1f3fb": {
-    "aliases": [":rowboat_tone1:"],
-    "code": "1f6a3-1f3fb",
-    "name": ":person_rowing_boat_tone1:"
-  },
-  "1f6a3-1f3fb-2640": {
-    "aliases": [":woman_rowing_boat_light_skin_tone:"],
-    "code": "1f6a3-1f3fb-200d-2640-fe0f",
-    "name": ":woman_rowing_boat_tone1:"
-  },
-  "1f6a3-1f3fb-2642": {
-    "aliases": [":man_rowing_boat_light_skin_tone:"],
-    "code": "1f6a3-1f3fb-200d-2642-fe0f",
-    "name": ":man_rowing_boat_tone1:"
-  },
-  "1f6a3-1f3fc": {
-    "aliases": [":rowboat_tone2:"],
-    "code": "1f6a3-1f3fc",
-    "name": ":person_rowing_boat_tone2:"
-  },
-  "1f6a3-1f3fc-2640": {
-    "aliases": [":woman_rowing_boat_medium_light_skin_tone:"],
-    "code": "1f6a3-1f3fc-200d-2640-fe0f",
-    "name": ":woman_rowing_boat_tone2:"
-  },
-  "1f6a3-1f3fc-2642": {
-    "aliases": [":man_rowing_boat_medium_light_skin_tone:"],
-    "code": "1f6a3-1f3fc-200d-2642-fe0f",
-    "name": ":man_rowing_boat_tone2:"
-  },
-  "1f6a3-1f3fd": {
-    "aliases": [":rowboat_tone3:"],
-    "code": "1f6a3-1f3fd",
-    "name": ":person_rowing_boat_tone3:"
-  },
-  "1f6a3-1f3fd-2640": {
-    "aliases": [":woman_rowing_boat_medium_skin_tone:"],
-    "code": "1f6a3-1f3fd-200d-2640-fe0f",
-    "name": ":woman_rowing_boat_tone3:"
-  },
-  "1f6a3-1f3fd-2642": {
-    "aliases": [":man_rowing_boat_medium_skin_tone:"],
-    "code": "1f6a3-1f3fd-200d-2642-fe0f",
-    "name": ":man_rowing_boat_tone3:"
-  },
-  "1f6a3-1f3fe": {
-    "aliases": [":rowboat_tone4:"],
-    "code": "1f6a3-1f3fe",
-    "name": ":person_rowing_boat_tone4:"
-  },
-  "1f6a3-1f3fe-2640": {
-    "aliases": [":woman_rowing_boat_medium_dark_skin_tone:"],
-    "code": "1f6a3-1f3fe-200d-2640-fe0f",
-    "name": ":woman_rowing_boat_tone4:"
-  },
-  "1f6a3-1f3fe-2642": {
-    "aliases": [":man_rowing_boat_medium_dark_skin_tone:"],
-    "code": "1f6a3-1f3fe-200d-2642-fe0f",
-    "name": ":man_rowing_boat_tone4:"
-  },
-  "1f6a3-1f3ff": {
-    "aliases": [":rowboat_tone5:"],
-    "code": "1f6a3-1f3ff",
-    "name": ":person_rowing_boat_tone5:"
-  },
-  "1f6a3-1f3ff-2640": {
-    "aliases": [":woman_rowing_boat_dark_skin_tone:"],
-    "code": "1f6a3-1f3ff-200d-2640-fe0f",
-    "name": ":woman_rowing_boat_tone5:"
-  },
-  "1f6a3-1f3ff-2642": {
-    "aliases": [":man_rowing_boat_dark_skin_tone:"],
-    "code": "1f6a3-1f3ff-200d-2642-fe0f",
-    "name": ":man_rowing_boat_tone5:"
-  },
-  "1f6a3-2640": {
-    "aliases": [],
-    "code": "1f6a3-200d-2640-fe0f",
-    "name": ":woman_rowing_boat:"
-  },
-  "1f6a3-2642": {
-    "aliases": [],
-    "code": "1f6a3-200d-2642-fe0f",
-    "name": ":man_rowing_boat:"
-  },
-  "1f6a4": {
-    "aliases": [],
-    "code": "1f6a4",
-    "name": ":speedboat:"
-  },
-  "1f6a5": {
-    "aliases": [],
-    "code": "1f6a5",
-    "name": ":traffic_light:"
-  },
-  "1f6a6": {
-    "aliases": [],
-    "code": "1f6a6",
-    "name": ":vertical_traffic_light:"
-  },
-  "1f6a7": {
-    "aliases": [],
-    "code": "1f6a7",
-    "name": ":construction:"
-  },
-  "1f6a8": {
-    "aliases": [],
-    "code": "1f6a8",
-    "name": ":rotating_light:"
-  },
-  "1f6a9": {
-    "aliases": [],
-    "code": "1f6a9",
-    "name": ":triangular_flag_on_post:"
-  },
-  "1f6aa": {
-    "aliases": [],
-    "code": "1f6aa",
-    "name": ":door:"
-  },
-  "1f6ab": {
-    "aliases": [],
-    "code": "1f6ab",
-    "name": ":no_entry_sign:"
-  },
-  "1f6ac": {
-    "aliases": [],
-    "code": "1f6ac",
-    "name": ":smoking:"
-  },
-  "1f6ad": {
-    "aliases": [],
-    "code": "1f6ad",
-    "name": ":no_smoking:"
-  },
-  "1f6ae": {
-    "aliases": [],
-    "code": "1f6ae",
-    "name": ":put_litter_in_its_place:"
-  },
-  "1f6af": {
-    "aliases": [],
-    "code": "1f6af",
-    "name": ":do_not_litter:"
-  },
-  "1f6b0": {
-    "aliases": [],
-    "code": "1f6b0",
-    "name": ":potable_water:"
-  },
-  "1f6b1": {
-    "aliases": [],
-    "code": "1f6b1",
-    "name": ":non-potable_water:"
-  },
-  "1f6b2": {
-    "aliases": [],
-    "code": "1f6b2",
-    "name": ":bike:"
-  },
-  "1f6b3": {
-    "aliases": [],
-    "code": "1f6b3",
-    "name": ":no_bicycles:"
-  },
-  "1f6b4": {
-    "aliases": [":bicyclist:"],
-    "code": "1f6b4",
-    "name": ":person_biking:"
-  },
-  "1f6b4-1f3fb": {
-    "aliases": [":bicyclist_tone1:"],
-    "code": "1f6b4-1f3fb",
-    "name": ":person_biking_tone1:"
-  },
-  "1f6b4-1f3fb-2640": {
-    "aliases": [":woman_biking_light_skin_tone:"],
-    "code": "1f6b4-1f3fb-200d-2640-fe0f",
-    "name": ":woman_biking_tone1:"
-  },
-  "1f6b4-1f3fb-2642": {
-    "aliases": [":man_biking_light_skin_tone:"],
-    "code": "1f6b4-1f3fb-200d-2642-fe0f",
-    "name": ":man_biking_tone1:"
-  },
-  "1f6b4-1f3fc": {
-    "aliases": [":bicyclist_tone2:"],
-    "code": "1f6b4-1f3fc",
-    "name": ":person_biking_tone2:"
-  },
-  "1f6b4-1f3fc-2640": {
-    "aliases": [":woman_biking_medium_light_skin_tone:"],
-    "code": "1f6b4-1f3fc-200d-2640-fe0f",
-    "name": ":woman_biking_tone2:"
-  },
-  "1f6b4-1f3fc-2642": {
-    "aliases": [":man_biking_medium_light_skin_tone:"],
-    "code": "1f6b4-1f3fc-200d-2642-fe0f",
-    "name": ":man_biking_tone2:"
-  },
-  "1f6b4-1f3fd": {
-    "aliases": [":bicyclist_tone3:"],
-    "code": "1f6b4-1f3fd",
-    "name": ":person_biking_tone3:"
-  },
-  "1f6b4-1f3fd-2640": {
-    "aliases": [":woman_biking_medium_skin_tone:"],
-    "code": "1f6b4-1f3fd-200d-2640-fe0f",
-    "name": ":woman_biking_tone3:"
-  },
-  "1f6b4-1f3fd-2642": {
-    "aliases": [":man_biking_medium_skin_tone:"],
-    "code": "1f6b4-1f3fd-200d-2642-fe0f",
-    "name": ":man_biking_tone3:"
-  },
-  "1f6b4-1f3fe": {
-    "aliases": [":bicyclist_tone4:"],
-    "code": "1f6b4-1f3fe",
-    "name": ":person_biking_tone4:"
-  },
-  "1f6b4-1f3fe-2640": {
-    "aliases": [":woman_biking_medium_dark_skin_tone:"],
-    "code": "1f6b4-1f3fe-200d-2640-fe0f",
-    "name": ":woman_biking_tone4:"
-  },
-  "1f6b4-1f3fe-2642": {
-    "aliases": [":man_biking_medium_dark_skin_tone:"],
-    "code": "1f6b4-1f3fe-200d-2642-fe0f",
-    "name": ":man_biking_tone4:"
-  },
-  "1f6b4-1f3ff": {
-    "aliases": [":bicyclist_tone5:"],
-    "code": "1f6b4-1f3ff",
-    "name": ":person_biking_tone5:"
-  },
-  "1f6b4-1f3ff-2640": {
-    "aliases": [":woman_biking_dark_skin_tone:"],
-    "code": "1f6b4-1f3ff-200d-2640-fe0f",
-    "name": ":woman_biking_tone5:"
-  },
-  "1f6b4-1f3ff-2642": {
-    "aliases": [":man_biking_dark_skin_tone:"],
-    "code": "1f6b4-1f3ff-200d-2642-fe0f",
-    "name": ":man_biking_tone5:"
-  },
-  "1f6b4-2640": {
-    "aliases": [],
-    "code": "1f6b4-200d-2640-fe0f",
-    "name": ":woman_biking:"
-  },
-  "1f6b4-2642": {
-    "aliases": [],
-    "code": "1f6b4-200d-2642-fe0f",
-    "name": ":man_biking:"
-  },
-  "1f6b5": {
-    "aliases": [":mountain_bicyclist:"],
-    "code": "1f6b5",
-    "name": ":person_mountain_biking:"
-  },
-  "1f6b5-1f3fb": {
-    "aliases": [":mountain_bicyclist_tone1:"],
-    "code": "1f6b5-1f3fb",
-    "name": ":person_mountain_biking_tone1:"
-  },
-  "1f6b5-1f3fb-2640": {
-    "aliases": [":woman_mountain_biking_light_skin_tone:"],
-    "code": "1f6b5-1f3fb-200d-2640-fe0f",
-    "name": ":woman_mountain_biking_tone1:"
-  },
-  "1f6b5-1f3fb-2642": {
-    "aliases": [":man_mountain_biking_light_skin_tone:"],
-    "code": "1f6b5-1f3fb-200d-2642-fe0f",
-    "name": ":man_mountain_biking_tone1:"
-  },
-  "1f6b5-1f3fc": {
-    "aliases": [":mountain_bicyclist_tone2:"],
-    "code": "1f6b5-1f3fc",
-    "name": ":person_mountain_biking_tone2:"
-  },
-  "1f6b5-1f3fc-2640": {
-    "aliases": [":woman_mountain_biking_medium_light_skin_tone:"],
-    "code": "1f6b5-1f3fc-200d-2640-fe0f",
-    "name": ":woman_mountain_biking_tone2:"
-  },
-  "1f6b5-1f3fc-2642": {
-    "aliases": [":man_mountain_biking_medium_light_skin_tone:"],
-    "code": "1f6b5-1f3fc-200d-2642-fe0f",
-    "name": ":man_mountain_biking_tone2:"
-  },
-  "1f6b5-1f3fd": {
-    "aliases": [":mountain_bicyclist_tone3:"],
-    "code": "1f6b5-1f3fd",
-    "name": ":person_mountain_biking_tone3:"
-  },
-  "1f6b5-1f3fd-2640": {
-    "aliases": [":woman_mountain_biking_medium_skin_tone:"],
-    "code": "1f6b5-1f3fd-200d-2640-fe0f",
-    "name": ":woman_mountain_biking_tone3:"
-  },
-  "1f6b5-1f3fd-2642": {
-    "aliases": [":man_mountain_biking_medium_skin_tone:"],
-    "code": "1f6b5-1f3fd-200d-2642-fe0f",
-    "name": ":man_mountain_biking_tone3:"
-  },
-  "1f6b5-1f3fe": {
-    "aliases": [":mountain_bicyclist_tone4:"],
-    "code": "1f6b5-1f3fe",
-    "name": ":person_mountain_biking_tone4:"
-  },
-  "1f6b5-1f3fe-2640": {
-    "aliases": [":woman_mountain_biking_medium_dark_skin_tone:"],
-    "code": "1f6b5-1f3fe-200d-2640-fe0f",
-    "name": ":woman_mountain_biking_tone4:"
-  },
-  "1f6b5-1f3fe-2642": {
-    "aliases": [":man_mountain_biking_medium_dark_skin_tone:"],
-    "code": "1f6b5-1f3fe-200d-2642-fe0f",
-    "name": ":man_mountain_biking_tone4:"
-  },
-  "1f6b5-1f3ff": {
-    "aliases": [":mountain_bicyclist_tone5:"],
-    "code": "1f6b5-1f3ff",
-    "name": ":person_mountain_biking_tone5:"
-  },
-  "1f6b5-1f3ff-2640": {
-    "aliases": [":woman_mountain_biking_dark_skin_tone:"],
-    "code": "1f6b5-1f3ff-200d-2640-fe0f",
-    "name": ":woman_mountain_biking_tone5:"
-  },
-  "1f6b5-1f3ff-2642": {
-    "aliases": [":man_mountain_biking_dark_skin_tone:"],
-    "code": "1f6b5-1f3ff-200d-2642-fe0f",
-    "name": ":man_mountain_biking_tone5:"
-  },
-  "1f6b5-2640": {
-    "aliases": [],
-    "code": "1f6b5-200d-2640-fe0f",
-    "name": ":woman_mountain_biking:"
-  },
-  "1f6b5-2642": {
-    "aliases": [],
-    "code": "1f6b5-200d-2642-fe0f",
-    "name": ":man_mountain_biking:"
-  },
-  "1f6b6": {
-    "aliases": [":walking:"],
-    "code": "1f6b6",
-    "name": ":person_walking:"
-  },
-  "1f6b6-1f3fb": {
-    "aliases": [":walking_tone1:"],
-    "code": "1f6b6-1f3fb",
-    "name": ":person_walking_tone1:"
-  },
-  "1f6b6-1f3fb-2640": {
-    "aliases": [":woman_walking_light_skin_tone:"],
-    "code": "1f6b6-1f3fb-200d-2640-fe0f",
-    "name": ":woman_walking_tone1:"
-  },
-  "1f6b6-1f3fb-2642": {
-    "aliases": [":man_walking_light_skin_tone:"],
-    "code": "1f6b6-1f3fb-200d-2642-fe0f",
-    "name": ":man_walking_tone1:"
-  },
-  "1f6b6-1f3fc": {
-    "aliases": [":walking_tone2:"],
-    "code": "1f6b6-1f3fc",
-    "name": ":person_walking_tone2:"
-  },
-  "1f6b6-1f3fc-2640": {
-    "aliases": [":woman_walking_medium_light_skin_tone:"],
-    "code": "1f6b6-1f3fc-200d-2640-fe0f",
-    "name": ":woman_walking_tone2:"
-  },
-  "1f6b6-1f3fc-2642": {
-    "aliases": [":man_walking_medium_light_skin_tone:"],
-    "code": "1f6b6-1f3fc-200d-2642-fe0f",
-    "name": ":man_walking_tone2:"
-  },
-  "1f6b6-1f3fd": {
-    "aliases": [":walking_tone3:"],
-    "code": "1f6b6-1f3fd",
-    "name": ":person_walking_tone3:"
-  },
-  "1f6b6-1f3fd-2640": {
-    "aliases": [":woman_walking_medium_skin_tone:"],
-    "code": "1f6b6-1f3fd-200d-2640-fe0f",
-    "name": ":woman_walking_tone3:"
-  },
-  "1f6b6-1f3fd-2642": {
-    "aliases": [":man_walking_medium_skin_tone:"],
-    "code": "1f6b6-1f3fd-200d-2642-fe0f",
-    "name": ":man_walking_tone3:"
-  },
-  "1f6b6-1f3fe": {
-    "aliases": [":walking_tone4:"],
-    "code": "1f6b6-1f3fe",
-    "name": ":person_walking_tone4:"
-  },
-  "1f6b6-1f3fe-2640": {
-    "aliases": [":woman_walking_medium_dark_skin_tone:"],
-    "code": "1f6b6-1f3fe-200d-2640-fe0f",
-    "name": ":woman_walking_tone4:"
-  },
-  "1f6b6-1f3fe-2642": {
-    "aliases": [":man_walking_medium_dark_skin_tone:"],
-    "code": "1f6b6-1f3fe-200d-2642-fe0f",
-    "name": ":man_walking_tone4:"
-  },
-  "1f6b6-1f3ff": {
-    "aliases": [":walking_tone5:"],
-    "code": "1f6b6-1f3ff",
-    "name": ":person_walking_tone5:"
-  },
-  "1f6b6-1f3ff-2640": {
-    "aliases": [":woman_walking_dark_skin_tone:"],
-    "code": "1f6b6-1f3ff-200d-2640-fe0f",
-    "name": ":woman_walking_tone5:"
-  },
-  "1f6b6-1f3ff-2642": {
-    "aliases": [":man_walking_dark_skin_tone:"],
-    "code": "1f6b6-1f3ff-200d-2642-fe0f",
-    "name": ":man_walking_tone5:"
-  },
-  "1f6b6-2640": {
-    "aliases": [],
-    "code": "1f6b6-200d-2640-fe0f",
-    "name": ":woman_walking:"
-  },
-  "1f6b6-2642": {
-    "aliases": [],
-    "code": "1f6b6-200d-2642-fe0f",
-    "name": ":man_walking:"
-  },
-  "1f6b7": {
-    "aliases": [],
-    "code": "1f6b7",
-    "name": ":no_pedestrians:"
-  },
-  "1f6b8": {
-    "aliases": [],
-    "code": "1f6b8",
-    "name": ":children_crossing:"
-  },
-  "1f6b9": {
-    "aliases": [],
-    "code": "1f6b9",
-    "name": ":mens:"
-  },
-  "1f6ba": {
-    "aliases": [],
-    "code": "1f6ba",
-    "name": ":womens:"
-  },
-  "1f6bb": {
-    "aliases": [],
-    "code": "1f6bb",
-    "name": ":restroom:"
-  },
-  "1f6bc": {
-    "aliases": [],
-    "code": "1f6bc",
-    "name": ":baby_symbol:"
-  },
-  "1f6bd": {
-    "aliases": [],
-    "code": "1f6bd",
-    "name": ":toilet:"
-  },
-  "1f6be": {
-    "aliases": [],
-    "code": "1f6be",
-    "name": ":wc:"
-  },
-  "1f6bf": {
-    "aliases": [],
-    "code": "1f6bf",
-    "name": ":shower:"
-  },
-  "1f6c0": {
-    "aliases": [],
-    "code": "1f6c0",
-    "name": ":bath:"
-  },
-  "1f6c0-1f3fb": {
-    "aliases": [],
-    "code": "1f6c0-1f3fb",
-    "name": ":bath_tone1:"
-  },
-  "1f6c0-1f3fc": {
-    "aliases": [],
-    "code": "1f6c0-1f3fc",
-    "name": ":bath_tone2:"
-  },
-  "1f6c0-1f3fd": {
-    "aliases": [],
-    "code": "1f6c0-1f3fd",
-    "name": ":bath_tone3:"
-  },
-  "1f6c0-1f3fe": {
-    "aliases": [],
-    "code": "1f6c0-1f3fe",
-    "name": ":bath_tone4:"
-  },
-  "1f6c0-1f3ff": {
-    "aliases": [],
-    "code": "1f6c0-1f3ff",
-    "name": ":bath_tone5:"
-  },
-  "1f6c1": {
-    "aliases": [],
-    "code": "1f6c1",
-    "name": ":bathtub:"
-  },
-  "1f6c2": {
-    "aliases": [],
-    "code": "1f6c2",
-    "name": ":passport_control:"
-  },
-  "1f6c3": {
-    "aliases": [],
-    "code": "1f6c3",
-    "name": ":customs:"
-  },
-  "1f6c4": {
-    "aliases": [],
-    "code": "1f6c4",
-    "name": ":baggage_claim:"
-  },
-  "1f6c5": {
-    "aliases": [],
-    "code": "1f6c5",
-    "name": ":left_luggage:"
-  },
-  "1f6cb": {
-    "aliases": [":couch_and_lamp:"],
-    "code": "1f6cb-fe0f",
-    "name": ":couch:"
-  },
-  "1f6cc": {
-    "aliases": [],
-    "code": "1f6cc",
-    "name": ":sleeping_accommodation:"
-  },
-  "1f6cc-1f3fb": {
-    "aliases": [":person_in_bed_light_skin_tone:"],
-    "code": "1f6cc-1f3fb",
-    "name": ":person_in_bed_tone1:"
-  },
-  "1f6cc-1f3fc": {
-    "aliases": [":person_in_bed_medium_light_skin_tone:"],
-    "code": "1f6cc-1f3fc",
-    "name": ":person_in_bed_tone2:"
-  },
-  "1f6cc-1f3fd": {
-    "aliases": [":person_in_bed_medium_skin_tone:"],
-    "code": "1f6cc-1f3fd",
-    "name": ":person_in_bed_tone3:"
-  },
-  "1f6cc-1f3fe": {
-    "aliases": [":person_in_bed_medium_dark_skin_tone:"],
-    "code": "1f6cc-1f3fe",
-    "name": ":person_in_bed_tone4:"
-  },
-  "1f6cc-1f3ff": {
-    "aliases": [":person_in_bed_dark_skin_tone:"],
-    "code": "1f6cc-1f3ff",
-    "name": ":person_in_bed_tone5:"
-  },
-  "1f6cd": {
-    "aliases": [],
-    "code": "1f6cd-fe0f",
-    "name": ":shopping_bags:"
-  },
-  "1f6ce": {
-    "aliases": [":bellhop_bell:"],
-    "code": "1f6ce-fe0f",
-    "name": ":bellhop:"
-  },
-  "1f6cf": {
-    "aliases": [],
-    "code": "1f6cf-fe0f",
-    "name": ":bed:"
-  },
-  "1f6d0": {
-    "aliases": [":worship_symbol:"],
-    "code": "1f6d0",
-    "name": ":place_of_worship:"
-  },
-  "1f6d1": {
-    "aliases": [":stop_sign:"],
-    "code": "1f6d1",
-    "name": ":octagonal_sign:"
-  },
-  "1f6d2": {
-    "aliases": [":shopping_trolley:"],
-    "code": "1f6d2",
-    "name": ":shopping_cart:"
-  },
-  "1f6d5": {
-    "aliases": [],
-    "code": "1f6d5",
-    "name": ":hindu_temple:"
-  },
-  "1f6e0": {
-    "aliases": [":hammer_and_wrench:"],
-    "code": "1f6e0-fe0f",
-    "name": ":tools:"
-  },
-  "1f6e1": {
-    "aliases": [],
-    "code": "1f6e1-fe0f",
-    "name": ":shield:"
-  },
-  "1f6e2": {
-    "aliases": [":oil_drum:"],
-    "code": "1f6e2-fe0f",
-    "name": ":oil:"
-  },
-  "1f6e3": {
-    "aliases": [],
-    "code": "1f6e3-fe0f",
-    "name": ":motorway:"
-  },
-  "1f6e4": {
-    "aliases": [":railroad_track:"],
-    "code": "1f6e4-fe0f",
-    "name": ":railway_track:"
-  },
-  "1f6e5": {
-    "aliases": [],
-    "code": "1f6e5-fe0f",
-    "name": ":motorboat:"
-  },
-  "1f6e9": {
-    "aliases": [":small_airplane:"],
-    "code": "1f6e9-fe0f",
-    "name": ":airplane_small:"
-  },
-  "1f6eb": {
-    "aliases": [],
-    "code": "1f6eb",
-    "name": ":airplane_departure:"
-  },
-  "1f6ec": {
-    "aliases": [],
-    "code": "1f6ec",
-    "name": ":airplane_arriving:"
-  },
-  "1f6f0": {
-    "aliases": [],
-    "code": "1f6f0-fe0f",
-    "name": ":satellite_orbital:"
-  },
-  "1f6f3": {
-    "aliases": [":passenger_ship:"],
-    "code": "1f6f3-fe0f",
-    "name": ":cruise_ship:"
-  },
-  "1f6f4": {
-    "aliases": [],
-    "code": "1f6f4",
-    "name": ":scooter:"
-  },
-  "1f6f5": {
-    "aliases": [":motorbike:"],
-    "code": "1f6f5",
-    "name": ":motor_scooter:"
-  },
-  "1f6f6": {
-    "aliases": [":kayak:"],
-    "code": "1f6f6",
-    "name": ":canoe:"
-  },
-  "1f6f7": {
-    "aliases": [],
-    "code": "1f6f7",
-    "name": ":sled:"
-  },
-  "1f6f8": {
-    "aliases": [],
-    "code": "1f6f8",
-    "name": ":flying_saucer:"
-  },
-  "1f6f9": {
-    "aliases": [],
-    "code": "1f6f9",
-    "name": ":skateboard:"
-  },
-  "1f6fa": {
-    "aliases": [],
-    "code": "1f6fa",
-    "name": ":auto_rickshaw:"
-  },
-  "1f7e0": {
-    "aliases": [],
-    "code": "1f7e0",
-    "name": ":orange_circle:"
-  },
-  "1f7e1": {
-    "aliases": [],
-    "code": "1f7e1",
-    "name": ":yellow_circle:"
-  },
-  "1f7e2": {
-    "aliases": [],
-    "code": "1f7e2",
-    "name": ":green_circle:"
-  },
-  "1f7e3": {
-    "aliases": [],
-    "code": "1f7e3",
-    "name": ":purple_circle:"
-  },
-  "1f7e4": {
-    "aliases": [],
-    "code": "1f7e4",
-    "name": ":brown_circle:"
-  },
-  "1f7e5": {
-    "aliases": [],
-    "code": "1f7e5",
-    "name": ":red_square:"
-  },
-  "1f7e6": {
-    "aliases": [],
-    "code": "1f7e6",
-    "name": ":blue_square:"
-  },
-  "1f7e7": {
-    "aliases": [],
-    "code": "1f7e7",
-    "name": ":orange_square:"
-  },
-  "1f7e8": {
-    "aliases": [],
-    "code": "1f7e8",
-    "name": ":yellow_square:"
-  },
-  "1f7e9": {
-    "aliases": [],
-    "code": "1f7e9",
-    "name": ":green_square:"
-  },
-  "1f7ea": {
-    "aliases": [],
-    "code": "1f7ea",
-    "name": ":purple_square:"
-  },
-  "1f7eb": {
-    "aliases": [],
-    "code": "1f7eb",
-    "name": ":brown_square:"
-  },
-  "1f90d": {
-    "aliases": [],
-    "code": "1f90d",
-    "name": ":white_heart:"
-  },
-  "1f90e": {
-    "aliases": [],
-    "code": "1f90e",
-    "name": ":brown_heart:"
-  },
-  "1f90f": {
-    "aliases": [],
-    "code": "1f90f",
-    "name": ":pinching_hand:"
-  },
-  "1f90f-1f3fb": {
-    "aliases": [":pinching_hand_light_skin_tone:"],
-    "code": "1f90f-1f3fb",
-    "name": ":pinching_hand_tone1:"
-  },
-  "1f90f-1f3fc": {
-    "aliases": [":pinching_hand_medium_light_skin_tone:"],
-    "code": "1f90f-1f3fc",
-    "name": ":pinching_hand_tone2:"
-  },
-  "1f90f-1f3fd": {
-    "aliases": [":pinching_hand_medium_skin_tone:"],
-    "code": "1f90f-1f3fd",
-    "name": ":pinching_hand_tone3:"
-  },
-  "1f90f-1f3fe": {
-    "aliases": [":pinching_hand_medium_dark_skin_tone:"],
-    "code": "1f90f-1f3fe",
-    "name": ":pinching_hand_tone4:"
-  },
-  "1f90f-1f3ff": {
-    "aliases": [":pinching_hand_dark_skin_tone:"],
-    "code": "1f90f-1f3ff",
-    "name": ":pinching_hand_tone5:"
-  },
-  "1f910": {
-    "aliases": [":zipper_mouth_face:"],
-    "code": "1f910",
-    "name": ":zipper_mouth:"
-  },
-  "1f911": {
-    "aliases": [":money_mouth_face:"],
-    "code": "1f911",
-    "name": ":money_mouth:"
-  },
-  "1f912": {
-    "aliases": [":face_with_thermometer:"],
-    "code": "1f912",
-    "name": ":thermometer_face:"
-  },
-  "1f913": {
-    "aliases": [":nerd_face:"],
-    "code": "1f913",
-    "name": ":nerd:"
-  },
-  "1f914": {
-    "aliases": [":thinking_face:"],
-    "code": "1f914",
-    "name": ":thinking:"
-  },
-  "1f915": {
-    "aliases": [":face_with_head_bandage:"],
-    "code": "1f915",
-    "name": ":head_bandage:"
-  },
-  "1f916": {
-    "aliases": [":robot_face:"],
-    "code": "1f916",
-    "name": ":robot:"
-  },
-  "1f917": {
-    "aliases": [":hugging_face:"],
-    "code": "1f917",
-    "name": ":hugging:"
-  },
-  "1f918": {
-    "aliases": [":sign_of_the_horns:"],
-    "code": "1f918",
-    "name": ":metal:"
-  },
-  "1f918-1f3fb": {
-    "aliases": [":sign_of_the_horns_tone1:"],
-    "code": "1f918-1f3fb",
-    "name": ":metal_tone1:"
-  },
-  "1f918-1f3fc": {
-    "aliases": [":sign_of_the_horns_tone2:"],
-    "code": "1f918-1f3fc",
-    "name": ":metal_tone2:"
-  },
-  "1f918-1f3fd": {
-    "aliases": [":sign_of_the_horns_tone3:"],
-    "code": "1f918-1f3fd",
-    "name": ":metal_tone3:"
-  },
-  "1f918-1f3fe": {
-    "aliases": [":sign_of_the_horns_tone4:"],
-    "code": "1f918-1f3fe",
-    "name": ":metal_tone4:"
-  },
-  "1f918-1f3ff": {
-    "aliases": [":sign_of_the_horns_tone5:"],
-    "code": "1f918-1f3ff",
-    "name": ":metal_tone5:"
-  },
-  "1f919": {
-    "aliases": [":call_me_hand:"],
-    "code": "1f919",
-    "name": ":call_me:"
-  },
-  "1f919-1f3fb": {
-    "aliases": [":call_me_hand_tone1:"],
-    "code": "1f919-1f3fb",
-    "name": ":call_me_tone1:"
-  },
-  "1f919-1f3fc": {
-    "aliases": [":call_me_hand_tone2:"],
-    "code": "1f919-1f3fc",
-    "name": ":call_me_tone2:"
-  },
-  "1f919-1f3fd": {
-    "aliases": [":call_me_hand_tone3:"],
-    "code": "1f919-1f3fd",
-    "name": ":call_me_tone3:"
-  },
-  "1f919-1f3fe": {
-    "aliases": [":call_me_hand_tone4:"],
-    "code": "1f919-1f3fe",
-    "name": ":call_me_tone4:"
-  },
-  "1f919-1f3ff": {
-    "aliases": [":call_me_hand_tone5:"],
-    "code": "1f919-1f3ff",
-    "name": ":call_me_tone5:"
-  },
-  "1f91a": {
-    "aliases": [":back_of_hand:"],
-    "code": "1f91a",
-    "name": ":raised_back_of_hand:"
-  },
-  "1f91a-1f3fb": {
-    "aliases": [":back_of_hand_tone1:"],
-    "code": "1f91a-1f3fb",
-    "name": ":raised_back_of_hand_tone1:"
-  },
-  "1f91a-1f3fc": {
-    "aliases": [":back_of_hand_tone2:"],
-    "code": "1f91a-1f3fc",
-    "name": ":raised_back_of_hand_tone2:"
-  },
-  "1f91a-1f3fd": {
-    "aliases": [":back_of_hand_tone3:"],
-    "code": "1f91a-1f3fd",
-    "name": ":raised_back_of_hand_tone3:"
-  },
-  "1f91a-1f3fe": {
-    "aliases": [":back_of_hand_tone4:"],
-    "code": "1f91a-1f3fe",
-    "name": ":raised_back_of_hand_tone4:"
-  },
-  "1f91a-1f3ff": {
-    "aliases": [":back_of_hand_tone5:"],
-    "code": "1f91a-1f3ff",
-    "name": ":raised_back_of_hand_tone5:"
-  },
-  "1f91b": {
-    "aliases": [":left_fist:"],
-    "code": "1f91b",
-    "name": ":left_facing_fist:"
-  },
-  "1f91b-1f3fb": {
-    "aliases": [":left_fist_tone1:"],
-    "code": "1f91b-1f3fb",
-    "name": ":left_facing_fist_tone1:"
-  },
-  "1f91b-1f3fc": {
-    "aliases": [":left_fist_tone2:"],
-    "code": "1f91b-1f3fc",
-    "name": ":left_facing_fist_tone2:"
-  },
-  "1f91b-1f3fd": {
-    "aliases": [":left_fist_tone3:"],
-    "code": "1f91b-1f3fd",
-    "name": ":left_facing_fist_tone3:"
-  },
-  "1f91b-1f3fe": {
-    "aliases": [":left_fist_tone4:"],
-    "code": "1f91b-1f3fe",
-    "name": ":left_facing_fist_tone4:"
-  },
-  "1f91b-1f3ff": {
-    "aliases": [":left_fist_tone5:"],
-    "code": "1f91b-1f3ff",
-    "name": ":left_facing_fist_tone5:"
-  },
-  "1f91c": {
-    "aliases": [":right_fist:"],
-    "code": "1f91c",
-    "name": ":right_facing_fist:"
-  },
-  "1f91c-1f3fb": {
-    "aliases": [":right_fist_tone1:"],
-    "code": "1f91c-1f3fb",
-    "name": ":right_facing_fist_tone1:"
-  },
-  "1f91c-1f3fc": {
-    "aliases": [":right_fist_tone2:"],
-    "code": "1f91c-1f3fc",
-    "name": ":right_facing_fist_tone2:"
-  },
-  "1f91c-1f3fd": {
-    "aliases": [":right_fist_tone3:"],
-    "code": "1f91c-1f3fd",
-    "name": ":right_facing_fist_tone3:"
-  },
-  "1f91c-1f3fe": {
-    "aliases": [":right_fist_tone4:"],
-    "code": "1f91c-1f3fe",
-    "name": ":right_facing_fist_tone4:"
-  },
-  "1f91c-1f3ff": {
-    "aliases": [":right_fist_tone5:"],
-    "code": "1f91c-1f3ff",
-    "name": ":right_facing_fist_tone5:"
-  },
-  "1f91d": {
-    "aliases": [":shaking_hands:"],
-    "code": "1f91d",
-    "name": ":handshake:"
-  },
-  "1f91e": {
-    "aliases": [":hand_with_index_and_middle_finger_crossed:"],
-    "code": "1f91e",
-    "name": ":fingers_crossed:"
-  },
-  "1f91e-1f3fb": {
-    "aliases": [":hand_with_index_and_middle_fingers_crossed_tone1:"],
-    "code": "1f91e-1f3fb",
-    "name": ":fingers_crossed_tone1:"
-  },
-  "1f91e-1f3fc": {
-    "aliases": [":hand_with_index_and_middle_fingers_crossed_tone2:"],
-    "code": "1f91e-1f3fc",
-    "name": ":fingers_crossed_tone2:"
-  },
-  "1f91e-1f3fd": {
-    "aliases": [":hand_with_index_and_middle_fingers_crossed_tone3:"],
-    "code": "1f91e-1f3fd",
-    "name": ":fingers_crossed_tone3:"
-  },
-  "1f91e-1f3fe": {
-    "aliases": [":hand_with_index_and_middle_fingers_crossed_tone4:"],
-    "code": "1f91e-1f3fe",
-    "name": ":fingers_crossed_tone4:"
-  },
-  "1f91e-1f3ff": {
-    "aliases": [":hand_with_index_and_middle_fingers_crossed_tone5:"],
-    "code": "1f91e-1f3ff",
-    "name": ":fingers_crossed_tone5:"
-  },
-  "1f91f": {
-    "aliases": [],
-    "code": "1f91f",
-    "name": ":love_you_gesture:"
-  },
-  "1f91f-1f3fb": {
-    "aliases": [":love_you_gesture_light_skin_tone:"],
-    "code": "1f91f-1f3fb",
-    "name": ":love_you_gesture_tone1:"
-  },
-  "1f91f-1f3fc": {
-    "aliases": [":love_you_gesture_medium_light_skin_tone:"],
-    "code": "1f91f-1f3fc",
-    "name": ":love_you_gesture_tone2:"
-  },
-  "1f91f-1f3fd": {
-    "aliases": [":love_you_gesture_medium_skin_tone:"],
-    "code": "1f91f-1f3fd",
-    "name": ":love_you_gesture_tone3:"
-  },
-  "1f91f-1f3fe": {
-    "aliases": [":love_you_gesture_medium_dark_skin_tone:"],
-    "code": "1f91f-1f3fe",
-    "name": ":love_you_gesture_tone4:"
-  },
-  "1f91f-1f3ff": {
-    "aliases": [":love_you_gesture_dark_skin_tone:"],
-    "code": "1f91f-1f3ff",
-    "name": ":love_you_gesture_tone5:"
-  },
-  "1f920": {
-    "aliases": [":face_with_cowboy_hat:"],
-    "code": "1f920",
-    "name": ":cowboy:"
-  },
-  "1f921": {
-    "aliases": [":clown_face:"],
-    "code": "1f921",
-    "name": ":clown:"
-  },
-  "1f922": {
-    "aliases": [":sick:"],
-    "code": "1f922",
-    "name": ":nauseated_face:"
-  },
-  "1f923": {
-    "aliases": [":rolling_on_the_floor_laughing:"],
-    "code": "1f923",
-    "name": ":rofl:"
-  },
-  "1f924": {
-    "aliases": [":drool:"],
-    "code": "1f924",
-    "name": ":drooling_face:"
-  },
-  "1f925": {
-    "aliases": [":liar:"],
-    "code": "1f925",
-    "name": ":lying_face:"
-  },
-  "1f926": {
-    "aliases": [":face_palm:", ":facepalm:"],
-    "code": "1f926",
-    "name": ":person_facepalming:"
-  },
-  "1f926-1f3fb": {
-    "aliases": [":face_palm_tone1:", ":facepalm_tone1:"],
-    "code": "1f926-1f3fb",
-    "name": ":person_facepalming_tone1:"
-  },
-  "1f926-1f3fb-2640": {
-    "aliases": [":woman_facepalming_light_skin_tone:"],
-    "code": "1f926-1f3fb-200d-2640-fe0f",
-    "name": ":woman_facepalming_tone1:"
-  },
-  "1f926-1f3fb-2642": {
-    "aliases": [":man_facepalming_light_skin_tone:"],
-    "code": "1f926-1f3fb-200d-2642-fe0f",
-    "name": ":man_facepalming_tone1:"
-  },
-  "1f926-1f3fc": {
-    "aliases": [":face_palm_tone2:", ":facepalm_tone2:"],
-    "code": "1f926-1f3fc",
-    "name": ":person_facepalming_tone2:"
-  },
-  "1f926-1f3fc-2640": {
-    "aliases": [":woman_facepalming_medium_light_skin_tone:"],
-    "code": "1f926-1f3fc-200d-2640-fe0f",
-    "name": ":woman_facepalming_tone2:"
-  },
-  "1f926-1f3fc-2642": {
-    "aliases": [":man_facepalming_medium_light_skin_tone:"],
-    "code": "1f926-1f3fc-200d-2642-fe0f",
-    "name": ":man_facepalming_tone2:"
-  },
-  "1f926-1f3fd": {
-    "aliases": [":face_palm_tone3:", ":facepalm_tone3:"],
-    "code": "1f926-1f3fd",
-    "name": ":person_facepalming_tone3:"
-  },
-  "1f926-1f3fd-2640": {
-    "aliases": [":woman_facepalming_medium_skin_tone:"],
-    "code": "1f926-1f3fd-200d-2640-fe0f",
-    "name": ":woman_facepalming_tone3:"
-  },
-  "1f926-1f3fd-2642": {
-    "aliases": [":man_facepalming_medium_skin_tone:"],
-    "code": "1f926-1f3fd-200d-2642-fe0f",
-    "name": ":man_facepalming_tone3:"
-  },
-  "1f926-1f3fe": {
-    "aliases": [":face_palm_tone4:", ":facepalm_tone4:"],
-    "code": "1f926-1f3fe",
-    "name": ":person_facepalming_tone4:"
-  },
-  "1f926-1f3fe-2640": {
-    "aliases": [":woman_facepalming_medium_dark_skin_tone:"],
-    "code": "1f926-1f3fe-200d-2640-fe0f",
-    "name": ":woman_facepalming_tone4:"
-  },
-  "1f926-1f3fe-2642": {
-    "aliases": [":man_facepalming_medium_dark_skin_tone:"],
-    "code": "1f926-1f3fe-200d-2642-fe0f",
-    "name": ":man_facepalming_tone4:"
-  },
-  "1f926-1f3ff": {
-    "aliases": [":face_palm_tone5:", ":facepalm_tone5:"],
-    "code": "1f926-1f3ff",
-    "name": ":person_facepalming_tone5:"
-  },
-  "1f926-1f3ff-2640": {
-    "aliases": [":woman_facepalming_dark_skin_tone:"],
-    "code": "1f926-1f3ff-200d-2640-fe0f",
-    "name": ":woman_facepalming_tone5:"
-  },
-  "1f926-1f3ff-2642": {
-    "aliases": [":man_facepalming_dark_skin_tone:"],
-    "code": "1f926-1f3ff-200d-2642-fe0f",
-    "name": ":man_facepalming_tone5:"
-  },
-  "1f926-2640": {
-    "aliases": [],
-    "code": "1f926-200d-2640-fe0f",
-    "name": ":woman_facepalming:"
-  },
-  "1f926-2642": {
-    "aliases": [],
-    "code": "1f926-200d-2642-fe0f",
-    "name": ":man_facepalming:"
-  },
-  "1f927": {
-    "aliases": [":sneeze:"],
-    "code": "1f927",
-    "name": ":sneezing_face:"
-  },
-  "1f928": {
-    "aliases": [],
-    "code": "1f928",
-    "name": ":face_with_raised_eyebrow:"
-  },
-  "1f929": {
-    "aliases": [],
-    "code": "1f929",
-    "name": ":star_struck:"
-  },
-  "1f92a": {
-    "aliases": [],
-    "code": "1f92a",
-    "name": ":zany_face:"
-  },
-  "1f92b": {
-    "aliases": [],
-    "code": "1f92b",
-    "name": ":shushing_face:"
-  },
-  "1f92c": {
-    "aliases": [],
-    "code": "1f92c",
-    "name": ":face_with_symbols_over_mouth:"
-  },
-  "1f92d": {
-    "aliases": [],
-    "code": "1f92d",
-    "name": ":face_with_hand_over_mouth:"
-  },
-  "1f92e": {
-    "aliases": [],
-    "code": "1f92e",
-    "name": ":face_vomiting:"
-  },
-  "1f92f": {
-    "aliases": [],
-    "code": "1f92f",
-    "name": ":exploding_head:"
-  },
-  "1f930": {
-    "aliases": [":expecting_woman:"],
-    "code": "1f930",
-    "name": ":pregnant_woman:"
-  },
-  "1f930-1f3fb": {
-    "aliases": [":expecting_woman_tone1:"],
-    "code": "1f930-1f3fb",
-    "name": ":pregnant_woman_tone1:"
-  },
-  "1f930-1f3fc": {
-    "aliases": [":expecting_woman_tone2:"],
-    "code": "1f930-1f3fc",
-    "name": ":pregnant_woman_tone2:"
-  },
-  "1f930-1f3fd": {
-    "aliases": [":expecting_woman_tone3:"],
-    "code": "1f930-1f3fd",
-    "name": ":pregnant_woman_tone3:"
-  },
-  "1f930-1f3fe": {
-    "aliases": [":expecting_woman_tone4:"],
-    "code": "1f930-1f3fe",
-    "name": ":pregnant_woman_tone4:"
-  },
-  "1f930-1f3ff": {
-    "aliases": [":expecting_woman_tone5:"],
-    "code": "1f930-1f3ff",
-    "name": ":pregnant_woman_tone5:"
-  },
-  "1f931": {
-    "aliases": [],
-    "code": "1f931",
-    "name": ":breast_feeding:"
-  },
-  "1f931-1f3fb": {
-    "aliases": [":breast_feeding_light_skin_tone:"],
-    "code": "1f931-1f3fb",
-    "name": ":breast_feeding_tone1:"
-  },
-  "1f931-1f3fc": {
-    "aliases": [":breast_feeding_medium_light_skin_tone:"],
-    "code": "1f931-1f3fc",
-    "name": ":breast_feeding_tone2:"
-  },
-  "1f931-1f3fd": {
-    "aliases": [":breast_feeding_medium_skin_tone:"],
-    "code": "1f931-1f3fd",
-    "name": ":breast_feeding_tone3:"
-  },
-  "1f931-1f3fe": {
-    "aliases": [":breast_feeding_medium_dark_skin_tone:"],
-    "code": "1f931-1f3fe",
-    "name": ":breast_feeding_tone4:"
-  },
-  "1f931-1f3ff": {
-    "aliases": [":breast_feeding_dark_skin_tone:"],
-    "code": "1f931-1f3ff",
-    "name": ":breast_feeding_tone5:"
-  },
-  "1f932": {
-    "aliases": [],
-    "code": "1f932",
-    "name": ":palms_up_together:"
-  },
-  "1f932-1f3fb": {
-    "aliases": [":palms_up_together_light_skin_tone:"],
-    "code": "1f932-1f3fb",
-    "name": ":palms_up_together_tone1:"
-  },
-  "1f932-1f3fc": {
-    "aliases": [":palms_up_together_medium_light_skin_tone:"],
-    "code": "1f932-1f3fc",
-    "name": ":palms_up_together_tone2:"
-  },
-  "1f932-1f3fd": {
-    "aliases": [":palms_up_together_medium_skin_tone:"],
-    "code": "1f932-1f3fd",
-    "name": ":palms_up_together_tone3:"
-  },
-  "1f932-1f3fe": {
-    "aliases": [":palms_up_together_medium_dark_skin_tone:"],
-    "code": "1f932-1f3fe",
-    "name": ":palms_up_together_tone4:"
-  },
-  "1f932-1f3ff": {
-    "aliases": [":palms_up_together_dark_skin_tone:"],
-    "code": "1f932-1f3ff",
-    "name": ":palms_up_together_tone5:"
-  },
-  "1f933": {
-    "aliases": [],
-    "code": "1f933",
-    "name": ":selfie:"
-  },
-  "1f933-1f3fb": {
-    "aliases": [],
-    "code": "1f933-1f3fb",
-    "name": ":selfie_tone1:"
-  },
-  "1f933-1f3fc": {
-    "aliases": [],
-    "code": "1f933-1f3fc",
-    "name": ":selfie_tone2:"
-  },
-  "1f933-1f3fd": {
-    "aliases": [],
-    "code": "1f933-1f3fd",
-    "name": ":selfie_tone3:"
-  },
-  "1f933-1f3fe": {
-    "aliases": [],
-    "code": "1f933-1f3fe",
-    "name": ":selfie_tone4:"
-  },
-  "1f933-1f3ff": {
-    "aliases": [],
-    "code": "1f933-1f3ff",
-    "name": ":selfie_tone5:"
-  },
-  "1f934": {
-    "aliases": [],
-    "code": "1f934",
-    "name": ":prince:"
-  },
-  "1f934-1f3fb": {
-    "aliases": [],
-    "code": "1f934-1f3fb",
-    "name": ":prince_tone1:"
-  },
-  "1f934-1f3fc": {
-    "aliases": [],
-    "code": "1f934-1f3fc",
-    "name": ":prince_tone2:"
-  },
-  "1f934-1f3fd": {
-    "aliases": [],
-    "code": "1f934-1f3fd",
-    "name": ":prince_tone3:"
-  },
-  "1f934-1f3fe": {
-    "aliases": [],
-    "code": "1f934-1f3fe",
-    "name": ":prince_tone4:"
-  },
-  "1f934-1f3ff": {
-    "aliases": [],
-    "code": "1f934-1f3ff",
-    "name": ":prince_tone5:"
-  },
-  "1f935": {
-    "aliases": [],
-    "code": "1f935",
-    "name": ":man_in_tuxedo:"
-  },
-  "1f935-1f3fb": {
-    "aliases": [":tuxedo_tone1:"],
-    "code": "1f935-1f3fb",
-    "name": ":man_in_tuxedo_tone1:"
-  },
-  "1f935-1f3fc": {
-    "aliases": [":tuxedo_tone2:"],
-    "code": "1f935-1f3fc",
-    "name": ":man_in_tuxedo_tone2:"
-  },
-  "1f935-1f3fd": {
-    "aliases": [":tuxedo_tone3:"],
-    "code": "1f935-1f3fd",
-    "name": ":man_in_tuxedo_tone3:"
-  },
-  "1f935-1f3fe": {
-    "aliases": [":tuxedo_tone4:"],
-    "code": "1f935-1f3fe",
-    "name": ":man_in_tuxedo_tone4:"
-  },
-  "1f935-1f3ff": {
-    "aliases": [":tuxedo_tone5:"],
-    "code": "1f935-1f3ff",
-    "name": ":man_in_tuxedo_tone5:"
-  },
-  "1f936": {
-    "aliases": [":mother_christmas:"],
-    "code": "1f936",
-    "name": ":mrs_claus:"
-  },
-  "1f936-1f3fb": {
-    "aliases": [":mother_christmas_tone1:"],
-    "code": "1f936-1f3fb",
-    "name": ":mrs_claus_tone1:"
-  },
-  "1f936-1f3fc": {
-    "aliases": [":mother_christmas_tone2:"],
-    "code": "1f936-1f3fc",
-    "name": ":mrs_claus_tone2:"
-  },
-  "1f936-1f3fd": {
-    "aliases": [":mother_christmas_tone3:"],
-    "code": "1f936-1f3fd",
-    "name": ":mrs_claus_tone3:"
-  },
-  "1f936-1f3fe": {
-    "aliases": [":mother_christmas_tone4:"],
-    "code": "1f936-1f3fe",
-    "name": ":mrs_claus_tone4:"
-  },
-  "1f936-1f3ff": {
-    "aliases": [":mother_christmas_tone5:"],
-    "code": "1f936-1f3ff",
-    "name": ":mrs_claus_tone5:"
-  },
-  "1f937": {
-    "aliases": [":shrug:"],
-    "code": "1f937",
-    "name": ":person_shrugging:"
-  },
-  "1f937-1f3fb": {
-    "aliases": [":shrug_tone1:"],
-    "code": "1f937-1f3fb",
-    "name": ":person_shrugging_tone1:"
-  },
-  "1f937-1f3fb-2640": {
-    "aliases": [":woman_shrugging_light_skin_tone:"],
-    "code": "1f937-1f3fb-200d-2640-fe0f",
-    "name": ":woman_shrugging_tone1:"
-  },
-  "1f937-1f3fb-2642": {
-    "aliases": [":man_shrugging_light_skin_tone:"],
-    "code": "1f937-1f3fb-200d-2642-fe0f",
-    "name": ":man_shrugging_tone1:"
-  },
-  "1f937-1f3fc": {
-    "aliases": [":shrug_tone2:"],
-    "code": "1f937-1f3fc",
-    "name": ":person_shrugging_tone2:"
-  },
-  "1f937-1f3fc-2640": {
-    "aliases": [":woman_shrugging_medium_light_skin_tone:"],
-    "code": "1f937-1f3fc-200d-2640-fe0f",
-    "name": ":woman_shrugging_tone2:"
-  },
-  "1f937-1f3fc-2642": {
-    "aliases": [":man_shrugging_medium_light_skin_tone:"],
-    "code": "1f937-1f3fc-200d-2642-fe0f",
-    "name": ":man_shrugging_tone2:"
-  },
-  "1f937-1f3fd": {
-    "aliases": [":shrug_tone3:"],
-    "code": "1f937-1f3fd",
-    "name": ":person_shrugging_tone3:"
-  },
-  "1f937-1f3fd-2640": {
-    "aliases": [":woman_shrugging_medium_skin_tone:"],
-    "code": "1f937-1f3fd-200d-2640-fe0f",
-    "name": ":woman_shrugging_tone3:"
-  },
-  "1f937-1f3fd-2642": {
-    "aliases": [":man_shrugging_medium_skin_tone:"],
-    "code": "1f937-1f3fd-200d-2642-fe0f",
-    "name": ":man_shrugging_tone3:"
-  },
-  "1f937-1f3fe": {
-    "aliases": [":shrug_tone4:"],
-    "code": "1f937-1f3fe",
-    "name": ":person_shrugging_tone4:"
-  },
-  "1f937-1f3fe-2640": {
-    "aliases": [":woman_shrugging_medium_dark_skin_tone:"],
-    "code": "1f937-1f3fe-200d-2640-fe0f",
-    "name": ":woman_shrugging_tone4:"
-  },
-  "1f937-1f3fe-2642": {
-    "aliases": [":man_shrugging_medium_dark_skin_tone:"],
-    "code": "1f937-1f3fe-200d-2642-fe0f",
-    "name": ":man_shrugging_tone4:"
-  },
-  "1f937-1f3ff": {
-    "aliases": [":shrug_tone5:"],
-    "code": "1f937-1f3ff",
-    "name": ":person_shrugging_tone5:"
-  },
-  "1f937-1f3ff-2640": {
-    "aliases": [":woman_shrugging_dark_skin_tone:"],
-    "code": "1f937-1f3ff-200d-2640-fe0f",
-    "name": ":woman_shrugging_tone5:"
-  },
-  "1f937-1f3ff-2642": {
-    "aliases": [":man_shrugging_dark_skin_tone:"],
-    "code": "1f937-1f3ff-200d-2642-fe0f",
-    "name": ":man_shrugging_tone5:"
-  },
-  "1f937-2640": {
-    "aliases": [],
-    "code": "1f937-200d-2640-fe0f",
-    "name": ":woman_shrugging:"
-  },
-  "1f937-2642": {
-    "aliases": [],
-    "code": "1f937-200d-2642-fe0f",
-    "name": ":man_shrugging:"
-  },
-  "1f938": {
-    "aliases": [":cartwheel:"],
-    "code": "1f938",
-    "name": ":person_doing_cartwheel:"
-  },
-  "1f938-1f3fb": {
-    "aliases": [":cartwheel_tone1:"],
-    "code": "1f938-1f3fb",
-    "name": ":person_doing_cartwheel_tone1:"
-  },
-  "1f938-1f3fb-2640": {
-    "aliases": [":woman_cartwheeling_light_skin_tone:"],
-    "code": "1f938-1f3fb-200d-2640-fe0f",
-    "name": ":woman_cartwheeling_tone1:"
-  },
-  "1f938-1f3fb-2642": {
-    "aliases": [":man_cartwheeling_light_skin_tone:"],
-    "code": "1f938-1f3fb-200d-2642-fe0f",
-    "name": ":man_cartwheeling_tone1:"
-  },
-  "1f938-1f3fc": {
-    "aliases": [":cartwheel_tone2:"],
-    "code": "1f938-1f3fc",
-    "name": ":person_doing_cartwheel_tone2:"
-  },
-  "1f938-1f3fc-2640": {
-    "aliases": [":woman_cartwheeling_medium_light_skin_tone:"],
-    "code": "1f938-1f3fc-200d-2640-fe0f",
-    "name": ":woman_cartwheeling_tone2:"
-  },
-  "1f938-1f3fc-2642": {
-    "aliases": [":man_cartwheeling_medium_light_skin_tone:"],
-    "code": "1f938-1f3fc-200d-2642-fe0f",
-    "name": ":man_cartwheeling_tone2:"
-  },
-  "1f938-1f3fd": {
-    "aliases": [":cartwheel_tone3:"],
-    "code": "1f938-1f3fd",
-    "name": ":person_doing_cartwheel_tone3:"
-  },
-  "1f938-1f3fd-2640": {
-    "aliases": [":woman_cartwheeling_medium_skin_tone:"],
-    "code": "1f938-1f3fd-200d-2640-fe0f",
-    "name": ":woman_cartwheeling_tone3:"
-  },
-  "1f938-1f3fd-2642": {
-    "aliases": [":man_cartwheeling_medium_skin_tone:"],
-    "code": "1f938-1f3fd-200d-2642-fe0f",
-    "name": ":man_cartwheeling_tone3:"
-  },
-  "1f938-1f3fe": {
-    "aliases": [":cartwheel_tone4:"],
-    "code": "1f938-1f3fe",
-    "name": ":person_doing_cartwheel_tone4:"
-  },
-  "1f938-1f3fe-2640": {
-    "aliases": [":woman_cartwheeling_medium_dark_skin_tone:"],
-    "code": "1f938-1f3fe-200d-2640-fe0f",
-    "name": ":woman_cartwheeling_tone4:"
-  },
-  "1f938-1f3fe-2642": {
-    "aliases": [":man_cartwheeling_medium_dark_skin_tone:"],
-    "code": "1f938-1f3fe-200d-2642-fe0f",
-    "name": ":man_cartwheeling_tone4:"
-  },
-  "1f938-1f3ff": {
-    "aliases": [":cartwheel_tone5:"],
-    "code": "1f938-1f3ff",
-    "name": ":person_doing_cartwheel_tone5:"
-  },
-  "1f938-1f3ff-2640": {
-    "aliases": [":woman_cartwheeling_dark_skin_tone:"],
-    "code": "1f938-1f3ff-200d-2640-fe0f",
-    "name": ":woman_cartwheeling_tone5:"
-  },
-  "1f938-1f3ff-2642": {
-    "aliases": [":man_cartwheeling_dark_skin_tone:"],
-    "code": "1f938-1f3ff-200d-2642-fe0f",
-    "name": ":man_cartwheeling_tone5:"
-  },
-  "1f938-2640": {
-    "aliases": [],
-    "code": "1f938-200d-2640-fe0f",
-    "name": ":woman_cartwheeling:"
-  },
-  "1f938-2642": {
-    "aliases": [],
-    "code": "1f938-200d-2642-fe0f",
-    "name": ":man_cartwheeling:"
-  },
-  "1f939": {
-    "aliases": [":juggling:", ":juggler:"],
-    "code": "1f939",
-    "name": ":person_juggling:"
-  },
-  "1f939-1f3fb": {
-    "aliases": [":juggling_tone1:", ":juggler_tone1:"],
-    "code": "1f939-1f3fb",
-    "name": ":person_juggling_tone1:"
-  },
-  "1f939-1f3fb-2640": {
-    "aliases": [":woman_juggling_light_skin_tone:"],
-    "code": "1f939-1f3fb-200d-2640-fe0f",
-    "name": ":woman_juggling_tone1:"
-  },
-  "1f939-1f3fb-2642": {
-    "aliases": [":man_juggling_light_skin_tone:"],
-    "code": "1f939-1f3fb-200d-2642-fe0f",
-    "name": ":man_juggling_tone1:"
-  },
-  "1f939-1f3fc": {
-    "aliases": [":juggling_tone2:", ":juggler_tone2:"],
-    "code": "1f939-1f3fc",
-    "name": ":person_juggling_tone2:"
-  },
-  "1f939-1f3fc-2640": {
-    "aliases": [":woman_juggling_medium_light_skin_tone:"],
-    "code": "1f939-1f3fc-200d-2640-fe0f",
-    "name": ":woman_juggling_tone2:"
-  },
-  "1f939-1f3fc-2642": {
-    "aliases": [":man_juggling_medium_light_skin_tone:"],
-    "code": "1f939-1f3fc-200d-2642-fe0f",
-    "name": ":man_juggling_tone2:"
-  },
-  "1f939-1f3fd": {
-    "aliases": [":juggling_tone3:", ":juggler_tone3:"],
-    "code": "1f939-1f3fd",
-    "name": ":person_juggling_tone3:"
-  },
-  "1f939-1f3fd-2640": {
-    "aliases": [":woman_juggling_medium_skin_tone:"],
-    "code": "1f939-1f3fd-200d-2640-fe0f",
-    "name": ":woman_juggling_tone3:"
-  },
-  "1f939-1f3fd-2642": {
-    "aliases": [":man_juggling_medium_skin_tone:"],
-    "code": "1f939-1f3fd-200d-2642-fe0f",
-    "name": ":man_juggling_tone3:"
-  },
-  "1f939-1f3fe": {
-    "aliases": [":juggling_tone4:", ":juggler_tone4:"],
-    "code": "1f939-1f3fe",
-    "name": ":person_juggling_tone4:"
-  },
-  "1f939-1f3fe-2640": {
-    "aliases": [":woman_juggling_medium_dark_skin_tone:"],
-    "code": "1f939-1f3fe-200d-2640-fe0f",
-    "name": ":woman_juggling_tone4:"
-  },
-  "1f939-1f3fe-2642": {
-    "aliases": [":man_juggling_medium_dark_skin_tone:"],
-    "code": "1f939-1f3fe-200d-2642-fe0f",
-    "name": ":man_juggling_tone4:"
-  },
-  "1f939-1f3ff": {
-    "aliases": [":juggling_tone5:", ":juggler_tone5:"],
-    "code": "1f939-1f3ff",
-    "name": ":person_juggling_tone5:"
-  },
-  "1f939-1f3ff-2640": {
-    "aliases": [":woman_juggling_dark_skin_tone:"],
-    "code": "1f939-1f3ff-200d-2640-fe0f",
-    "name": ":woman_juggling_tone5:"
-  },
-  "1f939-1f3ff-2642": {
-    "aliases": [":man_juggling_dark_skin_tone:"],
-    "code": "1f939-1f3ff-200d-2642-fe0f",
-    "name": ":man_juggling_tone5:"
-  },
-  "1f939-2640": {
-    "aliases": [],
-    "code": "1f939-200d-2640-fe0f",
-    "name": ":woman_juggling:"
-  },
-  "1f939-2642": {
-    "aliases": [],
-    "code": "1f939-200d-2642-fe0f",
-    "name": ":man_juggling:"
-  },
-  "1f93a": {
-    "aliases": [":fencer:", ":fencing:"],
-    "code": "1f93a",
-    "name": ":person_fencing:"
-  },
-  "1f93c": {
-    "aliases": [":wrestlers:", ":wrestling:"],
-    "code": "1f93c",
-    "name": ":people_wrestling:"
-  },
-  "1f93c-2640": {
-    "aliases": [],
-    "code": "1f93c-200d-2640-fe0f",
-    "name": ":women_wrestling:"
-  },
-  "1f93c-2642": {
-    "aliases": [],
-    "code": "1f93c-200d-2642-fe0f",
-    "name": ":men_wrestling:"
-  },
-  "1f93d": {
-    "aliases": [":water_polo:"],
-    "code": "1f93d",
-    "name": ":person_playing_water_polo:"
-  },
-  "1f93d-1f3fb": {
-    "aliases": [":water_polo_tone1:"],
-    "code": "1f93d-1f3fb",
-    "name": ":person_playing_water_polo_tone1:"
-  },
-  "1f93d-1f3fb-2640": {
-    "aliases": [":woman_playing_water_polo_light_skin_tone:"],
-    "code": "1f93d-1f3fb-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo_tone1:"
-  },
-  "1f93d-1f3fb-2642": {
-    "aliases": [":man_playing_water_polo_light_skin_tone:"],
-    "code": "1f93d-1f3fb-200d-2642-fe0f",
-    "name": ":man_playing_water_polo_tone1:"
-  },
-  "1f93d-1f3fc": {
-    "aliases": [":water_polo_tone2:"],
-    "code": "1f93d-1f3fc",
-    "name": ":person_playing_water_polo_tone2:"
-  },
-  "1f93d-1f3fc-2640": {
-    "aliases": [":woman_playing_water_polo_medium_light_skin_tone:"],
-    "code": "1f93d-1f3fc-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo_tone2:"
-  },
-  "1f93d-1f3fc-2642": {
-    "aliases": [":man_playing_water_polo_medium_light_skin_tone:"],
-    "code": "1f93d-1f3fc-200d-2642-fe0f",
-    "name": ":man_playing_water_polo_tone2:"
-  },
-  "1f93d-1f3fd": {
-    "aliases": [":water_polo_tone3:"],
-    "code": "1f93d-1f3fd",
-    "name": ":person_playing_water_polo_tone3:"
-  },
-  "1f93d-1f3fd-2640": {
-    "aliases": [":woman_playing_water_polo_medium_skin_tone:"],
-    "code": "1f93d-1f3fd-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo_tone3:"
-  },
-  "1f93d-1f3fd-2642": {
-    "aliases": [":man_playing_water_polo_medium_skin_tone:"],
-    "code": "1f93d-1f3fd-200d-2642-fe0f",
-    "name": ":man_playing_water_polo_tone3:"
-  },
-  "1f93d-1f3fe": {
-    "aliases": [":water_polo_tone4:"],
-    "code": "1f93d-1f3fe",
-    "name": ":person_playing_water_polo_tone4:"
-  },
-  "1f93d-1f3fe-2640": {
-    "aliases": [":woman_playing_water_polo_medium_dark_skin_tone:"],
-    "code": "1f93d-1f3fe-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo_tone4:"
-  },
-  "1f93d-1f3fe-2642": {
-    "aliases": [":man_playing_water_polo_medium_dark_skin_tone:"],
-    "code": "1f93d-1f3fe-200d-2642-fe0f",
-    "name": ":man_playing_water_polo_tone4:"
-  },
-  "1f93d-1f3ff": {
-    "aliases": [":water_polo_tone5:"],
-    "code": "1f93d-1f3ff",
-    "name": ":person_playing_water_polo_tone5:"
-  },
-  "1f93d-1f3ff-2640": {
-    "aliases": [":woman_playing_water_polo_dark_skin_tone:"],
-    "code": "1f93d-1f3ff-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo_tone5:"
-  },
-  "1f93d-1f3ff-2642": {
-    "aliases": [":man_playing_water_polo_dark_skin_tone:"],
-    "code": "1f93d-1f3ff-200d-2642-fe0f",
-    "name": ":man_playing_water_polo_tone5:"
-  },
-  "1f93d-2640": {
-    "aliases": [],
-    "code": "1f93d-200d-2640-fe0f",
-    "name": ":woman_playing_water_polo:"
-  },
-  "1f93d-2642": {
-    "aliases": [],
-    "code": "1f93d-200d-2642-fe0f",
-    "name": ":man_playing_water_polo:"
-  },
-  "1f93e": {
-    "aliases": [":handball:"],
-    "code": "1f93e",
-    "name": ":person_playing_handball:"
-  },
-  "1f93e-1f3fb": {
-    "aliases": [":handball_tone1:"],
-    "code": "1f93e-1f3fb",
-    "name": ":person_playing_handball_tone1:"
-  },
-  "1f93e-1f3fb-2640": {
-    "aliases": [":woman_playing_handball_light_skin_tone:"],
-    "code": "1f93e-1f3fb-200d-2640-fe0f",
-    "name": ":woman_playing_handball_tone1:"
-  },
-  "1f93e-1f3fb-2642": {
-    "aliases": [":man_playing_handball_light_skin_tone:"],
-    "code": "1f93e-1f3fb-200d-2642-fe0f",
-    "name": ":man_playing_handball_tone1:"
-  },
-  "1f93e-1f3fc": {
-    "aliases": [":handball_tone2:"],
-    "code": "1f93e-1f3fc",
-    "name": ":person_playing_handball_tone2:"
-  },
-  "1f93e-1f3fc-2640": {
-    "aliases": [":woman_playing_handball_medium_light_skin_tone:"],
-    "code": "1f93e-1f3fc-200d-2640-fe0f",
-    "name": ":woman_playing_handball_tone2:"
-  },
-  "1f93e-1f3fc-2642": {
-    "aliases": [":man_playing_handball_medium_light_skin_tone:"],
-    "code": "1f93e-1f3fc-200d-2642-fe0f",
-    "name": ":man_playing_handball_tone2:"
-  },
-  "1f93e-1f3fd": {
-    "aliases": [":handball_tone3:"],
-    "code": "1f93e-1f3fd",
-    "name": ":person_playing_handball_tone3:"
-  },
-  "1f93e-1f3fd-2640": {
-    "aliases": [":woman_playing_handball_medium_skin_tone:"],
-    "code": "1f93e-1f3fd-200d-2640-fe0f",
-    "name": ":woman_playing_handball_tone3:"
-  },
-  "1f93e-1f3fd-2642": {
-    "aliases": [":man_playing_handball_medium_skin_tone:"],
-    "code": "1f93e-1f3fd-200d-2642-fe0f",
-    "name": ":man_playing_handball_tone3:"
-  },
-  "1f93e-1f3fe": {
-    "aliases": [":handball_tone4:"],
-    "code": "1f93e-1f3fe",
-    "name": ":person_playing_handball_tone4:"
-  },
-  "1f93e-1f3fe-2640": {
-    "aliases": [":woman_playing_handball_medium_dark_skin_tone:"],
-    "code": "1f93e-1f3fe-200d-2640-fe0f",
-    "name": ":woman_playing_handball_tone4:"
-  },
-  "1f93e-1f3fe-2642": {
-    "aliases": [":man_playing_handball_medium_dark_skin_tone:"],
-    "code": "1f93e-1f3fe-200d-2642-fe0f",
-    "name": ":man_playing_handball_tone4:"
-  },
-  "1f93e-1f3ff": {
-    "aliases": [":handball_tone5:"],
-    "code": "1f93e-1f3ff",
-    "name": ":person_playing_handball_tone5:"
-  },
-  "1f93e-1f3ff-2640": {
-    "aliases": [":woman_playing_handball_dark_skin_tone:"],
-    "code": "1f93e-1f3ff-200d-2640-fe0f",
-    "name": ":woman_playing_handball_tone5:"
-  },
-  "1f93e-1f3ff-2642": {
-    "aliases": [":man_playing_handball_dark_skin_tone:"],
-    "code": "1f93e-1f3ff-200d-2642-fe0f",
-    "name": ":man_playing_handball_tone5:"
-  },
-  "1f93e-2640": {
-    "aliases": [],
-    "code": "1f93e-200d-2640-fe0f",
-    "name": ":woman_playing_handball:"
-  },
-  "1f93e-2642": {
-    "aliases": [],
-    "code": "1f93e-200d-2642-fe0f",
-    "name": ":man_playing_handball:"
-  },
-  "1f93f": {
-    "aliases": [],
-    "code": "1f93f",
-    "name": ":diving_mask:"
-  },
-  "1f940": {
-    "aliases": [":wilted_flower:"],
-    "code": "1f940",
-    "name": ":wilted_rose:"
-  },
-  "1f941": {
-    "aliases": [":drum_with_drumsticks:"],
-    "code": "1f941",
-    "name": ":drum:"
-  },
-  "1f942": {
-    "aliases": [":clinking_glass:"],
-    "code": "1f942",
-    "name": ":champagne_glass:"
-  },
-  "1f943": {
-    "aliases": [":whisky:"],
-    "code": "1f943",
-    "name": ":tumbler_glass:"
-  },
-  "1f944": {
-    "aliases": [],
-    "code": "1f944",
-    "name": ":spoon:"
-  },
-  "1f945": {
-    "aliases": [":goal_net:"],
-    "code": "1f945",
-    "name": ":goal:"
-  },
-  "1f947": {
-    "aliases": [":first_place_medal:"],
-    "code": "1f947",
-    "name": ":first_place:"
-  },
-  "1f948": {
-    "aliases": [":second_place_medal:"],
-    "code": "1f948",
-    "name": ":second_place:"
-  },
-  "1f949": {
-    "aliases": [":third_place_medal:"],
-    "code": "1f949",
-    "name": ":third_place:"
-  },
-  "1f94a": {
-    "aliases": [":boxing_gloves:"],
-    "code": "1f94a",
-    "name": ":boxing_glove:"
-  },
-  "1f94b": {
-    "aliases": [":karate_uniform:"],
-    "code": "1f94b",
-    "name": ":martial_arts_uniform:"
-  },
-  "1f94c": {
-    "aliases": [],
-    "code": "1f94c",
-    "name": ":curling_stone:"
-  },
-  "1f94d": {
-    "aliases": [],
-    "code": "1f94d",
-    "name": ":lacrosse:"
-  },
-  "1f94e": {
-    "aliases": [],
-    "code": "1f94e",
-    "name": ":softball:"
-  },
-  "1f94f": {
-    "aliases": [],
-    "code": "1f94f",
-    "name": ":flying_disc:"
-  },
-  "1f950": {
-    "aliases": [],
-    "code": "1f950",
-    "name": ":croissant:"
-  },
-  "1f951": {
-    "aliases": [],
-    "code": "1f951",
-    "name": ":avocado:"
-  },
-  "1f952": {
-    "aliases": [],
-    "code": "1f952",
-    "name": ":cucumber:"
-  },
-  "1f953": {
-    "aliases": [],
-    "code": "1f953",
-    "name": ":bacon:"
-  },
-  "1f954": {
-    "aliases": [],
-    "code": "1f954",
-    "name": ":potato:"
-  },
-  "1f955": {
-    "aliases": [],
-    "code": "1f955",
-    "name": ":carrot:"
-  },
-  "1f956": {
-    "aliases": [":baguette_bread:"],
-    "code": "1f956",
-    "name": ":french_bread:"
-  },
-  "1f957": {
-    "aliases": [":green_salad:"],
-    "code": "1f957",
-    "name": ":salad:"
-  },
-  "1f958": {
-    "aliases": [":paella:"],
-    "code": "1f958",
-    "name": ":shallow_pan_of_food:"
-  },
-  "1f959": {
-    "aliases": [":stuffed_pita:"],
-    "code": "1f959",
-    "name": ":stuffed_flatbread:"
-  },
-  "1f95a": {
-    "aliases": [],
-    "code": "1f95a",
-    "name": ":egg:"
-  },
-  "1f95b": {
-    "aliases": [":glass_of_milk:"],
-    "code": "1f95b",
-    "name": ":milk:"
-  },
-  "1f95c": {
-    "aliases": [":shelled_peanut:"],
-    "code": "1f95c",
-    "name": ":peanuts:"
-  },
-  "1f95d": {
-    "aliases": [":kiwifruit:"],
-    "code": "1f95d",
-    "name": ":kiwi:"
-  },
-  "1f95e": {
-    "aliases": [],
-    "code": "1f95e",
-    "name": ":pancakes:"
-  },
-  "1f95f": {
-    "aliases": [],
-    "code": "1f95f",
-    "name": ":dumpling:"
-  },
-  "1f960": {
-    "aliases": [],
-    "code": "1f960",
-    "name": ":fortune_cookie:"
-  },
-  "1f961": {
-    "aliases": [],
-    "code": "1f961",
-    "name": ":takeout_box:"
-  },
-  "1f962": {
-    "aliases": [],
-    "code": "1f962",
-    "name": ":chopsticks:"
-  },
-  "1f963": {
-    "aliases": [],
-    "code": "1f963",
-    "name": ":bowl_with_spoon:"
-  },
-  "1f964": {
-    "aliases": [],
-    "code": "1f964",
-    "name": ":cup_with_straw:"
-  },
-  "1f965": {
-    "aliases": [],
-    "code": "1f965",
-    "name": ":coconut:"
-  },
-  "1f966": {
-    "aliases": [],
-    "code": "1f966",
-    "name": ":broccoli:"
-  },
-  "1f967": {
-    "aliases": [],
-    "code": "1f967",
-    "name": ":pie:"
-  },
-  "1f968": {
-    "aliases": [],
-    "code": "1f968",
-    "name": ":pretzel:"
-  },
-  "1f969": {
-    "aliases": [],
-    "code": "1f969",
-    "name": ":cut_of_meat:"
-  },
-  "1f96a": {
-    "aliases": [],
-    "code": "1f96a",
-    "name": ":sandwich:"
-  },
-  "1f96b": {
-    "aliases": [],
-    "code": "1f96b",
-    "name": ":canned_food:"
-  },
-  "1f96c": {
-    "aliases": [],
-    "code": "1f96c",
-    "name": ":leafy_green:"
-  },
-  "1f96d": {
-    "aliases": [],
-    "code": "1f96d",
-    "name": ":mango:"
-  },
-  "1f96e": {
-    "aliases": [],
-    "code": "1f96e",
-    "name": ":moon_cake:"
-  },
-  "1f96f": {
-    "aliases": [],
-    "code": "1f96f",
-    "name": ":bagel:"
-  },
-  "1f970": {
-    "aliases": [],
-    "code": "1f970",
-    "name": ":smiling_face_with_3_hearts:"
-  },
-  "1f971": {
-    "aliases": [],
-    "code": "1f971",
-    "name": ":yawning_face:"
-  },
-  "1f973": {
-    "aliases": [],
-    "code": "1f973",
-    "name": ":partying_face:"
-  },
-  "1f974": {
-    "aliases": [],
-    "code": "1f974",
-    "name": ":woozy_face:"
-  },
-  "1f975": {
-    "aliases": [],
-    "code": "1f975",
-    "name": ":hot_face:"
-  },
-  "1f976": {
-    "aliases": [],
-    "code": "1f976",
-    "name": ":cold_face:"
-  },
-  "1f97a": {
-    "aliases": [],
-    "code": "1f97a",
-    "name": ":pleading_face:"
-  },
-  "1f97b": {
-    "aliases": [],
-    "code": "1f97b",
-    "name": ":sari:"
-  },
-  "1f97c": {
-    "aliases": [],
-    "code": "1f97c",
-    "name": ":lab_coat:"
-  },
-  "1f97d": {
-    "aliases": [],
-    "code": "1f97d",
-    "name": ":goggles:"
-  },
-  "1f97e": {
-    "aliases": [],
-    "code": "1f97e",
-    "name": ":hiking_boot:"
-  },
-  "1f97f": {
-    "aliases": [],
-    "code": "1f97f",
-    "name": ":womans_flat_shoe:"
-  },
-  "1f980": {
-    "aliases": [],
-    "code": "1f980",
-    "name": ":crab:"
-  },
-  "1f981": {
-    "aliases": [":lion:"],
-    "code": "1f981",
-    "name": ":lion_face:"
-  },
-  "1f982": {
-    "aliases": [],
-    "code": "1f982",
-    "name": ":scorpion:"
-  },
-  "1f983": {
-    "aliases": [],
-    "code": "1f983",
-    "name": ":turkey:"
-  },
-  "1f984": {
-    "aliases": [":unicorn_face:"],
-    "code": "1f984",
-    "name": ":unicorn:"
-  },
-  "1f985": {
-    "aliases": [],
-    "code": "1f985",
-    "name": ":eagle:"
-  },
-  "1f986": {
-    "aliases": [],
-    "code": "1f986",
-    "name": ":duck:"
-  },
-  "1f987": {
-    "aliases": [],
-    "code": "1f987",
-    "name": ":bat:"
-  },
-  "1f988": {
-    "aliases": [],
-    "code": "1f988",
-    "name": ":shark:"
-  },
-  "1f989": {
-    "aliases": [],
-    "code": "1f989",
-    "name": ":owl:"
-  },
-  "1f98a": {
-    "aliases": [":fox_face:"],
-    "code": "1f98a",
-    "name": ":fox:"
-  },
-  "1f98b": {
-    "aliases": [],
-    "code": "1f98b",
-    "name": ":butterfly:"
-  },
-  "1f98c": {
-    "aliases": [],
-    "code": "1f98c",
-    "name": ":deer:"
-  },
-  "1f98d": {
-    "aliases": [],
-    "code": "1f98d",
-    "name": ":gorilla:"
-  },
-  "1f98e": {
-    "aliases": [],
-    "code": "1f98e",
-    "name": ":lizard:"
-  },
-  "1f98f": {
-    "aliases": [":rhinoceros:"],
-    "code": "1f98f",
-    "name": ":rhino:"
-  },
-  "1f990": {
-    "aliases": [],
-    "code": "1f990",
-    "name": ":shrimp:"
-  },
-  "1f991": {
-    "aliases": [],
-    "code": "1f991",
-    "name": ":squid:"
-  },
-  "1f992": {
-    "aliases": [],
-    "code": "1f992",
-    "name": ":giraffe:"
-  },
-  "1f993": {
-    "aliases": [],
-    "code": "1f993",
-    "name": ":zebra:"
-  },
-  "1f994": {
-    "aliases": [],
-    "code": "1f994",
-    "name": ":hedgehog:"
-  },
-  "1f995": {
-    "aliases": [],
-    "code": "1f995",
-    "name": ":sauropod:"
-  },
-  "1f996": {
-    "aliases": [],
-    "code": "1f996",
-    "name": ":t_rex:"
-  },
-  "1f997": {
-    "aliases": [],
-    "code": "1f997",
-    "name": ":cricket:"
-  },
-  "1f998": {
-    "aliases": [],
-    "code": "1f998",
-    "name": ":kangaroo:"
-  },
-  "1f999": {
-    "aliases": [],
-    "code": "1f999",
-    "name": ":llama:"
-  },
-  "1f99a": {
-    "aliases": [],
-    "code": "1f99a",
-    "name": ":peacock:"
-  },
-  "1f99b": {
-    "aliases": [],
-    "code": "1f99b",
-    "name": ":hippopotamus:"
-  },
-  "1f99c": {
-    "aliases": [],
-    "code": "1f99c",
-    "name": ":parrot:"
-  },
-  "1f99d": {
-    "aliases": [],
-    "code": "1f99d",
-    "name": ":raccoon:"
-  },
-  "1f99e": {
-    "aliases": [],
-    "code": "1f99e",
-    "name": ":lobster:"
-  },
-  "1f99f": {
-    "aliases": [],
-    "code": "1f99f",
-    "name": ":mosquito:"
-  },
-  "1f9a0": {
-    "aliases": [],
-    "code": "1f9a0",
-    "name": ":microbe:"
-  },
-  "1f9a1": {
-    "aliases": [],
-    "code": "1f9a1",
-    "name": ":badger:"
-  },
-  "1f9a2": {
-    "aliases": [],
-    "code": "1f9a2",
-    "name": ":swan:"
-  },
-  "1f9a5": {
-    "aliases": [],
-    "code": "1f9a5",
-    "name": ":sloth:"
-  },
-  "1f9a6": {
-    "aliases": [],
-    "code": "1f9a6",
-    "name": ":otter:"
-  },
-  "1f9a7": {
-    "aliases": [],
-    "code": "1f9a7",
-    "name": ":orangutan:"
-  },
-  "1f9a8": {
-    "aliases": [],
-    "code": "1f9a8",
-    "name": ":skunk:"
-  },
-  "1f9a9": {
-    "aliases": [],
-    "code": "1f9a9",
-    "name": ":flamingo:"
-  },
-  "1f9aa": {
-    "aliases": [],
-    "code": "1f9aa",
-    "name": ":oyster:"
-  },
-  "1f9ae": {
-    "aliases": [],
-    "code": "1f9ae",
-    "name": ":guide_dog:"
-  },
-  "1f9af": {
-    "aliases": [],
-    "code": "1f9af",
-    "name": ":probing_cane:"
-  },
-  "1f9b0": {
-    "aliases": [],
-    "code": "1f9b0",
-    "name": ":red_haired:"
-  },
-  "1f9b1": {
-    "aliases": [],
-    "code": "1f9b1",
-    "name": ":curly_haired:"
-  },
-  "1f9b2": {
-    "aliases": [],
-    "code": "1f9b2",
-    "name": ":bald:"
-  },
-  "1f9b3": {
-    "aliases": [],
-    "code": "1f9b3",
-    "name": ":white_haired:"
-  },
-  "1f9b4": {
-    "aliases": [],
-    "code": "1f9b4",
-    "name": ":bone:"
-  },
-  "1f9b5": {
-    "aliases": [],
-    "code": "1f9b5",
-    "name": ":leg:"
-  },
-  "1f9b5-1f3fb": {
-    "aliases": [":leg_light_skin_tone:"],
-    "code": "1f9b5-1f3fb",
-    "name": ":leg_tone1:"
-  },
-  "1f9b5-1f3fc": {
-    "aliases": [":leg_medium_light_skin_tone:"],
-    "code": "1f9b5-1f3fc",
-    "name": ":leg_tone2:"
-  },
-  "1f9b5-1f3fd": {
-    "aliases": [":leg_medium_skin_tone:"],
-    "code": "1f9b5-1f3fd",
-    "name": ":leg_tone3:"
-  },
-  "1f9b5-1f3fe": {
-    "aliases": [":leg_medium_dark_skin_tone:"],
-    "code": "1f9b5-1f3fe",
-    "name": ":leg_tone4:"
-  },
-  "1f9b5-1f3ff": {
-    "aliases": [":leg_dark_skin_tone:"],
-    "code": "1f9b5-1f3ff",
-    "name": ":leg_tone5:"
-  },
-  "1f9b6": {
-    "aliases": [],
-    "code": "1f9b6",
-    "name": ":foot:"
-  },
-  "1f9b6-1f3fb": {
-    "aliases": [":foot_light_skin_tone:"],
-    "code": "1f9b6-1f3fb",
-    "name": ":foot_tone1:"
-  },
-  "1f9b6-1f3fc": {
-    "aliases": [":foot_medium_light_skin_tone:"],
-    "code": "1f9b6-1f3fc",
-    "name": ":foot_tone2:"
-  },
-  "1f9b6-1f3fd": {
-    "aliases": [":foot_medium_skin_tone:"],
-    "code": "1f9b6-1f3fd",
-    "name": ":foot_tone3:"
-  },
-  "1f9b6-1f3fe": {
-    "aliases": [":foot_medium_dark_skin_tone:"],
-    "code": "1f9b6-1f3fe",
-    "name": ":foot_tone4:"
-  },
-  "1f9b6-1f3ff": {
-    "aliases": [":foot_dark_skin_tone:"],
-    "code": "1f9b6-1f3ff",
-    "name": ":foot_tone5:"
-  },
-  "1f9b7": {
-    "aliases": [],
-    "code": "1f9b7",
-    "name": ":tooth:"
-  },
-  "1f9b8": {
-    "aliases": [],
-    "code": "1f9b8",
-    "name": ":superhero:"
-  },
-  "1f9b8-1f3fb": {
-    "aliases": [":superhero_light_skin_tone:"],
-    "code": "1f9b8-1f3fb",
-    "name": ":superhero_tone1:"
-  },
-  "1f9b8-1f3fb-2640": {
-    "aliases": [":woman_superhero_light_skin_tone:"],
-    "code": "1f9b8-1f3fb-200d-2640-fe0f",
-    "name": ":woman_superhero_tone1:"
-  },
-  "1f9b8-1f3fb-2642": {
-    "aliases": [":man_superhero_light_skin_tone:"],
-    "code": "1f9b8-1f3fb-200d-2642-fe0f",
-    "name": ":man_superhero_tone1:"
-  },
-  "1f9b8-1f3fc": {
-    "aliases": [":superhero_medium_light_skin_tone:"],
-    "code": "1f9b8-1f3fc",
-    "name": ":superhero_tone2:"
-  },
-  "1f9b8-1f3fc-2640": {
-    "aliases": [":woman_superhero_medium_light_skin_tone:"],
-    "code": "1f9b8-1f3fc-200d-2640-fe0f",
-    "name": ":woman_superhero_tone2:"
-  },
-  "1f9b8-1f3fc-2642": {
-    "aliases": [":man_superhero_medium_light_skin_tone:"],
-    "code": "1f9b8-1f3fc-200d-2642-fe0f",
-    "name": ":man_superhero_tone2:"
-  },
-  "1f9b8-1f3fd": {
-    "aliases": [":superhero_medium_skin_tone:"],
-    "code": "1f9b8-1f3fd",
-    "name": ":superhero_tone3:"
-  },
-  "1f9b8-1f3fd-2640": {
-    "aliases": [":woman_superhero_medium_skin_tone:"],
-    "code": "1f9b8-1f3fd-200d-2640-fe0f",
-    "name": ":woman_superhero_tone3:"
-  },
-  "1f9b8-1f3fd-2642": {
-    "aliases": [":man_superhero_medium_skin_tone:"],
-    "code": "1f9b8-1f3fd-200d-2642-fe0f",
-    "name": ":man_superhero_tone3:"
-  },
-  "1f9b8-1f3fe": {
-    "aliases": [":superhero_medium_dark_skin_tone:"],
-    "code": "1f9b8-1f3fe",
-    "name": ":superhero_tone4:"
-  },
-  "1f9b8-1f3fe-2640": {
-    "aliases": [":woman_superhero_medium_dark_skin_tone:"],
-    "code": "1f9b8-1f3fe-200d-2640-fe0f",
-    "name": ":woman_superhero_tone4:"
-  },
-  "1f9b8-1f3fe-2642": {
-    "aliases": [":man_superhero_medium_dark_skin_tone:"],
-    "code": "1f9b8-1f3fe-200d-2642-fe0f",
-    "name": ":man_superhero_tone4:"
-  },
-  "1f9b8-1f3ff": {
-    "aliases": [":superhero_dark_skin_tone:"],
-    "code": "1f9b8-1f3ff",
-    "name": ":superhero_tone5:"
-  },
-  "1f9b8-1f3ff-2640": {
-    "aliases": [":woman_superhero_dark_skin_tone:"],
-    "code": "1f9b8-1f3ff-200d-2640-fe0f",
-    "name": ":woman_superhero_tone5:"
-  },
-  "1f9b8-1f3ff-2642": {
-    "aliases": [":man_superhero_dark_skin_tone:"],
-    "code": "1f9b8-1f3ff-200d-2642-fe0f",
-    "name": ":man_superhero_tone5:"
-  },
-  "1f9b8-2640": {
-    "aliases": [],
-    "code": "1f9b8-200d-2640-fe0f",
-    "name": ":woman_superhero:"
-  },
-  "1f9b8-2642": {
-    "aliases": [],
-    "code": "1f9b8-200d-2642-fe0f",
-    "name": ":man_superhero:"
-  },
-  "1f9b9": {
-    "aliases": [],
-    "code": "1f9b9",
-    "name": ":supervillain:"
-  },
-  "1f9b9-1f3fb": {
-    "aliases": [":supervillain_light_skin_tone:"],
-    "code": "1f9b9-1f3fb",
-    "name": ":supervillain_tone1:"
-  },
-  "1f9b9-1f3fb-2640": {
-    "aliases": [":woman_supervillain_light_skin_tone:"],
-    "code": "1f9b9-1f3fb-200d-2640-fe0f",
-    "name": ":woman_supervillain_tone1:"
-  },
-  "1f9b9-1f3fb-2642": {
-    "aliases": [":man_supervillain_light_skin_tone:"],
-    "code": "1f9b9-1f3fb-200d-2642-fe0f",
-    "name": ":man_supervillain_tone1:"
-  },
-  "1f9b9-1f3fc": {
-    "aliases": [":supervillain_medium_light_skin_tone:"],
-    "code": "1f9b9-1f3fc",
-    "name": ":supervillain_tone2:"
-  },
-  "1f9b9-1f3fc-2640": {
-    "aliases": [":woman_supervillain_medium_light_skin_tone:"],
-    "code": "1f9b9-1f3fc-200d-2640-fe0f",
-    "name": ":woman_supervillain_tone2:"
-  },
-  "1f9b9-1f3fc-2642": {
-    "aliases": [":man_supervillain_medium_light_skin_tone:"],
-    "code": "1f9b9-1f3fc-200d-2642-fe0f",
-    "name": ":man_supervillain_tone2:"
-  },
-  "1f9b9-1f3fd": {
-    "aliases": [":supervillain_medium_skin_tone:"],
-    "code": "1f9b9-1f3fd",
-    "name": ":supervillain_tone3:"
-  },
-  "1f9b9-1f3fd-2640": {
-    "aliases": [":woman_supervillain_medium_skin_tone:"],
-    "code": "1f9b9-1f3fd-200d-2640-fe0f",
-    "name": ":woman_supervillain_tone3:"
-  },
-  "1f9b9-1f3fd-2642": {
-    "aliases": [":man_supervillain_medium_skin_tone:"],
-    "code": "1f9b9-1f3fd-200d-2642-fe0f",
-    "name": ":man_supervillain_tone3:"
-  },
-  "1f9b9-1f3fe": {
-    "aliases": [":supervillain_medium_dark_skin_tone:"],
-    "code": "1f9b9-1f3fe",
-    "name": ":supervillain_tone4:"
-  },
-  "1f9b9-1f3fe-2640": {
-    "aliases": [":woman_supervillain_medium_dark_skin_tone:"],
-    "code": "1f9b9-1f3fe-200d-2640-fe0f",
-    "name": ":woman_supervillain_tone4:"
-  },
-  "1f9b9-1f3fe-2642": {
-    "aliases": [":man_supervillain_medium_dark_skin_tone:"],
-    "code": "1f9b9-1f3fe-200d-2642-fe0f",
-    "name": ":man_supervillain_tone4:"
-  },
-  "1f9b9-1f3ff": {
-    "aliases": [":supervillain_dark_skin_tone:"],
-    "code": "1f9b9-1f3ff",
-    "name": ":supervillain_tone5:"
-  },
-  "1f9b9-1f3ff-2640": {
-    "aliases": [":woman_supervillain_dark_skin_tone:"],
-    "code": "1f9b9-1f3ff-200d-2640-fe0f",
-    "name": ":woman_supervillain_tone5:"
-  },
-  "1f9b9-1f3ff-2642": {
-    "aliases": [":man_supervillain_dark_skin_tone:"],
-    "code": "1f9b9-1f3ff-200d-2642-fe0f",
-    "name": ":man_supervillain_tone5:"
-  },
-  "1f9b9-2640": {
-    "aliases": [],
-    "code": "1f9b9-200d-2640-fe0f",
-    "name": ":woman_supervillain:"
-  },
-  "1f9b9-2642": {
-    "aliases": [],
-    "code": "1f9b9-200d-2642-fe0f",
-    "name": ":man_supervillain:"
-  },
-  "1f9ba": {
-    "aliases": [],
-    "code": "1f9ba",
-    "name": ":safety_vest:"
-  },
-  "1f9bb": {
-    "aliases": [],
-    "code": "1f9bb",
-    "name": ":ear_with_hearing_aid:"
-  },
-  "1f9bb-1f3fb": {
-    "aliases": [":ear_with_hearing_aid_light_skin_tone:"],
-    "code": "1f9bb-1f3fb",
-    "name": ":ear_with_hearing_aid_tone1:"
-  },
-  "1f9bb-1f3fc": {
-    "aliases": [":ear_with_hearing_aid_medium_light_skin_tone:"],
-    "code": "1f9bb-1f3fc",
-    "name": ":ear_with_hearing_aid_tone2:"
-  },
-  "1f9bb-1f3fd": {
-    "aliases": [":ear_with_hearing_aid_medium_skin_tone:"],
-    "code": "1f9bb-1f3fd",
-    "name": ":ear_with_hearing_aid_tone3:"
-  },
-  "1f9bb-1f3fe": {
-    "aliases": [":ear_with_hearing_aid_medium_dark_skin_tone:"],
-    "code": "1f9bb-1f3fe",
-    "name": ":ear_with_hearing_aid_tone4:"
-  },
-  "1f9bb-1f3ff": {
-    "aliases": [":ear_with_hearing_aid_dark_skin_tone:"],
-    "code": "1f9bb-1f3ff",
-    "name": ":ear_with_hearing_aid_tone5:"
-  },
-  "1f9bc": {
-    "aliases": [],
-    "code": "1f9bc",
-    "name": ":motorized_wheelchair:"
-  },
-  "1f9bd": {
-    "aliases": [],
-    "code": "1f9bd",
-    "name": ":manual_wheelchair:"
-  },
-  "1f9be": {
-    "aliases": [],
-    "code": "1f9be",
-    "name": ":mechanical_arm:"
-  },
-  "1f9bf": {
-    "aliases": [],
-    "code": "1f9bf",
-    "name": ":mechanical_leg:"
-  },
-  "1f9c0": {
-    "aliases": [":cheese_wedge:"],
-    "code": "1f9c0",
-    "name": ":cheese:"
-  },
-  "1f9c1": {
-    "aliases": [],
-    "code": "1f9c1",
-    "name": ":cupcake:"
-  },
-  "1f9c2": {
-    "aliases": [],
-    "code": "1f9c2",
-    "name": ":salt:"
-  },
-  "1f9c3": {
-    "aliases": [],
-    "code": "1f9c3",
-    "name": ":beverage_box:"
-  },
-  "1f9c4": {
-    "aliases": [],
-    "code": "1f9c4",
-    "name": ":garlic:"
-  },
-  "1f9c5": {
-    "aliases": [],
-    "code": "1f9c5",
-    "name": ":onion:"
-  },
-  "1f9c6": {
-    "aliases": [],
-    "code": "1f9c6",
-    "name": ":falafel:"
-  },
-  "1f9c7": {
-    "aliases": [],
-    "code": "1f9c7",
-    "name": ":waffle:"
-  },
-  "1f9c8": {
-    "aliases": [],
-    "code": "1f9c8",
-    "name": ":butter:"
-  },
-  "1f9c9": {
-    "aliases": [],
-    "code": "1f9c9",
-    "name": ":mate:"
-  },
-  "1f9ca": {
-    "aliases": [],
-    "code": "1f9ca",
-    "name": ":ice_cube:"
-  },
-  "1f9cd": {
-    "aliases": [],
-    "code": "1f9cd",
-    "name": ":person_standing:"
-  },
-  "1f9cd-1f3fb": {
-    "aliases": [":person_standing_light_skin_tone:"],
-    "code": "1f9cd-1f3fb",
-    "name": ":person_standing_tone1:"
-  },
-  "1f9cd-1f3fb-2640": {
-    "aliases": [":woman_standing_light_skin_tone:"],
-    "code": "1f9cd-1f3fb-200d-2640-fe0f",
-    "name": ":woman_standing_tone1:"
-  },
-  "1f9cd-1f3fb-2642": {
-    "aliases": [":man_standing_light_skin_tone:"],
-    "code": "1f9cd-1f3fb-200d-2642-fe0f",
-    "name": ":man_standing_tone1:"
-  },
-  "1f9cd-1f3fc": {
-    "aliases": [":person_standing_medium_light_skin_tone:"],
-    "code": "1f9cd-1f3fc",
-    "name": ":person_standing_tone2:"
-  },
-  "1f9cd-1f3fc-2640": {
-    "aliases": [":woman_standing_medium_light_skin_tone:"],
-    "code": "1f9cd-1f3fc-200d-2640-fe0f",
-    "name": ":woman_standing_tone2:"
-  },
-  "1f9cd-1f3fc-2642": {
-    "aliases": [":man_standing_medium_light_skin_tone:"],
-    "code": "1f9cd-1f3fc-200d-2642-fe0f",
-    "name": ":man_standing_tone2:"
-  },
-  "1f9cd-1f3fd": {
-    "aliases": [":person_standing_medium_skin_tone:"],
-    "code": "1f9cd-1f3fd",
-    "name": ":person_standing_tone3:"
-  },
-  "1f9cd-1f3fd-2640": {
-    "aliases": [":woman_standing_medium_skin_tone:"],
-    "code": "1f9cd-1f3fd-200d-2640-fe0f",
-    "name": ":woman_standing_tone3:"
-  },
-  "1f9cd-1f3fd-2642": {
-    "aliases": [":man_standing_medium_skin_tone:"],
-    "code": "1f9cd-1f3fd-200d-2642-fe0f",
-    "name": ":man_standing_tone3:"
-  },
-  "1f9cd-1f3fe": {
-    "aliases": [":person_standing_medium_dark_skin_tone:"],
-    "code": "1f9cd-1f3fe",
-    "name": ":person_standing_tone4:"
-  },
-  "1f9cd-1f3fe-2640": {
-    "aliases": [":woman_standing_medium_dark_skin_tone:"],
-    "code": "1f9cd-1f3fe-200d-2640-fe0f",
-    "name": ":woman_standing_tone4:"
-  },
-  "1f9cd-1f3fe-2642": {
-    "aliases": [":man_standing_medium_dark_skin_tone:"],
-    "code": "1f9cd-1f3fe-200d-2642-fe0f",
-    "name": ":man_standing_tone4:"
-  },
-  "1f9cd-1f3ff": {
-    "aliases": [":person_standing_dark_skin_tone:"],
-    "code": "1f9cd-1f3ff",
-    "name": ":person_standing_tone5:"
-  },
-  "1f9cd-1f3ff-2640": {
-    "aliases": [":woman_standing_dark_skin_tone:"],
-    "code": "1f9cd-1f3ff-200d-2640-fe0f",
-    "name": ":woman_standing_tone5:"
-  },
-  "1f9cd-1f3ff-2642": {
-    "aliases": [":man_standing_dark_skin_tone:"],
-    "code": "1f9cd-1f3ff-200d-2642-fe0f",
-    "name": ":man_standing_tone5:"
-  },
-  "1f9cd-2640": {
-    "aliases": [],
-    "code": "1f9cd-200d-2640-fe0f",
-    "name": ":woman_standing:"
-  },
-  "1f9cd-2642": {
-    "aliases": [],
-    "code": "1f9cd-200d-2642-fe0f",
-    "name": ":man_standing:"
-  },
-  "1f9ce": {
-    "aliases": [],
-    "code": "1f9ce",
-    "name": ":person_kneeling:"
-  },
-  "1f9ce-1f3fb": {
-    "aliases": [":person_kneeling_light_skin_tone:"],
-    "code": "1f9ce-1f3fb",
-    "name": ":person_kneeling_tone1:"
-  },
-  "1f9ce-1f3fb-2640": {
-    "aliases": [":woman_kneeling_light_skin_tone:"],
-    "code": "1f9ce-1f3fb-200d-2640-fe0f",
-    "name": ":woman_kneeling_tone1:"
-  },
-  "1f9ce-1f3fb-2642": {
-    "aliases": [":man_kneeling_light_skin_tone:"],
-    "code": "1f9ce-1f3fb-200d-2642-fe0f",
-    "name": ":man_kneeling_tone1:"
-  },
-  "1f9ce-1f3fc": {
-    "aliases": [":person_kneeling_medium_light_skin_tone:"],
-    "code": "1f9ce-1f3fc",
-    "name": ":person_kneeling_tone2:"
-  },
-  "1f9ce-1f3fc-2640": {
-    "aliases": [":woman_kneeling_medium_light_skin_tone:"],
-    "code": "1f9ce-1f3fc-200d-2640-fe0f",
-    "name": ":woman_kneeling_tone2:"
-  },
-  "1f9ce-1f3fc-2642": {
-    "aliases": [":man_kneeling_medium_light_skin_tone:"],
-    "code": "1f9ce-1f3fc-200d-2642-fe0f",
-    "name": ":man_kneeling_tone2:"
-  },
-  "1f9ce-1f3fd": {
-    "aliases": [":person_kneeling_medium_skin_tone:"],
-    "code": "1f9ce-1f3fd",
-    "name": ":person_kneeling_tone3:"
-  },
-  "1f9ce-1f3fd-2640": {
-    "aliases": [":woman_kneeling_medium_skin_tone:"],
-    "code": "1f9ce-1f3fd-200d-2640-fe0f",
-    "name": ":woman_kneeling_tone3:"
-  },
-  "1f9ce-1f3fd-2642": {
-    "aliases": [":man_kneeling_medium_skin_tone:"],
-    "code": "1f9ce-1f3fd-200d-2642-fe0f",
-    "name": ":man_kneeling_tone3:"
-  },
-  "1f9ce-1f3fe": {
-    "aliases": [":person_kneeling_medium_dark_skin_tone:"],
-    "code": "1f9ce-1f3fe",
-    "name": ":person_kneeling_tone4:"
-  },
-  "1f9ce-1f3fe-2640": {
-    "aliases": [":woman_kneeling_medium_dark_skin_tone:"],
-    "code": "1f9ce-1f3fe-200d-2640-fe0f",
-    "name": ":woman_kneeling_tone4:"
-  },
-  "1f9ce-1f3fe-2642": {
-    "aliases": [":man_kneeling_medium_dark_skin_tone:"],
-    "code": "1f9ce-1f3fe-200d-2642-fe0f",
-    "name": ":man_kneeling_tone4:"
-  },
-  "1f9ce-1f3ff": {
-    "aliases": [":person_kneeling_dark_skin_tone:"],
-    "code": "1f9ce-1f3ff",
-    "name": ":person_kneeling_tone5:"
-  },
-  "1f9ce-1f3ff-2640": {
-    "aliases": [":woman_kneeling_dark_skin_tone:"],
-    "code": "1f9ce-1f3ff-200d-2640-fe0f",
-    "name": ":woman_kneeling_tone5:"
-  },
-  "1f9ce-1f3ff-2642": {
-    "aliases": [":man_kneeling_dark_skin_tone:"],
-    "code": "1f9ce-1f3ff-200d-2642-fe0f",
-    "name": ":man_kneeling_tone5:"
-  },
-  "1f9ce-2640": {
-    "aliases": [],
-    "code": "1f9ce-200d-2640-fe0f",
-    "name": ":woman_kneeling:"
-  },
-  "1f9ce-2642": {
-    "aliases": [],
-    "code": "1f9ce-200d-2642-fe0f",
-    "name": ":man_kneeling:"
-  },
-  "1f9cf": {
-    "aliases": [],
-    "code": "1f9cf",
-    "name": ":deaf_person:"
-  },
-  "1f9cf-1f3fb": {
-    "aliases": [":deaf_person_light_skin_tone:"],
-    "code": "1f9cf-1f3fb",
-    "name": ":deaf_person_tone1:"
-  },
-  "1f9cf-1f3fb-2640": {
-    "aliases": [":deaf_woman_light_skin_tone:"],
-    "code": "1f9cf-1f3fb-200d-2640-fe0f",
-    "name": ":deaf_woman_tone1:"
-  },
-  "1f9cf-1f3fb-2642": {
-    "aliases": [":deaf_man_light_skin_tone:"],
-    "code": "1f9cf-1f3fb-200d-2642-fe0f",
-    "name": ":deaf_man_tone1:"
-  },
-  "1f9cf-1f3fc": {
-    "aliases": [":deaf_person_medium_light_skin_tone:"],
-    "code": "1f9cf-1f3fc",
-    "name": ":deaf_person_tone2:"
-  },
-  "1f9cf-1f3fc-2640": {
-    "aliases": [":deaf_woman_medium_light_skin_tone:"],
-    "code": "1f9cf-1f3fc-200d-2640-fe0f",
-    "name": ":deaf_woman_tone2:"
-  },
-  "1f9cf-1f3fc-2642": {
-    "aliases": [":deaf_man_medium_light_skin_tone:"],
-    "code": "1f9cf-1f3fc-200d-2642-fe0f",
-    "name": ":deaf_man_tone2:"
-  },
-  "1f9cf-1f3fd": {
-    "aliases": [":deaf_person_medium_skin_tone:"],
-    "code": "1f9cf-1f3fd",
-    "name": ":deaf_person_tone3:"
-  },
-  "1f9cf-1f3fd-2640": {
-    "aliases": [":deaf_woman_medium_skin_tone:"],
-    "code": "1f9cf-1f3fd-200d-2640-fe0f",
-    "name": ":deaf_woman_tone3:"
-  },
-  "1f9cf-1f3fd-2642": {
-    "aliases": [":deaf_man_medium_skin_tone:"],
-    "code": "1f9cf-1f3fd-200d-2642-fe0f",
-    "name": ":deaf_man_tone3:"
-  },
-  "1f9cf-1f3fe": {
-    "aliases": [":deaf_person_medium_dark_skin_tone:"],
-    "code": "1f9cf-1f3fe",
-    "name": ":deaf_person_tone4:"
-  },
-  "1f9cf-1f3fe-2640": {
-    "aliases": [":deaf_woman_medium_dark_skin_tone:"],
-    "code": "1f9cf-1f3fe-200d-2640-fe0f",
-    "name": ":deaf_woman_tone4:"
-  },
-  "1f9cf-1f3fe-2642": {
-    "aliases": [":deaf_man_medium_dark_skin_tone:"],
-    "code": "1f9cf-1f3fe-200d-2642-fe0f",
-    "name": ":deaf_man_tone4:"
-  },
-  "1f9cf-1f3ff": {
-    "aliases": [":deaf_person_dark_skin_tone:"],
-    "code": "1f9cf-1f3ff",
-    "name": ":deaf_person_tone5:"
-  },
-  "1f9cf-1f3ff-2640": {
-    "aliases": [":deaf_woman_dark_skin_tone:"],
-    "code": "1f9cf-1f3ff-200d-2640-fe0f",
-    "name": ":deaf_woman_tone5:"
-  },
-  "1f9cf-1f3ff-2642": {
-    "aliases": [":deaf_man_dark_skin_tone:"],
-    "code": "1f9cf-1f3ff-200d-2642-fe0f",
-    "name": ":deaf_man_tone5:"
-  },
-  "1f9cf-2640": {
-    "aliases": [],
-    "code": "1f9cf-200d-2640-fe0f",
-    "name": ":deaf_woman:"
-  },
-  "1f9cf-2642": {
-    "aliases": [],
-    "code": "1f9cf-200d-2642-fe0f",
-    "name": ":deaf_man:"
-  },
-  "1f9d0": {
-    "aliases": [],
-    "code": "1f9d0",
-    "name": ":face_with_monocle:"
-  },
-  "1f9d1": {
-    "aliases": [],
-    "code": "1f9d1",
-    "name": ":adult:"
-  },
-  "1f9d1-1f33e": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f33e",
-    "name": ":farmer:"
-  },
-  "1f9d1-1f373": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f373",
-    "name": ":cook:"
-  },
-  "1f9d1-1f393": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f393",
-    "name": ":student:"
-  },
-  "1f9d1-1f3a4": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f3a4",
-    "name": ":singer:"
-  },
-  "1f9d1-1f3a8": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f3a8",
-    "name": ":artist:"
-  },
-  "1f9d1-1f3eb": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f3eb",
-    "name": ":teacher:"
-  },
-  "1f9d1-1f3ed": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f3ed",
-    "name": ":factory_worker:"
-  },
-  "1f9d1-1f3fb": {
-    "aliases": [":adult_light_skin_tone:"],
-    "code": "1f9d1-1f3fb",
-    "name": ":adult_tone1:"
-  },
-  "1f9d1-1f3fb-1f33e": {
-    "aliases": [":farmer_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f33e",
-    "name": ":farmer_tone1:"
-  },
-  "1f9d1-1f3fb-1f373": {
-    "aliases": [":cook_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f373",
-    "name": ":cook_tone1:"
-  },
-  "1f9d1-1f3fb-1f393": {
-    "aliases": [":student_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f393",
-    "name": ":student_tone1:"
-  },
-  "1f9d1-1f3fb-1f3a4": {
-    "aliases": [":singer_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f3a4",
-    "name": ":singer_tone1:"
-  },
-  "1f9d1-1f3fb-1f3a8": {
-    "aliases": [":artist_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f3a8",
-    "name": ":artist_tone1:"
-  },
-  "1f9d1-1f3fb-1f3eb": {
-    "aliases": [":teacher_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f3eb",
-    "name": ":teacher_tone1:"
-  },
-  "1f9d1-1f3fb-1f3ed": {
-    "aliases": [":factory_worker_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f3ed",
-    "name": ":factory_worker_tone1:"
-  },
-  "1f9d1-1f3fb-1f4bb": {
-    "aliases": [":technologist_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f4bb",
-    "name": ":technologist_tone1:"
-  },
-  "1f9d1-1f3fb-1f4bc": {
-    "aliases": [":office_worker_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f4bc",
-    "name": ":office_worker_tone1:"
-  },
-  "1f9d1-1f3fb-1f527": {
-    "aliases": [":mechanic_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f527",
-    "name": ":mechanic_tone1:"
-  },
-  "1f9d1-1f3fb-1f52c": {
-    "aliases": [":scientist_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f52c",
-    "name": ":scientist_tone1:"
-  },
-  "1f9d1-1f3fb-1f680": {
-    "aliases": [":astronaut_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f680",
-    "name": ":astronaut_tone1:"
-  },
-  "1f9d1-1f3fb-1f692": {
-    "aliases": [":firefighter_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f692",
-    "name": ":firefighter_tone1:"
-  },
-  "1f9d1-1f3fb-1f91d-1f9d1-1f3fb": {
-    "aliases": [":people_holding_hands_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb",
-    "name": ":people_holding_hands_tone1:"
-  },
-  "1f9d1-1f3fb-1f91d-1f9d1-1f3fc": {
-    "aliases": [":people_holding_hands_light_skin_tone_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fc",
-    "name": ":people_holding_hands_tone1_tone2:"
-  },
-  "1f9d1-1f3fb-1f91d-1f9d1-1f3fd": {
-    "aliases": [":people_holding_hands_light_skin_tone_medium_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fd",
-    "name": ":people_holding_hands_tone1_tone3:"
-  },
-  "1f9d1-1f3fb-1f91d-1f9d1-1f3fe": {
-    "aliases": [":people_holding_hands_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fe",
-    "name": ":people_holding_hands_tone1_tone4:"
-  },
-  "1f9d1-1f3fb-1f91d-1f9d1-1f3ff": {
-    "aliases": [":people_holding_hands_light_skin_tone_dark_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3ff",
-    "name": ":people_holding_hands_tone1_tone5:"
-  },
-  "1f9d1-1f3fb-1f9af": {
-    "aliases": [":person_with_probing_cane_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f9af",
-    "name": ":person_with_probing_cane_tone1:"
-  },
-  "1f9d1-1f3fb-1f9b0": {
-    "aliases": [":person_light_skin_tone_red_hair:"],
-    "code": "1f9d1-1f3fb-200d-1f9b0",
-    "name": ":person_tone1_red_hair:"
-  },
-  "1f9d1-1f3fb-1f9b1": {
-    "aliases": [":person_light_skin_tone_curly_hair:"],
-    "code": "1f9d1-1f3fb-200d-1f9b1",
-    "name": ":person_tone1_curly_hair:"
-  },
-  "1f9d1-1f3fb-1f9b2": {
-    "aliases": [":person_light_skin_tone_bald:"],
-    "code": "1f9d1-1f3fb-200d-1f9b2",
-    "name": ":person_tone1_bald:"
-  },
-  "1f9d1-1f3fb-1f9b3": {
-    "aliases": [":person_light_skin_tone_white_hair:"],
-    "code": "1f9d1-1f3fb-200d-1f9b3",
-    "name": ":person_tone1_white_hair:"
-  },
-  "1f9d1-1f3fb-1f9bc": {
-    "aliases": [":person_in_motorized_wheelchair_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair_tone1:"
-  },
-  "1f9d1-1f3fb-1f9bd": {
-    "aliases": [":person_in_manual_wheelchair_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair_tone1:"
-  },
-  "1f9d1-1f3fb-2695": {
-    "aliases": [":health_worker_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-2695-fe0f",
-    "name": ":health_worker_tone1:"
-  },
-  "1f9d1-1f3fb-2696": {
-    "aliases": [":judge_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-2696-fe0f",
-    "name": ":judge_tone1:"
-  },
-  "1f9d1-1f3fb-2708": {
-    "aliases": [":pilot_light_skin_tone:"],
-    "code": "1f9d1-1f3fb-200d-2708-fe0f",
-    "name": ":pilot_tone1:"
-  },
-  "1f9d1-1f3fc": {
-    "aliases": [":adult_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc",
-    "name": ":adult_tone2:"
-  },
-  "1f9d1-1f3fc-1f33e": {
-    "aliases": [":farmer_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f33e",
-    "name": ":farmer_tone2:"
-  },
-  "1f9d1-1f3fc-1f373": {
-    "aliases": [":cook_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f373",
-    "name": ":cook_tone2:"
-  },
-  "1f9d1-1f3fc-1f393": {
-    "aliases": [":student_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f393",
-    "name": ":student_tone2:"
-  },
-  "1f9d1-1f3fc-1f3a4": {
-    "aliases": [":singer_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f3a4",
-    "name": ":singer_tone2:"
-  },
-  "1f9d1-1f3fc-1f3a8": {
-    "aliases": [":artist_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f3a8",
-    "name": ":artist_tone2:"
-  },
-  "1f9d1-1f3fc-1f3eb": {
-    "aliases": [":teacher_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f3eb",
-    "name": ":teacher_tone2:"
-  },
-  "1f9d1-1f3fc-1f3ed": {
-    "aliases": [":factory_worker_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f3ed",
-    "name": ":factory_worker_tone2:"
-  },
-  "1f9d1-1f3fc-1f4bb": {
-    "aliases": [":technologist_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f4bb",
-    "name": ":technologist_tone2:"
-  },
-  "1f9d1-1f3fc-1f4bc": {
-    "aliases": [":office_worker_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f4bc",
-    "name": ":office_worker_tone2:"
-  },
-  "1f9d1-1f3fc-1f527": {
-    "aliases": [":mechanic_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f527",
-    "name": ":mechanic_tone2:"
-  },
-  "1f9d1-1f3fc-1f52c": {
-    "aliases": [":scientist_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f52c",
-    "name": ":scientist_tone2:"
-  },
-  "1f9d1-1f3fc-1f680": {
-    "aliases": [":astronaut_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f680",
-    "name": ":astronaut_tone2:"
-  },
-  "1f9d1-1f3fc-1f692": {
-    "aliases": [":firefighter_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f692",
-    "name": ":firefighter_tone2:"
-  },
-  "1f9d1-1f3fc-1f91d-1f9d1-1f3fb": {
-    "aliases": [":people_holding_hands_medium_light_skin_tone_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fb",
-    "name": ":people_holding_hands_tone2_tone1:"
-  },
-  "1f9d1-1f3fc-1f91d-1f9d1-1f3fc": {
-    "aliases": [":people_holding_hands_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc",
-    "name": ":people_holding_hands_tone2:"
-  },
-  "1f9d1-1f3fc-1f91d-1f9d1-1f3fd": {
-    "aliases": [":people_holding_hands_medium_light_skin_tone_medium_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fd",
-    "name": ":people_holding_hands_tone2_tone3:"
-  },
-  "1f9d1-1f3fc-1f91d-1f9d1-1f3fe": {
-    "aliases": [":people_holding_hands_medium_light_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fe",
-    "name": ":people_holding_hands_tone2_tone4:"
-  },
-  "1f9d1-1f3fc-1f91d-1f9d1-1f3ff": {
-    "aliases": [":people_holding_hands_medium_light_skin_tone_dark_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3ff",
-    "name": ":people_holding_hands_tone2_tone5:"
-  },
-  "1f9d1-1f3fc-1f9af": {
-    "aliases": [":person_with_probing_cane_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f9af",
-    "name": ":person_with_probing_cane_tone2:"
-  },
-  "1f9d1-1f3fc-1f9b0": {
-    "aliases": [":person_medium_light_skin_tone_red_hair:"],
-    "code": "1f9d1-1f3fc-200d-1f9b0",
-    "name": ":person_tone2_red_hair:"
-  },
-  "1f9d1-1f3fc-1f9b1": {
-    "aliases": [":person_medium_light_skin_tone_curly_hair:"],
-    "code": "1f9d1-1f3fc-200d-1f9b1",
-    "name": ":person_tone2_curly_hair:"
-  },
-  "1f9d1-1f3fc-1f9b2": {
-    "aliases": [":person_medium_light_skin_tone_bald:"],
-    "code": "1f9d1-1f3fc-200d-1f9b2",
-    "name": ":person_tone2_bald:"
-  },
-  "1f9d1-1f3fc-1f9b3": {
-    "aliases": [":person_medium_light_skin_tone_white_hair:"],
-    "code": "1f9d1-1f3fc-200d-1f9b3",
-    "name": ":person_tone2_white_hair:"
-  },
-  "1f9d1-1f3fc-1f9bc": {
-    "aliases": [":person_in_motorized_wheelchair_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair_tone2:"
-  },
-  "1f9d1-1f3fc-1f9bd": {
-    "aliases": [":person_in_manual_wheelchair_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair_tone2:"
-  },
-  "1f9d1-1f3fc-2695": {
-    "aliases": [":health_worker_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-2695-fe0f",
-    "name": ":health_worker_tone2:"
-  },
-  "1f9d1-1f3fc-2696": {
-    "aliases": [":judge_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-2696-fe0f",
-    "name": ":judge_tone2:"
-  },
-  "1f9d1-1f3fc-2708": {
-    "aliases": [":pilot_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fc-200d-2708-fe0f",
-    "name": ":pilot_tone2:"
-  },
-  "1f9d1-1f3fd": {
-    "aliases": [":adult_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd",
-    "name": ":adult_tone3:"
-  },
-  "1f9d1-1f3fd-1f33e": {
-    "aliases": [":farmer_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f33e",
-    "name": ":farmer_tone3:"
-  },
-  "1f9d1-1f3fd-1f373": {
-    "aliases": [":cook_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f373",
-    "name": ":cook_tone3:"
-  },
-  "1f9d1-1f3fd-1f393": {
-    "aliases": [":student_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f393",
-    "name": ":student_tone3:"
-  },
-  "1f9d1-1f3fd-1f3a4": {
-    "aliases": [":singer_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f3a4",
-    "name": ":singer_tone3:"
-  },
-  "1f9d1-1f3fd-1f3a8": {
-    "aliases": [":artist_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f3a8",
-    "name": ":artist_tone3:"
-  },
-  "1f9d1-1f3fd-1f3eb": {
-    "aliases": [":teacher_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f3eb",
-    "name": ":teacher_tone3:"
-  },
-  "1f9d1-1f3fd-1f3ed": {
-    "aliases": [":factory_worker_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f3ed",
-    "name": ":factory_worker_tone3:"
-  },
-  "1f9d1-1f3fd-1f4bb": {
-    "aliases": [":technologist_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f4bb",
-    "name": ":technologist_tone3:"
-  },
-  "1f9d1-1f3fd-1f4bc": {
-    "aliases": [":office_worker_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f4bc",
-    "name": ":office_worker_tone3:"
-  },
-  "1f9d1-1f3fd-1f527": {
-    "aliases": [":mechanic_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f527",
-    "name": ":mechanic_tone3:"
-  },
-  "1f9d1-1f3fd-1f52c": {
-    "aliases": [":scientist_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f52c",
-    "name": ":scientist_tone3:"
-  },
-  "1f9d1-1f3fd-1f680": {
-    "aliases": [":astronaut_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f680",
-    "name": ":astronaut_tone3:"
-  },
-  "1f9d1-1f3fd-1f692": {
-    "aliases": [":firefighter_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f692",
-    "name": ":firefighter_tone3:"
-  },
-  "1f9d1-1f3fd-1f91d-1f9d1-1f3fb": {
-    "aliases": [":people_holding_hands_medium_skin_tone_light_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fb",
-    "name": ":people_holding_hands_tone3_tone1:"
-  },
-  "1f9d1-1f3fd-1f91d-1f9d1-1f3fc": {
-    "aliases": [":people_holding_hands_medium_skin_tone_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fc",
-    "name": ":people_holding_hands_tone3_tone2:"
-  },
-  "1f9d1-1f3fd-1f91d-1f9d1-1f3fd": {
-    "aliases": [":people_holding_hands_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd",
-    "name": ":people_holding_hands_tone3:"
-  },
-  "1f9d1-1f3fd-1f91d-1f9d1-1f3fe": {
-    "aliases": [":people_holding_hands_medium_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fe",
-    "name": ":people_holding_hands_tone3_tone4:"
-  },
-  "1f9d1-1f3fd-1f91d-1f9d1-1f3ff": {
-    "aliases": [":people_holding_hands_medium_skin_tone_dark_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3ff",
-    "name": ":people_holding_hands_tone3_tone5:"
-  },
-  "1f9d1-1f3fd-1f9af": {
-    "aliases": [":person_with_probing_cane_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f9af",
-    "name": ":person_with_probing_cane_tone3:"
-  },
-  "1f9d1-1f3fd-1f9b0": {
-    "aliases": [":person_medium_skin_tone_red_hair:"],
-    "code": "1f9d1-1f3fd-200d-1f9b0",
-    "name": ":person_tone3_red_hair:"
-  },
-  "1f9d1-1f3fd-1f9b1": {
-    "aliases": [":person_medium_skin_tone_curly_hair:"],
-    "code": "1f9d1-1f3fd-200d-1f9b1",
-    "name": ":person_tone3_curly_hair:"
-  },
-  "1f9d1-1f3fd-1f9b2": {
-    "aliases": [":person_medium_skin_tone_bald:"],
-    "code": "1f9d1-1f3fd-200d-1f9b2",
-    "name": ":person_tone3_bald:"
-  },
-  "1f9d1-1f3fd-1f9b3": {
-    "aliases": [":person_medium_skin_tone_white_hair:"],
-    "code": "1f9d1-1f3fd-200d-1f9b3",
-    "name": ":person_tone3_white_hair:"
-  },
-  "1f9d1-1f3fd-1f9bc": {
-    "aliases": [":person_in_motorized_wheelchair_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair_tone3:"
-  },
-  "1f9d1-1f3fd-1f9bd": {
-    "aliases": [":person_in_manual_wheelchair_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair_tone3:"
-  },
-  "1f9d1-1f3fd-2695": {
-    "aliases": [":health_worker_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-2695-fe0f",
-    "name": ":health_worker_tone3:"
-  },
-  "1f9d1-1f3fd-2696": {
-    "aliases": [":judge_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-2696-fe0f",
-    "name": ":judge_tone3:"
-  },
-  "1f9d1-1f3fd-2708": {
-    "aliases": [":pilot_medium_skin_tone:"],
-    "code": "1f9d1-1f3fd-200d-2708-fe0f",
-    "name": ":pilot_tone3:"
-  },
-  "1f9d1-1f3fe": {
-    "aliases": [":adult_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe",
-    "name": ":adult_tone4:"
-  },
-  "1f9d1-1f3fe-1f33e": {
-    "aliases": [":farmer_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f33e",
-    "name": ":farmer_tone4:"
-  },
-  "1f9d1-1f3fe-1f373": {
-    "aliases": [":cook_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f373",
-    "name": ":cook_tone4:"
-  },
-  "1f9d1-1f3fe-1f393": {
-    "aliases": [":student_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f393",
-    "name": ":student_tone4:"
-  },
-  "1f9d1-1f3fe-1f3a4": {
-    "aliases": [":singer_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f3a4",
-    "name": ":singer_tone4:"
-  },
-  "1f9d1-1f3fe-1f3a8": {
-    "aliases": [":artist_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f3a8",
-    "name": ":artist_tone4:"
-  },
-  "1f9d1-1f3fe-1f3eb": {
-    "aliases": [":teacher_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f3eb",
-    "name": ":teacher_tone4:"
-  },
-  "1f9d1-1f3fe-1f3ed": {
-    "aliases": [":factory_worker_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f3ed",
-    "name": ":factory_worker_tone4:"
-  },
-  "1f9d1-1f3fe-1f4bb": {
-    "aliases": [":technologist_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f4bb",
-    "name": ":technologist_tone4:"
-  },
-  "1f9d1-1f3fe-1f4bc": {
-    "aliases": [":office_worker_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f4bc",
-    "name": ":office_worker_tone4:"
-  },
-  "1f9d1-1f3fe-1f527": {
-    "aliases": [":mechanic_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f527",
-    "name": ":mechanic_tone4:"
-  },
-  "1f9d1-1f3fe-1f52c": {
-    "aliases": [":scientist_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f52c",
-    "name": ":scientist_tone4:"
-  },
-  "1f9d1-1f3fe-1f680": {
-    "aliases": [":astronaut_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f680",
-    "name": ":astronaut_tone4:"
-  },
-  "1f9d1-1f3fe-1f692": {
-    "aliases": [":firefighter_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f692",
-    "name": ":firefighter_tone4:"
-  },
-  "1f9d1-1f3fe-1f91d-1f9d1-1f3fb": {
-    "aliases": [":people_holding_hands_medium_dark_skin_tone_light_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fb",
-    "name": ":people_holding_hands_tone4_tone1:"
-  },
-  "1f9d1-1f3fe-1f91d-1f9d1-1f3fc": {
-    "aliases": [":people_holding_hands_medium_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fc",
-    "name": ":people_holding_hands_tone4_tone2:"
-  },
-  "1f9d1-1f3fe-1f91d-1f9d1-1f3fd": {
-    "aliases": [":people_holding_hands_medium_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fd",
-    "name": ":people_holding_hands_tone4_tone3:"
-  },
-  "1f9d1-1f3fe-1f91d-1f9d1-1f3fe": {
-    "aliases": [":people_holding_hands_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe",
-    "name": ":people_holding_hands_tone4:"
-  },
-  "1f9d1-1f3fe-1f91d-1f9d1-1f3ff": {
-    "aliases": [":people_holding_hands_medium_dark_skin_tone_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3ff",
-    "name": ":people_holding_hands_tone4_tone5:"
-  },
-  "1f9d1-1f3fe-1f9af": {
-    "aliases": [":person_with_probing_cane_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f9af",
-    "name": ":person_with_probing_cane_tone4:"
-  },
-  "1f9d1-1f3fe-1f9b0": {
-    "aliases": [":person_medium_dark_skin_tone_red_hair:"],
-    "code": "1f9d1-1f3fe-200d-1f9b0",
-    "name": ":person_tone4_red_hair:"
-  },
-  "1f9d1-1f3fe-1f9b1": {
-    "aliases": [":person_medium_dark_skin_tone_curly_hair:"],
-    "code": "1f9d1-1f3fe-200d-1f9b1",
-    "name": ":person_tone4_curly_hair:"
-  },
-  "1f9d1-1f3fe-1f9b2": {
-    "aliases": [":person_medium_dark_skin_tone_bald:"],
-    "code": "1f9d1-1f3fe-200d-1f9b2",
-    "name": ":person_tone4_bald:"
-  },
-  "1f9d1-1f3fe-1f9b3": {
-    "aliases": [":person_medium_dark_skin_tone_white_hair:"],
-    "code": "1f9d1-1f3fe-200d-1f9b3",
-    "name": ":person_tone4_white_hair:"
-  },
-  "1f9d1-1f3fe-1f9bc": {
-    "aliases": [":person_in_motorized_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair_tone4:"
-  },
-  "1f9d1-1f3fe-1f9bd": {
-    "aliases": [":person_in_manual_wheelchair_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair_tone4:"
-  },
-  "1f9d1-1f3fe-2695": {
-    "aliases": [":health_worker_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-2695-fe0f",
-    "name": ":health_worker_tone4:"
-  },
-  "1f9d1-1f3fe-2696": {
-    "aliases": [":judge_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-2696-fe0f",
-    "name": ":judge_tone4:"
-  },
-  "1f9d1-1f3fe-2708": {
-    "aliases": [":pilot_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3fe-200d-2708-fe0f",
-    "name": ":pilot_tone4:"
-  },
-  "1f9d1-1f3ff": {
-    "aliases": [":adult_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff",
-    "name": ":adult_tone5:"
-  },
-  "1f9d1-1f3ff-1f33e": {
-    "aliases": [":farmer_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f33e",
-    "name": ":farmer_tone5:"
-  },
-  "1f9d1-1f3ff-1f373": {
-    "aliases": [":cook_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f373",
-    "name": ":cook_tone5:"
-  },
-  "1f9d1-1f3ff-1f393": {
-    "aliases": [":student_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f393",
-    "name": ":student_tone5:"
-  },
-  "1f9d1-1f3ff-1f3a4": {
-    "aliases": [":singer_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f3a4",
-    "name": ":singer_tone5:"
-  },
-  "1f9d1-1f3ff-1f3a8": {
-    "aliases": [":artist_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f3a8",
-    "name": ":artist_tone5:"
-  },
-  "1f9d1-1f3ff-1f3eb": {
-    "aliases": [":teacher_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f3eb",
-    "name": ":teacher_tone5:"
-  },
-  "1f9d1-1f3ff-1f3ed": {
-    "aliases": [":factory_worker_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f3ed",
-    "name": ":factory_worker_tone5:"
-  },
-  "1f9d1-1f3ff-1f4bb": {
-    "aliases": [":technologist_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f4bb",
-    "name": ":technologist_tone5:"
-  },
-  "1f9d1-1f3ff-1f4bc": {
-    "aliases": [":office_worker_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f4bc",
-    "name": ":office_worker_tone5:"
-  },
-  "1f9d1-1f3ff-1f527": {
-    "aliases": [":mechanic_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f527",
-    "name": ":mechanic_tone5:"
-  },
-  "1f9d1-1f3ff-1f52c": {
-    "aliases": [":scientist_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f52c",
-    "name": ":scientist_tone5:"
-  },
-  "1f9d1-1f3ff-1f680": {
-    "aliases": [":astronaut_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f680",
-    "name": ":astronaut_tone5:"
-  },
-  "1f9d1-1f3ff-1f692": {
-    "aliases": [":firefighter_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f692",
-    "name": ":firefighter_tone5:"
-  },
-  "1f9d1-1f3ff-1f91d-1f9d1-1f3fb": {
-    "aliases": [":people_holding_hands_dark_skin_tone_light_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fb",
-    "name": ":people_holding_hands_tone5_tone1:"
-  },
-  "1f9d1-1f3ff-1f91d-1f9d1-1f3fc": {
-    "aliases": [":people_holding_hands_dark_skin_tone_medium_light_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fc",
-    "name": ":people_holding_hands_tone5_tone2:"
-  },
-  "1f9d1-1f3ff-1f91d-1f9d1-1f3fd": {
-    "aliases": [":people_holding_hands_dark_skin_tone_medium_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fd",
-    "name": ":people_holding_hands_tone5_tone3:"
-  },
-  "1f9d1-1f3ff-1f91d-1f9d1-1f3fe": {
-    "aliases": [":people_holding_hands_dark_skin_tone_medium_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3fe",
-    "name": ":people_holding_hands_tone5_tone4:"
-  },
-  "1f9d1-1f3ff-1f91d-1f9d1-1f3ff": {
-    "aliases": [":people_holding_hands_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff",
-    "name": ":people_holding_hands_tone5:"
-  },
-  "1f9d1-1f3ff-1f9af": {
-    "aliases": [":person_with_probing_cane_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f9af",
-    "name": ":person_with_probing_cane_tone5:"
-  },
-  "1f9d1-1f3ff-1f9b0": {
-    "aliases": [":person_dark_skin_tone_red_hair:"],
-    "code": "1f9d1-1f3ff-200d-1f9b0",
-    "name": ":person_tone5_red_hair:"
-  },
-  "1f9d1-1f3ff-1f9b1": {
-    "aliases": [":person_dark_skin_tone_curly_hair:"],
-    "code": "1f9d1-1f3ff-200d-1f9b1",
-    "name": ":person_tone5_curly_hair:"
-  },
-  "1f9d1-1f3ff-1f9b2": {
-    "aliases": [":person_dark_skin_tone_bald:"],
-    "code": "1f9d1-1f3ff-200d-1f9b2",
-    "name": ":person_tone5_bald:"
-  },
-  "1f9d1-1f3ff-1f9b3": {
-    "aliases": [":person_dark_skin_tone_white_hair:"],
-    "code": "1f9d1-1f3ff-200d-1f9b3",
-    "name": ":person_tone5_white_hair:"
-  },
-  "1f9d1-1f3ff-1f9bc": {
-    "aliases": [":person_in_motorized_wheelchair_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair_tone5:"
-  },
-  "1f9d1-1f3ff-1f9bd": {
-    "aliases": [":person_in_manual_wheelchair_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair_tone5:"
-  },
-  "1f9d1-1f3ff-2695": {
-    "aliases": [":health_worker_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-2695-fe0f",
-    "name": ":health_worker_tone5:"
-  },
-  "1f9d1-1f3ff-2696": {
-    "aliases": [":judge_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-2696-fe0f",
-    "name": ":judge_tone5:"
-  },
-  "1f9d1-1f3ff-2708": {
-    "aliases": [":pilot_dark_skin_tone:"],
-    "code": "1f9d1-1f3ff-200d-2708-fe0f",
-    "name": ":pilot_tone5:"
-  },
-  "1f9d1-1f4bb": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f4bb",
-    "name": ":technologist:"
-  },
-  "1f9d1-1f4bc": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f4bc",
-    "name": ":office_worker:"
-  },
-  "1f9d1-1f527": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f527",
-    "name": ":mechanic:"
-  },
-  "1f9d1-1f52c": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f52c",
-    "name": ":scientist:"
-  },
-  "1f9d1-1f680": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f680",
-    "name": ":astronaut:"
-  },
-  "1f9d1-1f692": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f692",
-    "name": ":firefighter:"
-  },
-  "1f9d1-1f91d-1f9d1": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f91d-200d-1f9d1",
-    "name": ":people_holding_hands:"
-  },
-  "1f9d1-1f9af": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9af",
-    "name": ":person_with_probing_cane:"
-  },
-  "1f9d1-1f9b0": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9b0",
-    "name": ":person_red_hair:"
-  },
-  "1f9d1-1f9b1": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9b1",
-    "name": ":person_curly_hair:"
-  },
-  "1f9d1-1f9b2": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9b2",
-    "name": ":person_bald:"
-  },
-  "1f9d1-1f9b3": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9b3",
-    "name": ":person_white_hair:"
-  },
-  "1f9d1-1f9bc": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9bc",
-    "name": ":person_in_motorized_wheelchair:"
-  },
-  "1f9d1-1f9bd": {
-    "aliases": [],
-    "code": "1f9d1-200d-1f9bd",
-    "name": ":person_in_manual_wheelchair:"
-  },
-  "1f9d1-2695": {
-    "aliases": [],
-    "code": "1f9d1-200d-2695-fe0f",
-    "name": ":health_worker:"
-  },
-  "1f9d1-2696": {
-    "aliases": [],
-    "code": "1f9d1-200d-2696-fe0f",
-    "name": ":judge:"
-  },
-  "1f9d1-2708": {
-    "aliases": [],
-    "code": "1f9d1-200d-2708-fe0f",
-    "name": ":pilot:"
-  },
-  "1f9d2": {
-    "aliases": [],
-    "code": "1f9d2",
-    "name": ":child:"
-  },
-  "1f9d2-1f3fb": {
-    "aliases": [":child_light_skin_tone:"],
-    "code": "1f9d2-1f3fb",
-    "name": ":child_tone1:"
-  },
-  "1f9d2-1f3fc": {
-    "aliases": [":child_medium_light_skin_tone:"],
-    "code": "1f9d2-1f3fc",
-    "name": ":child_tone2:"
-  },
-  "1f9d2-1f3fd": {
-    "aliases": [":child_medium_skin_tone:"],
-    "code": "1f9d2-1f3fd",
-    "name": ":child_tone3:"
-  },
-  "1f9d2-1f3fe": {
-    "aliases": [":child_medium_dark_skin_tone:"],
-    "code": "1f9d2-1f3fe",
-    "name": ":child_tone4:"
-  },
-  "1f9d2-1f3ff": {
-    "aliases": [":child_dark_skin_tone:"],
-    "code": "1f9d2-1f3ff",
-    "name": ":child_tone5:"
-  },
-  "1f9d3": {
-    "aliases": [],
-    "code": "1f9d3",
-    "name": ":older_adult:"
-  },
-  "1f9d3-1f3fb": {
-    "aliases": [":older_adult_light_skin_tone:"],
-    "code": "1f9d3-1f3fb",
-    "name": ":older_adult_tone1:"
-  },
-  "1f9d3-1f3fc": {
-    "aliases": [":older_adult_medium_light_skin_tone:"],
-    "code": "1f9d3-1f3fc",
-    "name": ":older_adult_tone2:"
-  },
-  "1f9d3-1f3fd": {
-    "aliases": [":older_adult_medium_skin_tone:"],
-    "code": "1f9d3-1f3fd",
-    "name": ":older_adult_tone3:"
-  },
-  "1f9d3-1f3fe": {
-    "aliases": [":older_adult_medium_dark_skin_tone:"],
-    "code": "1f9d3-1f3fe",
-    "name": ":older_adult_tone4:"
-  },
-  "1f9d3-1f3ff": {
-    "aliases": [":older_adult_dark_skin_tone:"],
-    "code": "1f9d3-1f3ff",
-    "name": ":older_adult_tone5:"
-  },
-  "1f9d4": {
-    "aliases": [],
-    "code": "1f9d4",
-    "name": ":bearded_person:"
-  },
-  "1f9d4-1f3fb": {
-    "aliases": [":bearded_person_light_skin_tone:"],
-    "code": "1f9d4-1f3fb",
-    "name": ":bearded_person_tone1:"
-  },
-  "1f9d4-1f3fc": {
-    "aliases": [":bearded_person_medium_light_skin_tone:"],
-    "code": "1f9d4-1f3fc",
-    "name": ":bearded_person_tone2:"
-  },
-  "1f9d4-1f3fd": {
-    "aliases": [":bearded_person_medium_skin_tone:"],
-    "code": "1f9d4-1f3fd",
-    "name": ":bearded_person_tone3:"
-  },
-  "1f9d4-1f3fe": {
-    "aliases": [":bearded_person_medium_dark_skin_tone:"],
-    "code": "1f9d4-1f3fe",
-    "name": ":bearded_person_tone4:"
-  },
-  "1f9d4-1f3ff": {
-    "aliases": [":bearded_person_dark_skin_tone:"],
-    "code": "1f9d4-1f3ff",
-    "name": ":bearded_person_tone5:"
-  },
-  "1f9d5": {
-    "aliases": [],
-    "code": "1f9d5",
-    "name": ":woman_with_headscarf:"
-  },
-  "1f9d5-1f3fb": {
-    "aliases": [":woman_with_headscarf_light_skin_tone:"],
-    "code": "1f9d5-1f3fb",
-    "name": ":woman_with_headscarf_tone1:"
-  },
-  "1f9d5-1f3fc": {
-    "aliases": [":woman_with_headscarf_medium_light_skin_tone:"],
-    "code": "1f9d5-1f3fc",
-    "name": ":woman_with_headscarf_tone2:"
-  },
-  "1f9d5-1f3fd": {
-    "aliases": [":woman_with_headscarf_medium_skin_tone:"],
-    "code": "1f9d5-1f3fd",
-    "name": ":woman_with_headscarf_tone3:"
-  },
-  "1f9d5-1f3fe": {
-    "aliases": [":woman_with_headscarf_medium_dark_skin_tone:"],
-    "code": "1f9d5-1f3fe",
-    "name": ":woman_with_headscarf_tone4:"
-  },
-  "1f9d5-1f3ff": {
-    "aliases": [":woman_with_headscarf_dark_skin_tone:"],
-    "code": "1f9d5-1f3ff",
-    "name": ":woman_with_headscarf_tone5:"
-  },
-  "1f9d6": {
-    "aliases": [],
-    "code": "1f9d6",
-    "name": ":person_in_steamy_room:"
-  },
-  "1f9d6-1f3fb": {
-    "aliases": [":person_in_steamy_room_light_skin_tone:"],
-    "code": "1f9d6-1f3fb",
-    "name": ":person_in_steamy_room_tone1:"
-  },
-  "1f9d6-1f3fb-2640": {
-    "aliases": [":woman_in_steamy_room_light_skin_tone:"],
-    "code": "1f9d6-1f3fb-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room_tone1:"
-  },
-  "1f9d6-1f3fb-2642": {
-    "aliases": [":man_in_steamy_room_light_skin_tone:"],
-    "code": "1f9d6-1f3fb-200d-2642-fe0f",
-    "name": ":man_in_steamy_room_tone1:"
-  },
-  "1f9d6-1f3fc": {
-    "aliases": [":person_in_steamy_room_medium_light_skin_tone:"],
-    "code": "1f9d6-1f3fc",
-    "name": ":person_in_steamy_room_tone2:"
-  },
-  "1f9d6-1f3fc-2640": {
-    "aliases": [":woman_in_steamy_room_medium_light_skin_tone:"],
-    "code": "1f9d6-1f3fc-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room_tone2:"
-  },
-  "1f9d6-1f3fc-2642": {
-    "aliases": [":man_in_steamy_room_medium_light_skin_tone:"],
-    "code": "1f9d6-1f3fc-200d-2642-fe0f",
-    "name": ":man_in_steamy_room_tone2:"
-  },
-  "1f9d6-1f3fd": {
-    "aliases": [":person_in_steamy_room_medium_skin_tone:"],
-    "code": "1f9d6-1f3fd",
-    "name": ":person_in_steamy_room_tone3:"
-  },
-  "1f9d6-1f3fd-2640": {
-    "aliases": [":woman_in_steamy_room_medium_skin_tone:"],
-    "code": "1f9d6-1f3fd-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room_tone3:"
-  },
-  "1f9d6-1f3fd-2642": {
-    "aliases": [":man_in_steamy_room_medium_skin_tone:"],
-    "code": "1f9d6-1f3fd-200d-2642-fe0f",
-    "name": ":man_in_steamy_room_tone3:"
-  },
-  "1f9d6-1f3fe": {
-    "aliases": [":person_in_steamy_room_medium_dark_skin_tone:"],
-    "code": "1f9d6-1f3fe",
-    "name": ":person_in_steamy_room_tone4:"
-  },
-  "1f9d6-1f3fe-2640": {
-    "aliases": [":woman_in_steamy_room_medium_dark_skin_tone:"],
-    "code": "1f9d6-1f3fe-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room_tone4:"
-  },
-  "1f9d6-1f3fe-2642": {
-    "aliases": [":man_in_steamy_room_medium_dark_skin_tone:"],
-    "code": "1f9d6-1f3fe-200d-2642-fe0f",
-    "name": ":man_in_steamy_room_tone4:"
-  },
-  "1f9d6-1f3ff": {
-    "aliases": [":person_in_steamy_room_dark_skin_tone:"],
-    "code": "1f9d6-1f3ff",
-    "name": ":person_in_steamy_room_tone5:"
-  },
-  "1f9d6-1f3ff-2640": {
-    "aliases": [":woman_in_steamy_room_dark_skin_tone:"],
-    "code": "1f9d6-1f3ff-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room_tone5:"
-  },
-  "1f9d6-1f3ff-2642": {
-    "aliases": [":man_in_steamy_room_dark_skin_tone:"],
-    "code": "1f9d6-1f3ff-200d-2642-fe0f",
-    "name": ":man_in_steamy_room_tone5:"
-  },
-  "1f9d6-2640": {
-    "aliases": [],
-    "code": "1f9d6-200d-2640-fe0f",
-    "name": ":woman_in_steamy_room:"
-  },
-  "1f9d6-2642": {
-    "aliases": [],
-    "code": "1f9d6-200d-2642-fe0f",
-    "name": ":man_in_steamy_room:"
-  },
-  "1f9d7": {
-    "aliases": [],
-    "code": "1f9d7",
-    "name": ":person_climbing:"
-  },
-  "1f9d7-1f3fb": {
-    "aliases": [":person_climbing_light_skin_tone:"],
-    "code": "1f9d7-1f3fb",
-    "name": ":person_climbing_tone1:"
-  },
-  "1f9d7-1f3fb-2640": {
-    "aliases": [":woman_climbing_light_skin_tone:"],
-    "code": "1f9d7-1f3fb-200d-2640-fe0f",
-    "name": ":woman_climbing_tone1:"
-  },
-  "1f9d7-1f3fb-2642": {
-    "aliases": [":man_climbing_light_skin_tone:"],
-    "code": "1f9d7-1f3fb-200d-2642-fe0f",
-    "name": ":man_climbing_tone1:"
-  },
-  "1f9d7-1f3fc": {
-    "aliases": [":person_climbing_medium_light_skin_tone:"],
-    "code": "1f9d7-1f3fc",
-    "name": ":person_climbing_tone2:"
-  },
-  "1f9d7-1f3fc-2640": {
-    "aliases": [":woman_climbing_medium_light_skin_tone:"],
-    "code": "1f9d7-1f3fc-200d-2640-fe0f",
-    "name": ":woman_climbing_tone2:"
-  },
-  "1f9d7-1f3fc-2642": {
-    "aliases": [":man_climbing_medium_light_skin_tone:"],
-    "code": "1f9d7-1f3fc-200d-2642-fe0f",
-    "name": ":man_climbing_tone2:"
-  },
-  "1f9d7-1f3fd": {
-    "aliases": [":person_climbing_medium_skin_tone:"],
-    "code": "1f9d7-1f3fd",
-    "name": ":person_climbing_tone3:"
-  },
-  "1f9d7-1f3fd-2640": {
-    "aliases": [":woman_climbing_medium_skin_tone:"],
-    "code": "1f9d7-1f3fd-200d-2640-fe0f",
-    "name": ":woman_climbing_tone3:"
-  },
-  "1f9d7-1f3fd-2642": {
-    "aliases": [":man_climbing_medium_skin_tone:"],
-    "code": "1f9d7-1f3fd-200d-2642-fe0f",
-    "name": ":man_climbing_tone3:"
-  },
-  "1f9d7-1f3fe": {
-    "aliases": [":person_climbing_medium_dark_skin_tone:"],
-    "code": "1f9d7-1f3fe",
-    "name": ":person_climbing_tone4:"
-  },
-  "1f9d7-1f3fe-2640": {
-    "aliases": [":woman_climbing_medium_dark_skin_tone:"],
-    "code": "1f9d7-1f3fe-200d-2640-fe0f",
-    "name": ":woman_climbing_tone4:"
-  },
-  "1f9d7-1f3fe-2642": {
-    "aliases": [":man_climbing_medium_dark_skin_tone:"],
-    "code": "1f9d7-1f3fe-200d-2642-fe0f",
-    "name": ":man_climbing_tone4:"
-  },
-  "1f9d7-1f3ff": {
-    "aliases": [":person_climbing_dark_skin_tone:"],
-    "code": "1f9d7-1f3ff",
-    "name": ":person_climbing_tone5:"
-  },
-  "1f9d7-1f3ff-2640": {
-    "aliases": [":woman_climbing_dark_skin_tone:"],
-    "code": "1f9d7-1f3ff-200d-2640-fe0f",
-    "name": ":woman_climbing_tone5:"
-  },
-  "1f9d7-1f3ff-2642": {
-    "aliases": [":man_climbing_dark_skin_tone:"],
-    "code": "1f9d7-1f3ff-200d-2642-fe0f",
-    "name": ":man_climbing_tone5:"
-  },
-  "1f9d7-2640": {
-    "aliases": [],
-    "code": "1f9d7-200d-2640-fe0f",
-    "name": ":woman_climbing:"
-  },
-  "1f9d7-2642": {
-    "aliases": [],
-    "code": "1f9d7-200d-2642-fe0f",
-    "name": ":man_climbing:"
-  },
-  "1f9d8": {
-    "aliases": [],
-    "code": "1f9d8",
-    "name": ":person_in_lotus_position:"
-  },
-  "1f9d8-1f3fb": {
-    "aliases": [":person_in_lotus_position_light_skin_tone:"],
-    "code": "1f9d8-1f3fb",
-    "name": ":person_in_lotus_position_tone1:"
-  },
-  "1f9d8-1f3fb-2640": {
-    "aliases": [":woman_in_lotus_position_light_skin_tone:"],
-    "code": "1f9d8-1f3fb-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position_tone1:"
-  },
-  "1f9d8-1f3fb-2642": {
-    "aliases": [":man_in_lotus_position_light_skin_tone:"],
-    "code": "1f9d8-1f3fb-200d-2642-fe0f",
-    "name": ":man_in_lotus_position_tone1:"
-  },
-  "1f9d8-1f3fc": {
-    "aliases": [":person_in_lotus_position_medium_light_skin_tone:"],
-    "code": "1f9d8-1f3fc",
-    "name": ":person_in_lotus_position_tone2:"
-  },
-  "1f9d8-1f3fc-2640": {
-    "aliases": [":woman_in_lotus_position_medium_light_skin_tone:"],
-    "code": "1f9d8-1f3fc-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position_tone2:"
-  },
-  "1f9d8-1f3fc-2642": {
-    "aliases": [":man_in_lotus_position_medium_light_skin_tone:"],
-    "code": "1f9d8-1f3fc-200d-2642-fe0f",
-    "name": ":man_in_lotus_position_tone2:"
-  },
-  "1f9d8-1f3fd": {
-    "aliases": [":person_in_lotus_position_medium_skin_tone:"],
-    "code": "1f9d8-1f3fd",
-    "name": ":person_in_lotus_position_tone3:"
-  },
-  "1f9d8-1f3fd-2640": {
-    "aliases": [":woman_in_lotus_position_medium_skin_tone:"],
-    "code": "1f9d8-1f3fd-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position_tone3:"
-  },
-  "1f9d8-1f3fd-2642": {
-    "aliases": [":man_in_lotus_position_medium_skin_tone:"],
-    "code": "1f9d8-1f3fd-200d-2642-fe0f",
-    "name": ":man_in_lotus_position_tone3:"
-  },
-  "1f9d8-1f3fe": {
-    "aliases": [":person_in_lotus_position_medium_dark_skin_tone:"],
-    "code": "1f9d8-1f3fe",
-    "name": ":person_in_lotus_position_tone4:"
-  },
-  "1f9d8-1f3fe-2640": {
-    "aliases": [":woman_in_lotus_position_medium_dark_skin_tone:"],
-    "code": "1f9d8-1f3fe-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position_tone4:"
-  },
-  "1f9d8-1f3fe-2642": {
-    "aliases": [":man_in_lotus_position_medium_dark_skin_tone:"],
-    "code": "1f9d8-1f3fe-200d-2642-fe0f",
-    "name": ":man_in_lotus_position_tone4:"
-  },
-  "1f9d8-1f3ff": {
-    "aliases": [":person_in_lotus_position_dark_skin_tone:"],
-    "code": "1f9d8-1f3ff",
-    "name": ":person_in_lotus_position_tone5:"
-  },
-  "1f9d8-1f3ff-2640": {
-    "aliases": [":woman_in_lotus_position_dark_skin_tone:"],
-    "code": "1f9d8-1f3ff-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position_tone5:"
-  },
-  "1f9d8-1f3ff-2642": {
-    "aliases": [":man_in_lotus_position_dark_skin_tone:"],
-    "code": "1f9d8-1f3ff-200d-2642-fe0f",
-    "name": ":man_in_lotus_position_tone5:"
-  },
-  "1f9d8-2640": {
-    "aliases": [],
-    "code": "1f9d8-200d-2640-fe0f",
-    "name": ":woman_in_lotus_position:"
-  },
-  "1f9d8-2642": {
-    "aliases": [],
-    "code": "1f9d8-200d-2642-fe0f",
-    "name": ":man_in_lotus_position:"
-  },
-  "1f9d9": {
-    "aliases": [],
-    "code": "1f9d9",
-    "name": ":mage:"
-  },
-  "1f9d9-1f3fb": {
-    "aliases": [":mage_light_skin_tone:"],
-    "code": "1f9d9-1f3fb",
-    "name": ":mage_tone1:"
-  },
-  "1f9d9-1f3fb-2640": {
-    "aliases": [":woman_mage_light_skin_tone:"],
-    "code": "1f9d9-1f3fb-200d-2640-fe0f",
-    "name": ":woman_mage_tone1:"
-  },
-  "1f9d9-1f3fb-2642": {
-    "aliases": [":man_mage_light_skin_tone:"],
-    "code": "1f9d9-1f3fb-200d-2642-fe0f",
-    "name": ":man_mage_tone1:"
-  },
-  "1f9d9-1f3fc": {
-    "aliases": [":mage_medium_light_skin_tone:"],
-    "code": "1f9d9-1f3fc",
-    "name": ":mage_tone2:"
-  },
-  "1f9d9-1f3fc-2640": {
-    "aliases": [":woman_mage_medium_light_skin_tone:"],
-    "code": "1f9d9-1f3fc-200d-2640-fe0f",
-    "name": ":woman_mage_tone2:"
-  },
-  "1f9d9-1f3fc-2642": {
-    "aliases": [":man_mage_medium_light_skin_tone:"],
-    "code": "1f9d9-1f3fc-200d-2642-fe0f",
-    "name": ":man_mage_tone2:"
-  },
-  "1f9d9-1f3fd": {
-    "aliases": [":mage_medium_skin_tone:"],
-    "code": "1f9d9-1f3fd",
-    "name": ":mage_tone3:"
-  },
-  "1f9d9-1f3fd-2640": {
-    "aliases": [":woman_mage_medium_skin_tone:"],
-    "code": "1f9d9-1f3fd-200d-2640-fe0f",
-    "name": ":woman_mage_tone3:"
-  },
-  "1f9d9-1f3fd-2642": {
-    "aliases": [":man_mage_medium_skin_tone:"],
-    "code": "1f9d9-1f3fd-200d-2642-fe0f",
-    "name": ":man_mage_tone3:"
-  },
-  "1f9d9-1f3fe": {
-    "aliases": [":mage_medium_dark_skin_tone:"],
-    "code": "1f9d9-1f3fe",
-    "name": ":mage_tone4:"
-  },
-  "1f9d9-1f3fe-2640": {
-    "aliases": [":woman_mage_medium_dark_skin_tone:"],
-    "code": "1f9d9-1f3fe-200d-2640-fe0f",
-    "name": ":woman_mage_tone4:"
-  },
-  "1f9d9-1f3fe-2642": {
-    "aliases": [":man_mage_medium_dark_skin_tone:"],
-    "code": "1f9d9-1f3fe-200d-2642-fe0f",
-    "name": ":man_mage_tone4:"
-  },
-  "1f9d9-1f3ff": {
-    "aliases": [":mage_dark_skin_tone:"],
-    "code": "1f9d9-1f3ff",
-    "name": ":mage_tone5:"
-  },
-  "1f9d9-1f3ff-2640": {
-    "aliases": [":woman_mage_dark_skin_tone:"],
-    "code": "1f9d9-1f3ff-200d-2640-fe0f",
-    "name": ":woman_mage_tone5:"
-  },
-  "1f9d9-1f3ff-2642": {
-    "aliases": [":man_mage_dark_skin_tone:"],
-    "code": "1f9d9-1f3ff-200d-2642-fe0f",
-    "name": ":man_mage_tone5:"
-  },
-  "1f9d9-2640": {
-    "aliases": [],
-    "code": "1f9d9-200d-2640-fe0f",
-    "name": ":woman_mage:"
-  },
-  "1f9d9-2642": {
-    "aliases": [],
-    "code": "1f9d9-200d-2642-fe0f",
-    "name": ":man_mage:"
-  },
-  "1f9da": {
-    "aliases": [],
-    "code": "1f9da",
-    "name": ":fairy:"
-  },
-  "1f9da-1f3fb": {
-    "aliases": [":fairy_light_skin_tone:"],
-    "code": "1f9da-1f3fb",
-    "name": ":fairy_tone1:"
-  },
-  "1f9da-1f3fb-2640": {
-    "aliases": [":woman_fairy_light_skin_tone:"],
-    "code": "1f9da-1f3fb-200d-2640-fe0f",
-    "name": ":woman_fairy_tone1:"
-  },
-  "1f9da-1f3fb-2642": {
-    "aliases": [":man_fairy_light_skin_tone:"],
-    "code": "1f9da-1f3fb-200d-2642-fe0f",
-    "name": ":man_fairy_tone1:"
-  },
-  "1f9da-1f3fc": {
-    "aliases": [":fairy_medium_light_skin_tone:"],
-    "code": "1f9da-1f3fc",
-    "name": ":fairy_tone2:"
-  },
-  "1f9da-1f3fc-2640": {
-    "aliases": [":woman_fairy_medium_light_skin_tone:"],
-    "code": "1f9da-1f3fc-200d-2640-fe0f",
-    "name": ":woman_fairy_tone2:"
-  },
-  "1f9da-1f3fc-2642": {
-    "aliases": [":man_fairy_medium_light_skin_tone:"],
-    "code": "1f9da-1f3fc-200d-2642-fe0f",
-    "name": ":man_fairy_tone2:"
-  },
-  "1f9da-1f3fd": {
-    "aliases": [":fairy_medium_skin_tone:"],
-    "code": "1f9da-1f3fd",
-    "name": ":fairy_tone3:"
-  },
-  "1f9da-1f3fd-2640": {
-    "aliases": [":woman_fairy_medium_skin_tone:"],
-    "code": "1f9da-1f3fd-200d-2640-fe0f",
-    "name": ":woman_fairy_tone3:"
-  },
-  "1f9da-1f3fd-2642": {
-    "aliases": [":man_fairy_medium_skin_tone:"],
-    "code": "1f9da-1f3fd-200d-2642-fe0f",
-    "name": ":man_fairy_tone3:"
-  },
-  "1f9da-1f3fe": {
-    "aliases": [":fairy_medium_dark_skin_tone:"],
-    "code": "1f9da-1f3fe",
-    "name": ":fairy_tone4:"
-  },
-  "1f9da-1f3fe-2640": {
-    "aliases": [":woman_fairy_medium_dark_skin_tone:"],
-    "code": "1f9da-1f3fe-200d-2640-fe0f",
-    "name": ":woman_fairy_tone4:"
-  },
-  "1f9da-1f3fe-2642": {
-    "aliases": [":man_fairy_medium_dark_skin_tone:"],
-    "code": "1f9da-1f3fe-200d-2642-fe0f",
-    "name": ":man_fairy_tone4:"
-  },
-  "1f9da-1f3ff": {
-    "aliases": [":fairy_dark_skin_tone:"],
-    "code": "1f9da-1f3ff",
-    "name": ":fairy_tone5:"
-  },
-  "1f9da-1f3ff-2640": {
-    "aliases": [":woman_fairy_dark_skin_tone:"],
-    "code": "1f9da-1f3ff-200d-2640-fe0f",
-    "name": ":woman_fairy_tone5:"
-  },
-  "1f9da-1f3ff-2642": {
-    "aliases": [":man_fairy_dark_skin_tone:"],
-    "code": "1f9da-1f3ff-200d-2642-fe0f",
-    "name": ":man_fairy_tone5:"
-  },
-  "1f9da-2640": {
-    "aliases": [],
-    "code": "1f9da-200d-2640-fe0f",
-    "name": ":woman_fairy:"
-  },
-  "1f9da-2642": {
-    "aliases": [],
-    "code": "1f9da-200d-2642-fe0f",
-    "name": ":man_fairy:"
-  },
-  "1f9db": {
-    "aliases": [],
-    "code": "1f9db",
-    "name": ":vampire:"
-  },
-  "1f9db-1f3fb": {
-    "aliases": [":vampire_light_skin_tone:"],
-    "code": "1f9db-1f3fb",
-    "name": ":vampire_tone1:"
-  },
-  "1f9db-1f3fb-2640": {
-    "aliases": [":woman_vampire_light_skin_tone:"],
-    "code": "1f9db-1f3fb-200d-2640-fe0f",
-    "name": ":woman_vampire_tone1:"
-  },
-  "1f9db-1f3fb-2642": {
-    "aliases": [":man_vampire_light_skin_tone:"],
-    "code": "1f9db-1f3fb-200d-2642-fe0f",
-    "name": ":man_vampire_tone1:"
-  },
-  "1f9db-1f3fc": {
-    "aliases": [":vampire_medium_light_skin_tone:"],
-    "code": "1f9db-1f3fc",
-    "name": ":vampire_tone2:"
-  },
-  "1f9db-1f3fc-2640": {
-    "aliases": [":woman_vampire_medium_light_skin_tone:"],
-    "code": "1f9db-1f3fc-200d-2640-fe0f",
-    "name": ":woman_vampire_tone2:"
-  },
-  "1f9db-1f3fc-2642": {
-    "aliases": [":man_vampire_medium_light_skin_tone:"],
-    "code": "1f9db-1f3fc-200d-2642-fe0f",
-    "name": ":man_vampire_tone2:"
-  },
-  "1f9db-1f3fd": {
-    "aliases": [":vampire_medium_skin_tone:"],
-    "code": "1f9db-1f3fd",
-    "name": ":vampire_tone3:"
-  },
-  "1f9db-1f3fd-2640": {
-    "aliases": [":woman_vampire_medium_skin_tone:"],
-    "code": "1f9db-1f3fd-200d-2640-fe0f",
-    "name": ":woman_vampire_tone3:"
-  },
-  "1f9db-1f3fd-2642": {
-    "aliases": [":man_vampire_medium_skin_tone:"],
-    "code": "1f9db-1f3fd-200d-2642-fe0f",
-    "name": ":man_vampire_tone3:"
-  },
-  "1f9db-1f3fe": {
-    "aliases": [":vampire_medium_dark_skin_tone:"],
-    "code": "1f9db-1f3fe",
-    "name": ":vampire_tone4:"
-  },
-  "1f9db-1f3fe-2640": {
-    "aliases": [":woman_vampire_medium_dark_skin_tone:"],
-    "code": "1f9db-1f3fe-200d-2640-fe0f",
-    "name": ":woman_vampire_tone4:"
-  },
-  "1f9db-1f3fe-2642": {
-    "aliases": [":man_vampire_medium_dark_skin_tone:"],
-    "code": "1f9db-1f3fe-200d-2642-fe0f",
-    "name": ":man_vampire_tone4:"
-  },
-  "1f9db-1f3ff": {
-    "aliases": [":vampire_dark_skin_tone:"],
-    "code": "1f9db-1f3ff",
-    "name": ":vampire_tone5:"
-  },
-  "1f9db-1f3ff-2640": {
-    "aliases": [":woman_vampire_dark_skin_tone:"],
-    "code": "1f9db-1f3ff-200d-2640-fe0f",
-    "name": ":woman_vampire_tone5:"
-  },
-  "1f9db-1f3ff-2642": {
-    "aliases": [":man_vampire_dark_skin_tone:"],
-    "code": "1f9db-1f3ff-200d-2642-fe0f",
-    "name": ":man_vampire_tone5:"
-  },
-  "1f9db-2640": {
-    "aliases": [],
-    "code": "1f9db-200d-2640-fe0f",
-    "name": ":woman_vampire:"
-  },
-  "1f9db-2642": {
-    "aliases": [],
-    "code": "1f9db-200d-2642-fe0f",
-    "name": ":man_vampire:"
-  },
-  "1f9dc": {
-    "aliases": [],
-    "code": "1f9dc",
-    "name": ":merperson:"
-  },
-  "1f9dc-1f3fb": {
-    "aliases": [":merperson_light_skin_tone:"],
-    "code": "1f9dc-1f3fb",
-    "name": ":merperson_tone1:"
-  },
-  "1f9dc-1f3fb-2640": {
-    "aliases": [":mermaid_light_skin_tone:"],
-    "code": "1f9dc-1f3fb-200d-2640-fe0f",
-    "name": ":mermaid_tone1:"
-  },
-  "1f9dc-1f3fb-2642": {
-    "aliases": [":merman_light_skin_tone:"],
-    "code": "1f9dc-1f3fb-200d-2642-fe0f",
-    "name": ":merman_tone1:"
-  },
-  "1f9dc-1f3fc": {
-    "aliases": [":merperson_medium_light_skin_tone:"],
-    "code": "1f9dc-1f3fc",
-    "name": ":merperson_tone2:"
-  },
-  "1f9dc-1f3fc-2640": {
-    "aliases": [":mermaid_medium_light_skin_tone:"],
-    "code": "1f9dc-1f3fc-200d-2640-fe0f",
-    "name": ":mermaid_tone2:"
-  },
-  "1f9dc-1f3fc-2642": {
-    "aliases": [":merman_medium_light_skin_tone:"],
-    "code": "1f9dc-1f3fc-200d-2642-fe0f",
-    "name": ":merman_tone2:"
-  },
-  "1f9dc-1f3fd": {
-    "aliases": [":merperson_medium_skin_tone:"],
-    "code": "1f9dc-1f3fd",
-    "name": ":merperson_tone3:"
-  },
-  "1f9dc-1f3fd-2640": {
-    "aliases": [":mermaid_medium_skin_tone:"],
-    "code": "1f9dc-1f3fd-200d-2640-fe0f",
-    "name": ":mermaid_tone3:"
-  },
-  "1f9dc-1f3fd-2642": {
-    "aliases": [":merman_medium_skin_tone:"],
-    "code": "1f9dc-1f3fd-200d-2642-fe0f",
-    "name": ":merman_tone3:"
-  },
-  "1f9dc-1f3fe": {
-    "aliases": [":merperson_medium_dark_skin_tone:"],
-    "code": "1f9dc-1f3fe",
-    "name": ":merperson_tone4:"
-  },
-  "1f9dc-1f3fe-2640": {
-    "aliases": [":mermaid_medium_dark_skin_tone:"],
-    "code": "1f9dc-1f3fe-200d-2640-fe0f",
-    "name": ":mermaid_tone4:"
-  },
-  "1f9dc-1f3fe-2642": {
-    "aliases": [":merman_medium_dark_skin_tone:"],
-    "code": "1f9dc-1f3fe-200d-2642-fe0f",
-    "name": ":merman_tone4:"
-  },
-  "1f9dc-1f3ff": {
-    "aliases": [":merperson_dark_skin_tone:"],
-    "code": "1f9dc-1f3ff",
-    "name": ":merperson_tone5:"
-  },
-  "1f9dc-1f3ff-2640": {
-    "aliases": [":mermaid_dark_skin_tone:"],
-    "code": "1f9dc-1f3ff-200d-2640-fe0f",
-    "name": ":mermaid_tone5:"
-  },
-  "1f9dc-1f3ff-2642": {
-    "aliases": [":merman_dark_skin_tone:"],
-    "code": "1f9dc-1f3ff-200d-2642-fe0f",
-    "name": ":merman_tone5:"
-  },
-  "1f9dc-2640": {
-    "aliases": [],
-    "code": "1f9dc-200d-2640-fe0f",
-    "name": ":mermaid:"
-  },
-  "1f9dc-2642": {
-    "aliases": [],
-    "code": "1f9dc-200d-2642-fe0f",
-    "name": ":merman:"
-  },
-  "1f9dd": {
-    "aliases": [],
-    "code": "1f9dd",
-    "name": ":elf:"
-  },
-  "1f9dd-1f3fb": {
-    "aliases": [":elf_light_skin_tone:"],
-    "code": "1f9dd-1f3fb",
-    "name": ":elf_tone1:"
-  },
-  "1f9dd-1f3fb-2640": {
-    "aliases": [":woman_elf_light_skin_tone:"],
-    "code": "1f9dd-1f3fb-200d-2640-fe0f",
-    "name": ":woman_elf_tone1:"
-  },
-  "1f9dd-1f3fb-2642": {
-    "aliases": [":man_elf_light_skin_tone:"],
-    "code": "1f9dd-1f3fb-200d-2642-fe0f",
-    "name": ":man_elf_tone1:"
-  },
-  "1f9dd-1f3fc": {
-    "aliases": [":elf_medium_light_skin_tone:"],
-    "code": "1f9dd-1f3fc",
-    "name": ":elf_tone2:"
-  },
-  "1f9dd-1f3fc-2640": {
-    "aliases": [":woman_elf_medium_light_skin_tone:"],
-    "code": "1f9dd-1f3fc-200d-2640-fe0f",
-    "name": ":woman_elf_tone2:"
-  },
-  "1f9dd-1f3fc-2642": {
-    "aliases": [":man_elf_medium_light_skin_tone:"],
-    "code": "1f9dd-1f3fc-200d-2642-fe0f",
-    "name": ":man_elf_tone2:"
-  },
-  "1f9dd-1f3fd": {
-    "aliases": [":elf_medium_skin_tone:"],
-    "code": "1f9dd-1f3fd",
-    "name": ":elf_tone3:"
-  },
-  "1f9dd-1f3fd-2640": {
-    "aliases": [":woman_elf_medium_skin_tone:"],
-    "code": "1f9dd-1f3fd-200d-2640-fe0f",
-    "name": ":woman_elf_tone3:"
-  },
-  "1f9dd-1f3fd-2642": {
-    "aliases": [":man_elf_medium_skin_tone:"],
-    "code": "1f9dd-1f3fd-200d-2642-fe0f",
-    "name": ":man_elf_tone3:"
-  },
-  "1f9dd-1f3fe": {
-    "aliases": [":elf_medium_dark_skin_tone:"],
-    "code": "1f9dd-1f3fe",
-    "name": ":elf_tone4:"
-  },
-  "1f9dd-1f3fe-2640": {
-    "aliases": [":woman_elf_medium_dark_skin_tone:"],
-    "code": "1f9dd-1f3fe-200d-2640-fe0f",
-    "name": ":woman_elf_tone4:"
-  },
-  "1f9dd-1f3fe-2642": {
-    "aliases": [":man_elf_medium_dark_skin_tone:"],
-    "code": "1f9dd-1f3fe-200d-2642-fe0f",
-    "name": ":man_elf_tone4:"
-  },
-  "1f9dd-1f3ff": {
-    "aliases": [":elf_dark_skin_tone:"],
-    "code": "1f9dd-1f3ff",
-    "name": ":elf_tone5:"
-  },
-  "1f9dd-1f3ff-2640": {
-    "aliases": [":woman_elf_dark_skin_tone:"],
-    "code": "1f9dd-1f3ff-200d-2640-fe0f",
-    "name": ":woman_elf_tone5:"
-  },
-  "1f9dd-1f3ff-2642": {
-    "aliases": [":man_elf_dark_skin_tone:"],
-    "code": "1f9dd-1f3ff-200d-2642-fe0f",
-    "name": ":man_elf_tone5:"
-  },
-  "1f9dd-2640": {
-    "aliases": [],
-    "code": "1f9dd-200d-2640-fe0f",
-    "name": ":woman_elf:"
-  },
-  "1f9dd-2642": {
-    "aliases": [],
-    "code": "1f9dd-200d-2642-fe0f",
-    "name": ":man_elf:"
-  },
-  "1f9de": {
-    "aliases": [],
-    "code": "1f9de",
-    "name": ":genie:"
-  },
-  "1f9de-2640": {
-    "aliases": [],
-    "code": "1f9de-200d-2640-fe0f",
-    "name": ":woman_genie:"
-  },
-  "1f9de-2642": {
-    "aliases": [],
-    "code": "1f9de-200d-2642-fe0f",
-    "name": ":man_genie:"
-  },
-  "1f9df": {
-    "aliases": [],
-    "code": "1f9df",
-    "name": ":zombie:"
-  },
-  "1f9df-2640": {
-    "aliases": [],
-    "code": "1f9df-200d-2640-fe0f",
-    "name": ":woman_zombie:"
-  },
-  "1f9df-2642": {
-    "aliases": [],
-    "code": "1f9df-200d-2642-fe0f",
-    "name": ":man_zombie:"
-  },
-  "1f9e0": {
-    "aliases": [],
-    "code": "1f9e0",
-    "name": ":brain:"
-  },
-  "1f9e1": {
-    "aliases": [],
-    "code": "1f9e1",
-    "name": ":orange_heart:"
-  },
-  "1f9e2": {
-    "aliases": [],
-    "code": "1f9e2",
-    "name": ":billed_cap:"
-  },
-  "1f9e3": {
-    "aliases": [],
-    "code": "1f9e3",
-    "name": ":scarf:"
-  },
-  "1f9e4": {
-    "aliases": [],
-    "code": "1f9e4",
-    "name": ":gloves:"
-  },
-  "1f9e5": {
-    "aliases": [],
-    "code": "1f9e5",
-    "name": ":coat:"
-  },
-  "1f9e6": {
-    "aliases": [],
-    "code": "1f9e6",
-    "name": ":socks:"
-  },
-  "1f9e7": {
-    "aliases": [],
-    "code": "1f9e7",
-    "name": ":red_envelope:"
-  },
-  "1f9e8": {
-    "aliases": [],
-    "code": "1f9e8",
-    "name": ":firecracker:"
-  },
-  "1f9e9": {
-    "aliases": [],
-    "code": "1f9e9",
-    "name": ":jigsaw:"
-  },
-  "1f9ea": {
-    "aliases": [],
-    "code": "1f9ea",
-    "name": ":test_tube:"
-  },
-  "1f9eb": {
-    "aliases": [],
-    "code": "1f9eb",
-    "name": ":petri_dish:"
-  },
-  "1f9ec": {
-    "aliases": [],
-    "code": "1f9ec",
-    "name": ":dna:"
-  },
-  "1f9ed": {
-    "aliases": [],
-    "code": "1f9ed",
-    "name": ":compass:"
-  },
-  "1f9ee": {
-    "aliases": [],
-    "code": "1f9ee",
-    "name": ":abacus:"
-  },
-  "1f9ef": {
-    "aliases": [],
-    "code": "1f9ef",
-    "name": ":fire_extinguisher:"
-  },
-  "1f9f0": {
-    "aliases": [],
-    "code": "1f9f0",
-    "name": ":toolbox:"
-  },
-  "1f9f1": {
-    "aliases": [],
-    "code": "1f9f1",
-    "name": ":bricks:"
-  },
-  "1f9f2": {
-    "aliases": [],
-    "code": "1f9f2",
-    "name": ":magnet:"
-  },
-  "1f9f3": {
-    "aliases": [],
-    "code": "1f9f3",
-    "name": ":luggage:"
-  },
-  "1f9f4": {
-    "aliases": [],
-    "code": "1f9f4",
-    "name": ":squeeze_bottle:"
-  },
-  "1f9f5": {
-    "aliases": [],
-    "code": "1f9f5",
-    "name": ":thread:"
-  },
-  "1f9f6": {
-    "aliases": [],
-    "code": "1f9f6",
-    "name": ":yarn:"
-  },
-  "1f9f7": {
-    "aliases": [],
-    "code": "1f9f7",
-    "name": ":safety_pin:"
-  },
-  "1f9f8": {
-    "aliases": [],
-    "code": "1f9f8",
-    "name": ":teddy_bear:"
-  },
-  "1f9f9": {
-    "aliases": [],
-    "code": "1f9f9",
-    "name": ":broom:"
-  },
-  "1f9fa": {
-    "aliases": [],
-    "code": "1f9fa",
-    "name": ":basket:"
-  },
-  "1f9fb": {
-    "aliases": [],
-    "code": "1f9fb",
-    "name": ":roll_of_paper:"
-  },
-  "1f9fc": {
-    "aliases": [],
-    "code": "1f9fc",
-    "name": ":soap:"
-  },
-  "1f9fd": {
-    "aliases": [],
-    "code": "1f9fd",
-    "name": ":sponge:"
-  },
-  "1f9fe": {
-    "aliases": [],
-    "code": "1f9fe",
-    "name": ":receipt:"
-  },
-  "1f9ff": {
-    "aliases": [],
-    "code": "1f9ff",
-    "name": ":nazar_amulet:"
-  },
-  "1fa70": {
-    "aliases": [],
-    "code": "1fa70",
-    "name": ":ballet_shoes:"
-  },
-  "1fa71": {
-    "aliases": [],
-    "code": "1fa71",
-    "name": ":one_piece_swimsuit:"
-  },
-  "1fa72": {
-    "aliases": [],
-    "code": "1fa72",
-    "name": ":briefs:"
-  },
-  "1fa73": {
-    "aliases": [],
-    "code": "1fa73",
-    "name": ":shorts:"
-  },
-  "1fa78": {
-    "aliases": [],
-    "code": "1fa78",
-    "name": ":drop_of_blood:"
-  },
-  "1fa79": {
-    "aliases": [],
-    "code": "1fa79",
-    "name": ":adhesive_bandage:"
-  },
-  "1fa7a": {
-    "aliases": [],
-    "code": "1fa7a",
-    "name": ":stethoscope:"
-  },
-  "1fa80": {
-    "aliases": [],
-    "code": "1fa80",
-    "name": ":yo_yo:"
-  },
-  "1fa81": {
-    "aliases": [],
-    "code": "1fa81",
-    "name": ":kite:"
-  },
-  "1fa82": {
-    "aliases": [],
-    "code": "1fa82",
-    "name": ":parachute:"
-  },
-  "1fa90": {
-    "aliases": [],
-    "code": "1fa90",
-    "name": ":ringed_planet:"
-  },
-  "1fa91": {
-    "aliases": [],
-    "code": "1fa91",
-    "name": ":chair:"
-  },
-  "1fa92": {
-    "aliases": [],
-    "code": "1fa92",
-    "name": ":razor:"
-  },
-  "1fa93": {
-    "aliases": [],
-    "code": "1fa93",
-    "name": ":axe:"
-  },
-  "1fa94": {
-    "aliases": [],
-    "code": "1fa94",
-    "name": ":diya_lamp:"
-  },
-  "1fa95": {
-    "aliases": [],
-    "code": "1fa95",
-    "name": ":banjo:"
-  },
-  "203c": {
-    "aliases": [],
-    "code": "203c-fe0f",
-    "name": ":bangbang:"
-  },
-  "2049": {
-    "aliases": [],
-    "code": "2049-fe0f",
-    "name": ":interrobang:"
-  },
-  "2122": {
-    "aliases": [],
-    "code": "2122-fe0f",
-    "name": ":tm:"
-  },
-  "2139": {
-    "aliases": [],
-    "code": "2139-fe0f",
-    "name": ":information_source:"
-  },
-  "2194": {
-    "aliases": [],
-    "code": "2194-fe0f",
-    "name": ":left_right_arrow:"
-  },
-  "2195": {
-    "aliases": [],
-    "code": "2195-fe0f",
-    "name": ":arrow_up_down:"
-  },
-  "2196": {
-    "aliases": [],
-    "code": "2196-fe0f",
-    "name": ":arrow_upper_left:"
-  },
-  "2197": {
-    "aliases": [],
-    "code": "2197-fe0f",
-    "name": ":arrow_upper_right:"
-  },
-  "2198": {
-    "aliases": [],
-    "code": "2198-fe0f",
-    "name": ":arrow_lower_right:"
-  },
-  "2199": {
-    "aliases": [],
-    "code": "2199-fe0f",
-    "name": ":arrow_lower_left:"
-  },
-  "21a9": {
-    "aliases": [],
-    "code": "21a9-fe0f",
-    "name": ":leftwards_arrow_with_hook:"
-  },
-  "21aa": {
-    "aliases": [],
-    "code": "21aa-fe0f",
-    "name": ":arrow_right_hook:"
-  },
-  "231a": {
-    "aliases": [],
-    "code": "231a",
-    "name": ":watch:"
-  },
-  "231b": {
-    "aliases": [],
-    "code": "231b",
-    "name": ":hourglass:"
-  },
-  "2328": {
-    "aliases": [],
-    "code": "2328-fe0f",
-    "name": ":keyboard:"
-  },
-  "23cf": {
-    "aliases": [":eject_symbol:"],
-    "code": "23cf-fe0f",
-    "name": ":eject:"
-  },
-  "23e9": {
-    "aliases": [],
-    "code": "23e9",
-    "name": ":fast_forward:"
-  },
-  "23ea": {
-    "aliases": [],
-    "code": "23ea",
-    "name": ":rewind:"
-  },
-  "23eb": {
-    "aliases": [],
-    "code": "23eb",
-    "name": ":arrow_double_up:"
-  },
-  "23ec": {
-    "aliases": [],
-    "code": "23ec",
-    "name": ":arrow_double_down:"
-  },
-  "23ed": {
-    "aliases": [":next_track:"],
-    "code": "23ed-fe0f",
-    "name": ":track_next:"
-  },
-  "23ee": {
-    "aliases": [":previous_track:"],
-    "code": "23ee-fe0f",
-    "name": ":track_previous:"
-  },
-  "23ef": {
-    "aliases": [],
-    "code": "23ef-fe0f",
-    "name": ":play_pause:"
-  },
-  "23f0": {
-    "aliases": [],
-    "code": "23f0",
-    "name": ":alarm_clock:"
-  },
-  "23f1": {
-    "aliases": [],
-    "code": "23f1-fe0f",
-    "name": ":stopwatch:"
-  },
-  "23f2": {
-    "aliases": [":timer_clock:"],
-    "code": "23f2-fe0f",
-    "name": ":timer:"
-  },
-  "23f3": {
-    "aliases": [],
-    "code": "23f3",
-    "name": ":hourglass_flowing_sand:"
-  },
-  "23f8": {
-    "aliases": [":double_vertical_bar:"],
-    "code": "23f8-fe0f",
-    "name": ":pause_button:"
-  },
-  "23f9": {
-    "aliases": [],
-    "code": "23f9-fe0f",
-    "name": ":stop_button:"
-  },
-  "23fa": {
-    "aliases": [],
-    "code": "23fa-fe0f",
-    "name": ":record_button:"
-  },
-  "24c2": {
-    "aliases": [],
-    "code": "24c2-fe0f",
-    "name": ":m:"
-  },
-  "25aa": {
-    "aliases": [],
-    "code": "25aa-fe0f",
-    "name": ":black_small_square:"
-  },
-  "25ab": {
-    "aliases": [],
-    "code": "25ab-fe0f",
-    "name": ":white_small_square:"
-  },
-  "25b6": {
-    "aliases": [],
-    "code": "25b6-fe0f",
-    "name": ":arrow_forward:"
-  },
-  "25c0": {
-    "aliases": [],
-    "code": "25c0-fe0f",
-    "name": ":arrow_backward:"
-  },
-  "25fb": {
-    "aliases": [],
-    "code": "25fb-fe0f",
-    "name": ":white_medium_square:"
-  },
-  "25fc": {
-    "aliases": [],
-    "code": "25fc-fe0f",
-    "name": ":black_medium_square:"
-  },
-  "25fd": {
-    "aliases": [],
-    "code": "25fd",
-    "name": ":white_medium_small_square:"
-  },
-  "25fe": {
-    "aliases": [],
-    "code": "25fe",
-    "name": ":black_medium_small_square:"
-  },
-  "2600": {
-    "aliases": [],
-    "code": "2600-fe0f",
-    "name": ":sunny:"
-  },
-  "2601": {
-    "aliases": [],
-    "code": "2601-fe0f",
-    "name": ":cloud:"
-  },
-  "2602": {
-    "aliases": [],
-    "code": "2602-fe0f",
-    "name": ":umbrella2:"
-  },
-  "2603": {
-    "aliases": [],
-    "code": "2603-fe0f",
-    "name": ":snowman2:"
-  },
-  "2604": {
-    "aliases": [],
-    "code": "2604-fe0f",
-    "name": ":comet:"
-  },
-  "260e": {
-    "aliases": [],
-    "code": "260e-fe0f",
-    "name": ":telephone:"
-  },
-  "2611": {
-    "aliases": [],
-    "code": "2611-fe0f",
-    "name": ":ballot_box_with_check:"
-  },
-  "2614": {
-    "aliases": [],
-    "code": "2614",
-    "name": ":umbrella:"
-  },
-  "2615": {
-    "aliases": [],
-    "code": "2615",
-    "name": ":coffee:"
-  },
-  "2618": {
-    "aliases": [],
-    "code": "2618-fe0f",
-    "name": ":shamrock:"
-  },
-  "261d": {
-    "aliases": [],
-    "code": "261d-fe0f",
-    "name": ":point_up:"
-  },
-  "261d-1f3fb": {
-    "aliases": [],
-    "code": "261d-1f3fb",
-    "name": ":point_up_tone1:"
-  },
-  "261d-1f3fc": {
-    "aliases": [],
-    "code": "261d-1f3fc",
-    "name": ":point_up_tone2:"
-  },
-  "261d-1f3fd": {
-    "aliases": [],
-    "code": "261d-1f3fd",
-    "name": ":point_up_tone3:"
-  },
-  "261d-1f3fe": {
-    "aliases": [],
-    "code": "261d-1f3fe",
-    "name": ":point_up_tone4:"
-  },
-  "261d-1f3ff": {
-    "aliases": [],
-    "code": "261d-1f3ff",
-    "name": ":point_up_tone5:"
-  },
-  "2620": {
-    "aliases": [":skull_and_crossbones:"],
-    "code": "2620-fe0f",
-    "name": ":skull_crossbones:"
-  },
-  "2622": {
-    "aliases": [":radioactive_sign:"],
-    "code": "2622-fe0f",
-    "name": ":radioactive:"
-  },
-  "2623": {
-    "aliases": [":biohazard_sign:"],
-    "code": "2623-fe0f",
-    "name": ":biohazard:"
-  },
-  "2626": {
-    "aliases": [],
-    "code": "2626-fe0f",
-    "name": ":orthodox_cross:"
-  },
-  "262a": {
-    "aliases": [],
-    "code": "262a-fe0f",
-    "name": ":star_and_crescent:"
-  },
-  "262e": {
-    "aliases": [":peace_symbol:"],
-    "code": "262e-fe0f",
-    "name": ":peace:"
-  },
-  "262f": {
-    "aliases": [],
-    "code": "262f-fe0f",
-    "name": ":yin_yang:"
-  },
-  "2638": {
-    "aliases": [],
-    "code": "2638-fe0f",
-    "name": ":wheel_of_dharma:"
-  },
-  "2639": {
-    "aliases": [":white_frowning_face:"],
-    "code": "2639-fe0f",
-    "name": ":frowning2:"
-  },
-  "263a": {
-    "aliases": [],
-    "code": "263a-fe0f",
-    "name": ":relaxed:"
-  },
-  "2640": {
-    "aliases": [],
-    "code": "2640-fe0f",
-    "name": ":female_sign:"
-  },
-  "2642": {
-    "aliases": [],
-    "code": "2642-fe0f",
-    "name": ":male_sign:"
-  },
-  "2648": {
-    "aliases": [],
-    "code": "2648",
-    "name": ":aries:"
-  },
-  "2649": {
-    "aliases": [],
-    "code": "2649",
-    "name": ":taurus:"
-  },
-  "264a": {
-    "aliases": [],
-    "code": "264a",
-    "name": ":gemini:"
-  },
-  "264b": {
-    "aliases": [],
-    "code": "264b",
-    "name": ":cancer:"
-  },
-  "264c": {
-    "aliases": [],
-    "code": "264c",
-    "name": ":leo:"
-  },
-  "264d": {
-    "aliases": [],
-    "code": "264d",
-    "name": ":virgo:"
-  },
-  "264e": {
-    "aliases": [],
-    "code": "264e",
-    "name": ":libra:"
-  },
-  "264f": {
-    "aliases": [],
-    "code": "264f",
-    "name": ":scorpius:"
-  },
-  "2650": {
-    "aliases": [],
-    "code": "2650",
-    "name": ":sagittarius:"
-  },
-  "2651": {
-    "aliases": [],
-    "code": "2651",
-    "name": ":capricorn:"
-  },
-  "2652": {
-    "aliases": [],
-    "code": "2652",
-    "name": ":aquarius:"
-  },
-  "2653": {
-    "aliases": [],
-    "code": "2653",
-    "name": ":pisces:"
-  },
-  "265f": {
-    "aliases": [],
-    "code": "265f-fe0f",
-    "name": ":chess_pawn:"
-  },
-  "2660": {
-    "aliases": [],
-    "code": "2660-fe0f",
-    "name": ":spades:"
-  },
-  "2663": {
-    "aliases": [],
-    "code": "2663-fe0f",
-    "name": ":clubs:"
-  },
-  "2665": {
-    "aliases": [],
-    "code": "2665-fe0f",
-    "name": ":hearts:"
-  },
-  "2666": {
-    "aliases": [],
-    "code": "2666-fe0f",
-    "name": ":diamonds:"
-  },
-  "2668": {
-    "aliases": [],
-    "code": "2668-fe0f",
-    "name": ":hotsprings:"
-  },
-  "267b": {
-    "aliases": [],
-    "code": "267b-fe0f",
-    "name": ":recycle:"
-  },
-  "267e": {
-    "aliases": [],
-    "code": "267e-fe0f",
-    "name": ":infinity:"
-  },
-  "267f": {
-    "aliases": [],
-    "code": "267f",
-    "name": ":wheelchair:"
-  },
-  "2692": {
-    "aliases": [":hammer_and_pick:"],
-    "code": "2692-fe0f",
-    "name": ":hammer_pick:"
-  },
-  "2693": {
-    "aliases": [],
-    "code": "2693",
-    "name": ":anchor:"
-  },
-  "2694": {
-    "aliases": [],
-    "code": "2694-fe0f",
-    "name": ":crossed_swords:"
-  },
-  "2695": {
-    "aliases": [],
-    "code": "2695-fe0f",
-    "name": ":medical_symbol:"
-  },
-  "2696": {
-    "aliases": [],
-    "code": "2696-fe0f",
-    "name": ":scales:"
-  },
-  "2697": {
-    "aliases": [],
-    "code": "2697-fe0f",
-    "name": ":alembic:"
-  },
-  "2699": {
-    "aliases": [],
-    "code": "2699-fe0f",
-    "name": ":gear:"
-  },
-  "269b": {
-    "aliases": [":atom_symbol:"],
-    "code": "269b-fe0f",
-    "name": ":atom:"
-  },
-  "269c": {
-    "aliases": [],
-    "code": "269c-fe0f",
-    "name": ":fleur-de-lis:"
-  },
-  "26a0": {
-    "aliases": [],
-    "code": "26a0-fe0f",
-    "name": ":warning:"
-  },
-  "26a1": {
-    "aliases": [],
-    "code": "26a1",
-    "name": ":zap:"
-  },
-  "26aa": {
-    "aliases": [],
-    "code": "26aa",
-    "name": ":white_circle:"
-  },
-  "26ab": {
-    "aliases": [],
-    "code": "26ab",
-    "name": ":black_circle:"
-  },
-  "26b0": {
-    "aliases": [],
-    "code": "26b0-fe0f",
-    "name": ":coffin:"
-  },
-  "26b1": {
-    "aliases": [":funeral_urn:"],
-    "code": "26b1-fe0f",
-    "name": ":urn:"
-  },
-  "26bd": {
-    "aliases": [],
-    "code": "26bd",
-    "name": ":soccer:"
-  },
-  "26be": {
-    "aliases": [],
-    "code": "26be",
-    "name": ":baseball:"
-  },
-  "26c4": {
-    "aliases": [],
-    "code": "26c4",
-    "name": ":snowman:"
-  },
-  "26c5": {
-    "aliases": [],
-    "code": "26c5",
-    "name": ":partly_sunny:"
-  },
-  "26c8": {
-    "aliases": [":thunder_cloud_and_rain:"],
-    "code": "26c8-fe0f",
-    "name": ":thunder_cloud_rain:"
-  },
-  "26ce": {
-    "aliases": [],
-    "code": "26ce",
-    "name": ":ophiuchus:"
-  },
-  "26cf": {
-    "aliases": [],
-    "code": "26cf-fe0f",
-    "name": ":pick:"
-  },
-  "26d1": {
-    "aliases": [":helmet_with_white_cross:"],
-    "code": "26d1-fe0f",
-    "name": ":helmet_with_cross:"
-  },
-  "26d3": {
-    "aliases": [],
-    "code": "26d3-fe0f",
-    "name": ":chains:"
-  },
-  "26d4": {
-    "aliases": [],
-    "code": "26d4",
-    "name": ":no_entry:"
-  },
-  "26e9": {
-    "aliases": [],
-    "code": "26e9-fe0f",
-    "name": ":shinto_shrine:"
-  },
-  "26ea": {
-    "aliases": [],
-    "code": "26ea",
-    "name": ":church:"
-  },
-  "26f0": {
-    "aliases": [],
-    "code": "26f0-fe0f",
-    "name": ":mountain:"
-  },
-  "26f1": {
-    "aliases": [":umbrella_on_ground:"],
-    "code": "26f1-fe0f",
-    "name": ":beach_umbrella:"
-  },
-  "26f2": {
-    "aliases": [],
-    "code": "26f2",
-    "name": ":fountain:"
-  },
-  "26f3": {
-    "aliases": [],
-    "code": "26f3",
-    "name": ":golf:"
-  },
-  "26f4": {
-    "aliases": [],
-    "code": "26f4-fe0f",
-    "name": ":ferry:"
-  },
-  "26f5": {
-    "aliases": [],
-    "code": "26f5",
-    "name": ":sailboat:"
-  },
-  "26f7": {
-    "aliases": [],
-    "code": "26f7-fe0f",
-    "name": ":skier:"
-  },
-  "26f8": {
-    "aliases": [],
-    "code": "26f8-fe0f",
-    "name": ":ice_skate:"
-  },
-  "26f9": {
-    "aliases": [":basketball_player:", ":person_with_ball:"],
-    "code": "26f9",
-    "name": ":person_bouncing_ball:"
-  },
-  "26f9-1f3fb": {
-    "aliases": [":basketball_player_tone1:", ":person_with_ball_tone1:"],
-    "code": "26f9-1f3fb",
-    "name": ":person_bouncing_ball_tone1:"
-  },
-  "26f9-1f3fb-2640": {
-    "aliases": [":woman_bouncing_ball_light_skin_tone:"],
-    "code": "26f9-1f3fb-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball_tone1:"
-  },
-  "26f9-1f3fb-2642": {
-    "aliases": [":man_bouncing_ball_light_skin_tone:"],
-    "code": "26f9-1f3fb-200d-2642-fe0f",
-    "name": ":man_bouncing_ball_tone1:"
-  },
-  "26f9-1f3fc": {
-    "aliases": [":basketball_player_tone2:", ":person_with_ball_tone2:"],
-    "code": "26f9-1f3fc",
-    "name": ":person_bouncing_ball_tone2:"
-  },
-  "26f9-1f3fc-2640": {
-    "aliases": [":woman_bouncing_ball_medium_light_skin_tone:"],
-    "code": "26f9-1f3fc-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball_tone2:"
-  },
-  "26f9-1f3fc-2642": {
-    "aliases": [":man_bouncing_ball_medium_light_skin_tone:"],
-    "code": "26f9-1f3fc-200d-2642-fe0f",
-    "name": ":man_bouncing_ball_tone2:"
-  },
-  "26f9-1f3fd": {
-    "aliases": [":basketball_player_tone3:", ":person_with_ball_tone3:"],
-    "code": "26f9-1f3fd",
-    "name": ":person_bouncing_ball_tone3:"
-  },
-  "26f9-1f3fd-2640": {
-    "aliases": [":woman_bouncing_ball_medium_skin_tone:"],
-    "code": "26f9-1f3fd-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball_tone3:"
-  },
-  "26f9-1f3fd-2642": {
-    "aliases": [":man_bouncing_ball_medium_skin_tone:"],
-    "code": "26f9-1f3fd-200d-2642-fe0f",
-    "name": ":man_bouncing_ball_tone3:"
-  },
-  "26f9-1f3fe": {
-    "aliases": [":basketball_player_tone4:", ":person_with_ball_tone4:"],
-    "code": "26f9-1f3fe",
-    "name": ":person_bouncing_ball_tone4:"
-  },
-  "26f9-1f3fe-2640": {
-    "aliases": [":woman_bouncing_ball_medium_dark_skin_tone:"],
-    "code": "26f9-1f3fe-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball_tone4:"
-  },
-  "26f9-1f3fe-2642": {
-    "aliases": [":man_bouncing_ball_medium_dark_skin_tone:"],
-    "code": "26f9-1f3fe-200d-2642-fe0f",
-    "name": ":man_bouncing_ball_tone4:"
-  },
-  "26f9-1f3ff": {
-    "aliases": [":basketball_player_tone5:", ":person_with_ball_tone5:"],
-    "code": "26f9-1f3ff",
-    "name": ":person_bouncing_ball_tone5:"
-  },
-  "26f9-1f3ff-2640": {
-    "aliases": [":woman_bouncing_ball_dark_skin_tone:"],
-    "code": "26f9-1f3ff-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball_tone5:"
-  },
-  "26f9-1f3ff-2642": {
-    "aliases": [":man_bouncing_ball_dark_skin_tone:"],
-    "code": "26f9-1f3ff-200d-2642-fe0f",
-    "name": ":man_bouncing_ball_tone5:"
-  },
-  "26f9-2640": {
-    "aliases": [],
-    "code": "26f9-fe0f-200d-2640-fe0f",
-    "name": ":woman_bouncing_ball:"
-  },
-  "26f9-2642": {
-    "aliases": [],
-    "code": "26f9-fe0f-200d-2642-fe0f",
-    "name": ":man_bouncing_ball:"
-  },
-  "26fa": {
-    "aliases": [],
-    "code": "26fa",
-    "name": ":tent:"
-  },
-  "26fd": {
-    "aliases": [],
-    "code": "26fd",
-    "name": ":fuelpump:"
-  },
-  "2702": {
-    "aliases": [],
-    "code": "2702-fe0f",
-    "name": ":scissors:"
-  },
-  "2705": {
-    "aliases": [],
-    "code": "2705",
-    "name": ":white_check_mark:"
-  },
-  "2708": {
-    "aliases": [],
-    "code": "2708-fe0f",
-    "name": ":airplane:"
-  },
-  "2709": {
-    "aliases": [],
-    "code": "2709-fe0f",
-    "name": ":envelope:"
-  },
-  "270a": {
-    "aliases": [],
-    "code": "270a",
-    "name": ":fist:"
-  },
-  "270a-1f3fb": {
-    "aliases": [],
-    "code": "270a-1f3fb",
-    "name": ":fist_tone1:"
-  },
-  "270a-1f3fc": {
-    "aliases": [],
-    "code": "270a-1f3fc",
-    "name": ":fist_tone2:"
-  },
-  "270a-1f3fd": {
-    "aliases": [],
-    "code": "270a-1f3fd",
-    "name": ":fist_tone3:"
-  },
-  "270a-1f3fe": {
-    "aliases": [],
-    "code": "270a-1f3fe",
-    "name": ":fist_tone4:"
-  },
-  "270a-1f3ff": {
-    "aliases": [],
-    "code": "270a-1f3ff",
-    "name": ":fist_tone5:"
-  },
-  "270b": {
-    "aliases": [],
-    "code": "270b",
-    "name": ":raised_hand:"
-  },
-  "270b-1f3fb": {
-    "aliases": [],
-    "code": "270b-1f3fb",
-    "name": ":raised_hand_tone1:"
-  },
-  "270b-1f3fc": {
-    "aliases": [],
-    "code": "270b-1f3fc",
-    "name": ":raised_hand_tone2:"
-  },
-  "270b-1f3fd": {
-    "aliases": [],
-    "code": "270b-1f3fd",
-    "name": ":raised_hand_tone3:"
-  },
-  "270b-1f3fe": {
-    "aliases": [],
-    "code": "270b-1f3fe",
-    "name": ":raised_hand_tone4:"
-  },
-  "270b-1f3ff": {
-    "aliases": [],
-    "code": "270b-1f3ff",
-    "name": ":raised_hand_tone5:"
-  },
-  "270c": {
-    "aliases": [],
-    "code": "270c-fe0f",
-    "name": ":v:"
-  },
-  "270c-1f3fb": {
-    "aliases": [],
-    "code": "270c-1f3fb",
-    "name": ":v_tone1:"
-  },
-  "270c-1f3fc": {
-    "aliases": [],
-    "code": "270c-1f3fc",
-    "name": ":v_tone2:"
-  },
-  "270c-1f3fd": {
-    "aliases": [],
-    "code": "270c-1f3fd",
-    "name": ":v_tone3:"
-  },
-  "270c-1f3fe": {
-    "aliases": [],
-    "code": "270c-1f3fe",
-    "name": ":v_tone4:"
-  },
-  "270c-1f3ff": {
-    "aliases": [],
-    "code": "270c-1f3ff",
-    "name": ":v_tone5:"
-  },
-  "270d": {
-    "aliases": [],
-    "code": "270d-fe0f",
-    "name": ":writing_hand:"
-  },
-  "270d-1f3fb": {
-    "aliases": [],
-    "code": "270d-1f3fb",
-    "name": ":writing_hand_tone1:"
-  },
-  "270d-1f3fc": {
-    "aliases": [],
-    "code": "270d-1f3fc",
-    "name": ":writing_hand_tone2:"
-  },
-  "270d-1f3fd": {
-    "aliases": [],
-    "code": "270d-1f3fd",
-    "name": ":writing_hand_tone3:"
-  },
-  "270d-1f3fe": {
-    "aliases": [],
-    "code": "270d-1f3fe",
-    "name": ":writing_hand_tone4:"
-  },
-  "270d-1f3ff": {
-    "aliases": [],
-    "code": "270d-1f3ff",
-    "name": ":writing_hand_tone5:"
-  },
-  "270f": {
-    "aliases": [],
-    "code": "270f-fe0f",
-    "name": ":pencil2:"
-  },
-  "2712": {
-    "aliases": [],
-    "code": "2712-fe0f",
-    "name": ":black_nib:"
-  },
-  "2714": {
-    "aliases": [],
-    "code": "2714-fe0f",
-    "name": ":heavy_check_mark:"
-  },
-  "2716": {
-    "aliases": [],
-    "code": "2716-fe0f",
-    "name": ":heavy_multiplication_x:"
-  },
-  "271d": {
-    "aliases": [":latin_cross:"],
-    "code": "271d-fe0f",
-    "name": ":cross:"
-  },
-  "2721": {
-    "aliases": [],
-    "code": "2721-fe0f",
-    "name": ":star_of_david:"
-  },
-  "2728": {
-    "aliases": [],
-    "code": "2728",
-    "name": ":sparkles:"
-  },
-  "2733": {
-    "aliases": [],
-    "code": "2733-fe0f",
-    "name": ":eight_spoked_asterisk:"
-  },
-  "2734": {
-    "aliases": [],
-    "code": "2734-fe0f",
-    "name": ":eight_pointed_black_star:"
-  },
-  "2744": {
-    "aliases": [],
-    "code": "2744-fe0f",
-    "name": ":snowflake:"
-  },
-  "2747": {
-    "aliases": [],
-    "code": "2747-fe0f",
-    "name": ":sparkle:"
-  },
-  "274c": {
-    "aliases": [],
-    "code": "274c",
-    "name": ":x:"
-  },
-  "274e": {
-    "aliases": [],
-    "code": "274e",
-    "name": ":negative_squared_cross_mark:"
-  },
-  "2753": {
-    "aliases": [],
-    "code": "2753",
-    "name": ":question:"
-  },
-  "2754": {
-    "aliases": [],
-    "code": "2754",
-    "name": ":grey_question:"
-  },
-  "2755": {
-    "aliases": [],
-    "code": "2755",
-    "name": ":grey_exclamation:"
-  },
-  "2757": {
-    "aliases": [],
-    "code": "2757",
-    "name": ":exclamation:"
-  },
-  "2763": {
-    "aliases": [":heavy_heart_exclamation_mark_ornament:"],
-    "code": "2763-fe0f",
-    "name": ":heart_exclamation:"
-  },
-  "2764": {
-    "aliases": [],
-    "code": "2764-fe0f",
-    "name": ":heart:"
-  },
-  "2795": {
-    "aliases": [],
-    "code": "2795",
-    "name": ":heavy_plus_sign:"
-  },
-  "2796": {
-    "aliases": [],
-    "code": "2796",
-    "name": ":heavy_minus_sign:"
-  },
-  "2797": {
-    "aliases": [],
-    "code": "2797",
-    "name": ":heavy_division_sign:"
-  },
-  "27a1": {
-    "aliases": [],
-    "code": "27a1-fe0f",
-    "name": ":arrow_right:"
-  },
-  "27b0": {
-    "aliases": [],
-    "code": "27b0",
-    "name": ":curly_loop:"
-  },
-  "27bf": {
-    "aliases": [],
-    "code": "27bf",
-    "name": ":loop:"
-  },
-  "2934": {
-    "aliases": [],
-    "code": "2934-fe0f",
-    "name": ":arrow_heading_up:"
-  },
-  "2935": {
-    "aliases": [],
-    "code": "2935-fe0f",
-    "name": ":arrow_heading_down:"
-  },
-  "2b05": {
-    "aliases": [],
-    "code": "2b05-fe0f",
-    "name": ":arrow_left:"
-  },
-  "2b06": {
-    "aliases": [],
-    "code": "2b06-fe0f",
-    "name": ":arrow_up:"
-  },
-  "2b07": {
-    "aliases": [],
-    "code": "2b07-fe0f",
-    "name": ":arrow_down:"
-  },
-  "2b1b": {
-    "aliases": [],
-    "code": "2b1b",
-    "name": ":black_large_square:"
-  },
-  "2b1c": {
-    "aliases": [],
-    "code": "2b1c",
-    "name": ":white_large_square:"
-  },
-  "2b50": {
-    "aliases": [],
-    "code": "2b50",
-    "name": ":star:"
-  },
-  "2b55": {
-    "aliases": [],
-    "code": "2b55",
-    "name": ":o:"
-  },
-  "3030": {
-    "aliases": [],
-    "code": "3030-fe0f",
-    "name": ":wavy_dash:"
-  },
-  "303d": {
-    "aliases": [],
-    "code": "303d-fe0f",
-    "name": ":part_alternation_mark:"
-  },
-  "3297": {
-    "aliases": [],
-    "code": "3297-fe0f",
-    "name": ":congratulations:"
-  },
-  "3299": {
-    "aliases": [],
-    "code": "3299-fe0f",
-    "name": ":secret:"
-  }
-}
diff --git a/src/script/components/Emoji/inlineReplacements.ts b/src/script/components/Emoji/inlineReplacements.ts
deleted file mode 100644
index 64e9a6438a0..00000000000
--- a/src/script/components/Emoji/inlineReplacements.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-const inlineReplacements = [
-  {name: 'slight smile', shortcut: ':)'},
-  {name: 'slight smile', shortcut: ':-)'},
-  {name: 'smile', shortcut: ':D'},
-  {name: 'smile', shortcut: ':-D'},
-  {name: 'grinning', shortcut: ':-d'},
-  {name: 'sunglasses', shortcut: 'B-)'},
-  {name: 'sunglasses', shortcut: 'b-)'},
-  {name: 'sunglasses', shortcut: '8-)'},
-  {name: 'disappointed', shortcut: ':('},
-  {name: 'disappointed', shortcut: ':-('},
-  {name: 'wink', shortcut: ';)'},
-  {name: 'wink', shortcut: ';-)'},
-  {name: 'wink', shortcut: ';-]'},
-  {name: 'wink', shortcut: ';]'},
-  {name: 'confused', shortcut: ':/'},
-  {name: 'confused', shortcut: ':-/'},
-  {name: 'stuck out tongue', shortcut: ':P'},
-  {name: 'stuck out tongue', shortcut: ':-P'},
-  {name: 'stuck out tongue', shortcut: ':-p'},
-  {name: 'stuck out tongue winking eye', shortcut: ';P'},
-  {name: 'stuck out tongue winking eye', shortcut: ';-P'},
-  {name: 'stuck out tongue winking eye', shortcut: ';-p'},
-  {name: 'open mouth', shortcut: ':O'},
-  {name: 'open mouth', shortcut: ':-o'},
-  {name: 'innocent', shortcut: 'O:)'},
-  {name: 'innocent', shortcut: 'O:-)'},
-  {name: 'innocent', shortcut: 'o:)'},
-  {name: 'innocent', shortcut: 'o:-)'},
-  {name: 'smirk', shortcut: ';^)'},
-  {name: 'angry', shortcut: ':@'},
-  {name: 'rage', shortcut: '>:('},
-  {name: 'smiling imp', shortcut: '}:-)'},
-  {name: 'smiling imp', shortcut: '}:)'},
-  {name: 'smiling imp', shortcut: '3:-)'},
-  {name: 'smiling imp', shortcut: '3:)'},
-  {name: 'cry', shortcut: ":'-("},
-  {name: 'cry', shortcut: ":'("},
-  {name: 'cry', shortcut: ';('},
-  {name: 'joy', shortcut: ":'-)"},
-  {name: 'joy', shortcut: ":')"},
-  {name: 'kissing heart', shortcut: ':*'},
-  {name: 'kissing heart', shortcut: ':^*'},
-  {name: 'kissing heart', shortcut: ':-*'},
-  {name: 'neutral face', shortcut: ':-|'},
-  {name: 'neutral face', shortcut: ':|'},
-  {name: 'flushed', shortcut: ':$'},
-  {name: 'no mouth', shortcut: ':-X'},
-  {name: 'no mouth', shortcut: ':X'},
-  {name: 'no mouth', shortcut: ':-#'},
-  {name: 'no mouth', shortcut: ':#'},
-  {name: 'raised hands', shortcut: '\\o/'},
-  {name: 'heart', shortcut: '<3'},
-  {name: 'broken heart', shortcut: '</3'},
-];
-
-export {inlineReplacements};
diff --git a/src/script/components/Emoji/useEmoji.tsx b/src/script/components/Emoji/useEmoji.tsx
deleted file mode 100644
index ec5f58991ed..00000000000
--- a/src/script/components/Emoji/useEmoji.tsx
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {KeyboardEvent, useEffect, useRef, useState} from 'react';
-
-import type {WebappProperties} from '@wireapp/api-client/lib/user/data/';
-import {amplify} from 'amplify';
-
-import {WebAppEvents} from '@wireapp/webapp-events';
-
-import {IgnoreOutsideClickWrapper} from 'Components/InputBar/util/clickHandlers';
-import {isEnterKey, isKey, KEY} from 'Util/KeyboardUtil';
-import {updateMentionRanges} from 'Util/MentionUtil';
-import {getCursorPixelPosition} from 'Util/PopupUtil';
-import {loadValue, storeValue} from 'Util/StorageUtil';
-import {sortByPriority} from 'Util/StringUtil';
-
-import emojiBindings from './emoji.json';
-import {EmojiItem} from './EmojiItem';
-import {inlineReplacements} from './inlineReplacements';
-
-import {MentionEntity} from '../../message/MentionEntity';
-import {PropertiesRepository} from '../../properties/PropertiesRepository';
-import {PROPERTIES_TYPE} from '../../properties/PropertiesType';
-import {StorageKey} from '../../storage';
-
-const escapeRegexp = (string: string): string => string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
-
-type InlineReplacement = {
-  name: string;
-  shortcut: string;
-};
-
-const inlineReplacement: InlineReplacement[] = inlineReplacements.sort((first, second) => {
-  const isUnequalLength = first.shortcut.length !== second.shortcut.length;
-
-  return isUnequalLength
-    ? second.shortcut.length - first.shortcut.length
-    : first.shortcut.localeCompare(second.shortcut);
-});
-
-const INLINE_MAX_LENGTH = Math.max(...inlineReplacement.map(({shortcut}) => shortcut.length));
-
-const getEmojiPopupPosition = (input: HTMLTextAreaElement, container: HTMLDivElement) => {
-  const position = getCursorPixelPosition(input);
-  const top = position.top - container.offsetHeight - CONFIG.OFFSET_TOP;
-  const left = position.left - CONFIG.OFFSET_LEFT;
-
-  return {left, top};
-};
-
-const CONFIG = {
-  LENGTH: 5,
-  OFFSET_LEFT: 8,
-  OFFSET_TOP: 8,
-};
-
-export interface EmojiData {
-  aliases: string[];
-  code: string;
-  name: string;
-}
-
-type EmojiBinding = Record<string, EmojiData>;
-
-export type EmojiListItem = {
-  icon: string;
-  name: string;
-};
-
-const useEmoji = (
-  propertiesRepository: PropertiesRepository,
-  updateText: (text: string) => void,
-  onSend: (text: string) => void,
-  currentMentions: MentionEntity[],
-  setCurrentMentions: (mentions: MentionEntity[]) => void,
-  textareaElement?: HTMLTextAreaElement | null,
-) => {
-  const emojiWrapperRef = useRef<HTMLDivElement>(null);
-  const [emojiStartPosition, setEmojiStartPosition] = useState<number>(-1);
-  const [selectedEmojiIndex, setSelectedEmojiIndex] = useState<number>(0);
-
-  const [isVisible, setIsVisible] = useState<boolean>(false);
-  const [suppressKeyUp, setSuppressKeyUp] = useState<boolean>(false);
-  const [shouldReplaceEmoji, setShouldReplaceEmoji] = useState<boolean>(
-    propertiesRepository.getPreference(PROPERTIES_TYPE.EMOJI.REPLACE_INLINE),
-  );
-  const [emojiDictionary, setEmojiDictionary] = useState<Record<string, string>>({});
-  const [emojiList, setEmojiList] = useState<EmojiListItem[]>();
-
-  const [mappedEmojiList, setMappedEmojiList] = useState<EmojiListItem[]>([]);
-
-  const emojiUsageCount: Record<string, number> = loadValue(StorageKey.CONVERSATION.EMOJI_USAGE_COUNT) || {};
-
-  const closeEmojiPopup = () => {
-    setIsVisible(false);
-    window.removeEventListener('click', removeEmojiPopup);
-  };
-
-  const removeEmojiPopup = () => {
-    closeEmojiPopup();
-    setEmojiStartPosition(-1);
-    setSelectedEmojiIndex(0);
-    setMappedEmojiList([]);
-  };
-
-  const enterEmoji = (
-    input: HTMLInputElement | HTMLTextAreaElement,
-    emojiIcon: string,
-    inlineEmojiStartPosition = emojiStartPosition,
-  ) => {
-    const {selectionStart: selection, selectionEnd: end, value: text} = input;
-
-    if (selection && end) {
-      const textBeforeEmoji = text.substring(0, inlineEmojiStartPosition - 1);
-      const textAfterEmoji = text.slice(selection);
-      const textWithEmoji = `${textBeforeEmoji}${emojiIcon}`;
-      const updatedText = `${textWithEmoji}${textAfterEmoji}`;
-      const newCursorPosition = textWithEmoji.length;
-
-      updateText(updatedText);
-
-      const difference = updatedText.length - text.length;
-      const updatedMentions = updateMentionRanges(currentMentions, selection, end, difference);
-      setCurrentMentions(updatedMentions);
-
-      removeEmojiPopup();
-
-      setTimeout(() => {
-        if (textareaElement) {
-          textareaElement.value = updatedText;
-          textareaElement.setSelectionRange(newCursorPosition, newCursorPosition);
-          textareaElement.focus();
-        }
-      }, 0);
-    }
-  };
-
-  const tryReplaceInlineEmoji = (input: HTMLTextAreaElement): boolean => {
-    const {selectionStart: selection, value: text} = input;
-
-    if (shouldReplaceEmoji && text) {
-      const textUntilCursor = text.substring(Math.max(0, selection - INLINE_MAX_LENGTH - 1), selection);
-
-      for (const replacement of inlineReplacement) {
-        const icon = emojiDictionary?.[replacement.name];
-
-        if (icon) {
-          const validInlineEmojiRegEx = new RegExp(`(^|\\s)${escapeRegexp(replacement.shortcut)}$`);
-
-          if (validInlineEmojiRegEx.test(textUntilCursor)) {
-            enterEmoji(input, icon, selection - replacement.shortcut.length + 1);
-
-            return true;
-          }
-        }
-      }
-    }
-
-    return false;
-  };
-
-  const rotateEmojiPopup = (backward: boolean) => {
-    const emojiLength = mappedEmojiList.length;
-    const nextOrPreviousIndex = (backward ? selectedEmojiIndex - 1 : selectedEmojiIndex + 1) % emojiLength;
-    const newIndex = nextOrPreviousIndex === -1 ? emojiLength - 1 : nextOrPreviousIndex;
-
-    setSelectedEmojiIndex(newIndex);
-  };
-
-  const getUsageCount = (emojiName: string): number => emojiUsageCount?.[emojiName] || 0;
-
-  const increaseUsageCount = (emojiName: string): void => {
-    emojiUsageCount[emojiName] = getUsageCount(emojiName) + 1;
-    storeValue(StorageKey.CONVERSATION.EMOJI_USAGE_COUNT, emojiUsageCount);
-  };
-
-  const enterEmojiPopupLine = (input: HTMLInputElement | HTMLTextAreaElement, selectedEmoji: EmojiListItem): void => {
-    const emojiIcon = selectedEmoji.icon;
-    const emojiName = selectedEmoji.name.toLowerCase();
-
-    enterEmoji(input, emojiIcon);
-    increaseUsageCount(emojiName); // only emojis selected from the list should affect the count
-  };
-
-  const replaceAllInlineEmoji = (input: HTMLInputElement | HTMLTextAreaElement, shiftKeyPressed = false) => {
-    const {selectionStart: selection, value: text} = input;
-
-    if (selection !== null) {
-      let textBeforeCursor = text.slice(0, selection);
-      let textAfterCursor = text.slice(selection);
-
-      for (const replacement of inlineReplacement) {
-        const icon = emojiDictionary[replacement.name];
-
-        if (icon) {
-          const validIInlineEmojiRegex = new RegExp(`(^|\\s)${escapeRegexp(replacement.shortcut)}(?=\\s|$)`, 'g');
-          textBeforeCursor = textBeforeCursor.replace(validIInlineEmojiRegex, `$1${icon}`);
-          textAfterCursor = textAfterCursor.replace(validIInlineEmojiRegex, `$1${icon}`);
-        }
-      }
-
-      const updatedText = `${textBeforeCursor}${textAfterCursor}`;
-
-      if (shiftKeyPressed) {
-        updateText(updatedText);
-      } else {
-        onSend(updatedText);
-      }
-    }
-  };
-
-  const updateEmojiPopup = (input: HTMLTextAreaElement) => {
-    const {selectionStart: selection, value: text} = input;
-
-    if (!text) {
-      return;
-    }
-
-    const query = text.slice(emojiStartPosition, selection);
-
-    if (!query.length) {
-      return closeEmojiPopup();
-    }
-
-    const shouldRemovePopup = !emojiList?.length || query.startsWith(' ') || /\s{2,}/.test(query);
-
-    if (shouldRemovePopup) {
-      return removeEmojiPopup();
-    }
-
-    const queryWords = query.split(' ');
-    const expectedWords = (query.match(/\s/g) || []).length + 1;
-
-    const filteredEmojiList: EmojiListItem[] = emojiList.filter(emoji => {
-      const emojiNameWords = emoji.name.split(' ');
-
-      if (emojiNameWords.length < expectedWords) {
-        return false;
-      }
-
-      return queryWords.every(queryWord => {
-        return emojiNameWords.some(emojiNameWord => emojiNameWord.startsWith(queryWord));
-      });
-    });
-
-    const reduceEmojiList = filteredEmojiList.reduce<EmojiListItem[]>((accumulator, emoji) => {
-      const iconNotFound = !accumulator.find(item => item.icon === emoji.icon);
-      if (iconNotFound) {
-        accumulator.push(emoji);
-      }
-      return accumulator;
-    }, []);
-
-    const sortedEmojiList = reduceEmojiList.sort((emojiA, emojiB) => {
-      const usageCountA = getUsageCount(emojiA.name);
-      const usageCountB = getUsageCount(emojiB.name);
-
-      const sameUsageCount = usageCountA === usageCountB;
-      return sameUsageCount ? sortByPriority(emojiA.name, emojiB.name, query) : usageCountB - usageCountA;
-    });
-
-    const emojiMatched = sortedEmojiList.slice(0, CONFIG.LENGTH);
-
-    if (!emojiMatched.length) {
-      return closeEmojiPopup();
-    }
-
-    setSelectedEmojiIndex(0);
-    setMappedEmojiList(emojiMatched);
-    setIsVisible(true);
-  };
-
-  const onInputKeyUp = (keyboardEvent: KeyboardEvent<HTMLTextAreaElement>) => {
-    if (suppressKeyUp) {
-      setSuppressKeyUp(false);
-
-      return;
-    }
-
-    const input = keyboardEvent.currentTarget;
-    const {selectionStart: selection, value: text} = input;
-
-    if (text) {
-      const popupTrigger = text.slice(Math.max(selection - 2, 0), selection);
-      const containsPopupTrigger = /\B:$/.test(popupTrigger);
-
-      if (containsPopupTrigger) {
-        setEmojiStartPosition(selection);
-        updateEmojiPopup(input);
-      } else if (emojiStartPosition !== -1) {
-        if (selection < emojiStartPosition || text[emojiStartPosition - 1] !== ':') {
-          removeEmojiPopup();
-        } else {
-          updateEmojiPopup(input);
-        }
-      }
-    }
-  };
-
-  const onInputKeyDown = (keyboardEvent: KeyboardEvent<HTMLTextAreaElement>): boolean => {
-    const input = keyboardEvent.currentTarget;
-
-    // Handling just entered inline emoji
-    switch (keyboardEvent.key) {
-      case KEY.SPACE: {
-        if (tryReplaceInlineEmoji(input)) {
-          return false;
-        }
-        break;
-      }
-
-      case KEY.TAB: {
-        if (tryReplaceInlineEmoji(input)) {
-          keyboardEvent.preventDefault();
-          return true;
-        }
-        break;
-      }
-
-      default:
-        break;
-    }
-
-    // Handling emoji popup
-    if (isVisible) {
-      switch (keyboardEvent.key) {
-        case KEY.ESC: {
-          keyboardEvent.preventDefault();
-          removeEmojiPopup();
-          return true;
-        }
-
-        case KEY.ARROW_UP:
-        case KEY.ARROW_DOWN: {
-          keyboardEvent.preventDefault();
-          rotateEmojiPopup(isKey(keyboardEvent, KEY.ARROW_UP));
-          setSuppressKeyUp(true);
-          return true;
-        }
-
-        case KEY.ENTER:
-        case KEY.TAB: {
-          if (keyboardEvent.shiftKey && isEnterKey(keyboardEvent)) {
-            break;
-          }
-
-          keyboardEvent.preventDefault();
-
-          const emoji = mappedEmojiList.find((emoji, index) => index === selectedEmojiIndex);
-
-          if (emoji) {
-            enterEmojiPopupLine(input, emoji);
-          }
-
-          return true;
-        }
-
-        default:
-          break;
-      }
-    }
-
-    if (!shouldReplaceEmoji) {
-      return false;
-    }
-
-    if (isEnterKey(keyboardEvent)) {
-      if (keyboardEvent.shiftKey) {
-        replaceAllInlineEmoji(input, keyboardEvent.shiftKey);
-
-        return false;
-      }
-
-      keyboardEvent.preventDefault();
-      replaceAllInlineEmoji(input);
-
-      return true;
-    }
-
-    return false;
-  };
-
-  const renderEmojiComponent = () =>
-    isVisible ? (
-      <IgnoreOutsideClickWrapper>
-        <div className="conversation-input-bar-emoji-list" ref={emojiWrapperRef}>
-          {mappedEmojiList.map((emoji, index) => {
-            return (
-              <EmojiItem
-                key={emoji.name}
-                selectedEmoji={selectedEmojiIndex === index}
-                emoji={emoji}
-                onMouseEnter={() => setSelectedEmojiIndex(index)}
-                onClick={() => {
-                  if (textareaElement) {
-                    enterEmojiPopupLine(textareaElement, emoji);
-                  }
-                }}
-              />
-            );
-          })}
-        </div>
-      </IgnoreOutsideClickWrapper>
-    ) : null;
-
-  useEffect(() => {
-    if (isVisible) {
-      window.addEventListener('click', removeEmojiPopup);
-    }
-
-    return () => {
-      if (isVisible) {
-        window.removeEventListener('click', removeEmojiPopup);
-      }
-    };
-  }, [isVisible]);
-
-  const getInitialsEmojis = () => {
-    const newEmojiList: EmojiListItem[] = [];
-    const newEmojiDict: Record<string, string> = {};
-
-    for (const code in emojiBindings) {
-      const details = (emojiBindings as EmojiBinding)[code];
-
-      // Ignore 'tone' emojis for now, they clutter suggestions too much.
-      if (details.name.match(/_tone\d/)) {
-        continue;
-      }
-
-      const alphaCodes = [details.name, ...details.aliases];
-      const splitDetailsCode = details.code.split('-').map(char => Number(`0x${char}`));
-      const icon: string = String.fromCodePoint(...splitDetailsCode);
-
-      alphaCodes.forEach(alphaCode => {
-        const name = alphaCode.slice(1, -1).replace(/_/g, ' ').toLowerCase();
-
-        newEmojiList.push({icon, name});
-        newEmojiDict[name] = icon;
-      });
-    }
-
-    setEmojiList(newEmojiList);
-    setEmojiDictionary(newEmojiDict);
-  };
-
-  useEffect(() => {
-    getInitialsEmojis();
-  }, []);
-
-  useEffect(() => {
-    if (textareaElement && emojiWrapperRef.current && mappedEmojiList.length) {
-      const {top, left} = getEmojiPopupPosition(textareaElement, emojiWrapperRef.current);
-
-      emojiWrapperRef.current.style.left = `${left}px`;
-      emojiWrapperRef.current.style.top = `${top}px`;
-    }
-  }, [mappedEmojiList, textareaElement]);
-
-  useEffect(() => {
-    amplify.subscribe(WebAppEvents.CONTENT.SWITCH, removeEmojiPopup);
-    amplify.subscribe(WebAppEvents.PROPERTIES.UPDATE.EMOJI.REPLACE_INLINE, setShouldReplaceEmoji);
-    amplify.subscribe(WebAppEvents.PROPERTIES.UPDATED, (properties: WebappProperties) => {
-      setShouldReplaceEmoji(properties.settings.emoji.replace_inline);
-    });
-  }, []);
-
-  return {onInputKeyDown, onInputKeyUp, renderEmojiComponent};
-};
-
-export {useEmoji};
diff --git a/src/script/components/Giphy/Giphy.test.tsx b/src/script/components/Giphy/Giphy.test.tsx
index a1079022fa3..b246f3b8a56 100644
--- a/src/script/components/Giphy/Giphy.test.tsx
+++ b/src/script/components/Giphy/Giphy.test.tsx
@@ -27,7 +27,7 @@ import {Giphy, GiphyState} from '.';
 
 const inputValue = 'Yammy yammy';
 const getDefaultProps = () => ({
-  giphyRepository: {getGifs: jest.fn().mockResolvedValue([])} as unknown as GiphyRepository,
+  giphyRepository: {getGifs: jest.fn().mockResolvedValue([]), resetOffset: jest.fn()} as unknown as GiphyRepository,
   inputValue,
   onClose: jest.fn(),
 });
diff --git a/src/script/components/HistoryExport/HistoryExport.tsx b/src/script/components/HistoryExport/HistoryExport.tsx
new file mode 100644
index 00000000000..69a8d11c68a
--- /dev/null
+++ b/src/script/components/HistoryExport/HistoryExport.tsx
@@ -0,0 +1,277 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useContext, useEffect, useState} from 'react';
+
+import {container} from 'tsyringe';
+
+import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {ClientState} from 'src/script/client/ClientState';
+import {User} from 'src/script/entity/User';
+import {ContentState} from 'src/script/page/useAppState';
+import {t} from 'Util/LocalizerUtil';
+import {getLogger} from 'Util/Logger';
+import {getCurrentDate} from 'Util/TimeUtil';
+import {downloadBlob} from 'Util/util';
+
+import {CancelError} from '../../backup/Error';
+import {Config} from '../../Config';
+import {RootContext} from '../../page/RootProvider';
+
+enum ExportState {
+  COMPRESSING = 'ExportState.STATE.COMPRESSING',
+  DONE = 'ExportState.STATE.DONE',
+  EXPORTING = 'ExportState.STATE.EXPORTING',
+  PREPARING = 'ExportState.STATE.PREPARING',
+}
+
+export const CONFIG = {
+  FILE_EXTENSION: 'desktop_wbu',
+};
+
+interface HistoryExportProps {
+  switchContent: (contentState: ContentState) => void;
+  readonly user: User;
+  readonly clientState?: ClientState;
+}
+
+const HistoryExport = ({switchContent, user, clientState = container.resolve(ClientState)}: HistoryExportProps) => {
+  const logger = getLogger('HistoryExport');
+
+  const [historyState, setHistoryState] = useState<ExportState>(ExportState.PREPARING);
+  const [hasError, setHasError] = useState<boolean>(false);
+
+  const [numberOfRecords, setNumberOfRecords] = useState<number>(0);
+  const [numberOfProcessedRecords, setNumberOfProcessedRecords] = useState<number>(0);
+
+  const [archiveBlob, setArchiveBlob] = useState<Blob | null>(null);
+
+  const mainViewModel = useContext(RootContext);
+
+  useEffect(() => {
+    exportHistory();
+  }, []);
+
+  if (!mainViewModel) {
+    return null;
+  }
+
+  const {content: contentViewModel} = mainViewModel;
+  const backupRepository = contentViewModel.repositories.backup;
+
+  const loadingProgress = Math.floor((numberOfProcessedRecords / numberOfRecords) * 100);
+
+  const isPreparing = !hasError && historyState === ExportState.PREPARING;
+  const isExporting = !hasError && [ExportState.EXPORTING, ExportState.COMPRESSING].includes(historyState);
+  const isDone = !hasError && historyState === ExportState.DONE;
+
+  const replacements = {
+    processed: numberOfProcessedRecords.toString(),
+    progress: loadingProgress.toString(),
+    total: numberOfRecords.toString(),
+  };
+
+  const historyMessages: Partial<Record<ExportState, string>> = {
+    [ExportState.PREPARING]: t('backupExportProgressHeadline'),
+    [ExportState.EXPORTING]: t('backupExportProgressSecondary', replacements),
+    [ExportState.COMPRESSING]: t('backupExportProgressCompressing'),
+  };
+
+  const loadingMessage = historyMessages?.[historyState] || '';
+
+  const dismissExport = () => {
+    switchContent(ContentState.PREFERENCES_ACCOUNT);
+  };
+
+  const onProgress = (processedNumber: number) => {
+    setHistoryState(ExportState.EXPORTING);
+    setNumberOfProcessedRecords(prevState => prevState + processedNumber);
+  };
+
+  const onSuccess = (archiveBlob: Blob) => {
+    setHistoryState(ExportState.DONE);
+    setHasError(false);
+    setArchiveBlob(archiveBlob);
+  };
+
+  const onError = (error: Error) => {
+    if (error instanceof CancelError) {
+      logger.log('History export was cancelled');
+      dismissExport();
+
+      return;
+    }
+
+    setHasError(true);
+    logger.error(`Failed to export history: ${error.message}`, error);
+  };
+
+  const downloadArchiveFile = () => {
+    const userName = user.username();
+    const fileExtension = CONFIG.FILE_EXTENSION;
+    const sanitizedBrandName = Config.getConfig().BRAND_NAME.replace(/[^A-Za-z0-9_]/g, '');
+    const filename = `${sanitizedBrandName}-${userName}-Backup_${getCurrentDate()}.${fileExtension}`;
+
+    dismissExport();
+
+    if (archiveBlob) {
+      downloadBlob(archiveBlob, filename, 'application/octet-stream');
+    }
+  };
+
+  const onCancel = () => backupRepository.cancelAction();
+
+  const getBackUpPassword = (): Promise<string> => {
+    return new Promise(resolve => {
+      PrimaryModal.show(PrimaryModal.type.PASSWORD_ADVANCED_SECURITY, {
+        primaryAction: {
+          action: async (password: string) => {
+            resolve(password);
+          },
+          text: t('backupEncryptionModalAction'),
+        },
+        secondaryAction: [
+          {
+            action: () => {
+              resolve('');
+              dismissExport();
+            },
+            text: t('backupEncryptionModalCloseBtn'),
+          },
+        ],
+        passwordOptional: true,
+        text: {
+          closeBtnLabel: t('backupEncryptionModalCloseBtn'),
+          input: t('backupEncryptionModalPlaceholder'),
+          message: t('backupEncryptionModalMessage'),
+          title: t('backupEncryptionModalTitle'),
+        },
+      });
+    });
+  };
+
+  const exportHistory = async () => {
+    const password = await getBackUpPassword();
+    setHistoryState(ExportState.PREPARING);
+    setHasError(false);
+
+    try {
+      const numberOfRecords = await backupRepository.getBackupInitData();
+      logger.log(`Exporting '${numberOfRecords}' records from history`);
+
+      setNumberOfRecords(numberOfRecords);
+      setNumberOfProcessedRecords(0);
+
+      if (clientState.currentClient) {
+        const archiveBlob = await backupRepository.generateHistory(
+          user,
+          clientState.currentClient.id,
+          onProgress,
+          password,
+        );
+
+        onSuccess(archiveBlob);
+        logger.log(`Completed export of '${numberOfRecords}' records from history`);
+      } else {
+        throw new Error('No local client found');
+      }
+    } catch (error) {
+      onError(error as Error);
+    }
+  };
+
+  return (
+    <div id="history-export">
+      {isPreparing && <LoadingBar progress={loadingProgress} message={loadingMessage} />}
+
+      {isExporting && (
+        <>
+          <LoadingBar progress={loadingProgress} message={loadingMessage} className="with-cancel" />
+
+          <button
+            type="button"
+            className="cancel-button accent-text"
+            onClick={onCancel}
+            data-uie-name="do-cancel-history-export"
+          >
+            {t('backupCancel')}
+          </button>
+        </>
+      )}
+
+      {isDone && (
+        <>
+          <div className="history-message">
+            <h2 className="history-message__headline" data-uie-name="status-history-export-success-headline">
+              {t('backupExportSuccessHeadline')}
+            </h2>
+
+            <p className="history-message__info" data-uie-name="status-history-export-success-info">
+              {t('backupExportSuccessSecondary')}
+            </p>
+
+            <div className="history-message__buttons">
+              <button className="button" onClick={downloadArchiveFile} data-uie-name="do-save-history-export">
+                {t('backupExportSaveFileAction')}
+              </button>
+            </div>
+          </div>
+
+          <button
+            type="button"
+            className="cancel-button accent-text"
+            onClick={dismissExport}
+            data-uie-name="do-cancel-history-export"
+          >
+            {t('backupCancel')}
+          </button>
+        </>
+      )}
+
+      {hasError && (
+        <div className="history-message" data-uie-name="status-history-export-error">
+          <h2 className="history-message__headline" data-uie-name="status-history-export-error-headline">
+            {t('backupExportGenericErrorHeadline')}
+          </h2>
+
+          <p className="history-message__info" data-uie-name="status-history-export-error-info">
+            {t('backupExportGenericErrorSecondary')}
+          </p>
+
+          <div className="history-message__buttons">
+            <button
+              className="button button-inverted"
+              onClick={exportHistory}
+              data-uie-name="do-try-again-history-export-error"
+            >
+              {t('backupTryAgain')}
+            </button>
+
+            <button className="button" data-uie-name="do-dismiss-history-export-error" onClick={dismissExport}>
+              {t('backupCancel')}
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export {HistoryExport};
diff --git a/src/script/components/HistoryExport/index.tsx b/src/script/components/HistoryExport/index.tsx
index 3865dead450..31f58503b4f 100644
--- a/src/script/components/HistoryExport/index.tsx
+++ b/src/script/components/HistoryExport/index.tsx
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,221 +17,4 @@
  *
  */
 
-import {FC, useContext, useEffect, useState} from 'react';
-
-import {container} from 'tsyringe';
-
-import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
-import {ClientState} from 'src/script/client/ClientState';
-import {User} from 'src/script/entity/User';
-import {ContentState} from 'src/script/page/useAppState';
-import {t} from 'Util/LocalizerUtil';
-import {getLogger} from 'Util/Logger';
-import {getCurrentDate} from 'Util/TimeUtil';
-import {downloadBlob} from 'Util/util';
-
-import {CancelError} from '../../backup/Error';
-import {Config} from '../../Config';
-import {RootContext} from '../../page/RootProvider';
-
-enum ExportState {
-  COMPRESSING = 'ExportState.STATE.COMPRESSING',
-  DONE = 'ExportState.STATE.DONE',
-  EXPORTING = 'ExportState.STATE.EXPORTING',
-  PREPARING = 'ExportState.STATE.PREPARING',
-}
-
-export const CONFIG = {
-  FILE_EXTENSION: 'desktop_wbu',
-};
-
-interface HistoryExportProps {
-  switchContent: (contentState: ContentState) => void;
-  readonly user: User;
-  readonly clientState?: ClientState;
-}
-
-const HistoryExport: FC<HistoryExportProps> = ({switchContent, user, clientState = container.resolve(ClientState)}) => {
-  const logger = getLogger('HistoryExport');
-
-  const [historyState, setHistoryState] = useState<ExportState>(ExportState.PREPARING);
-  const [hasError, setHasError] = useState<boolean>(false);
-
-  const [numberOfRecords, setNumberOfRecords] = useState<number>(0);
-  const [numberOfProcessedRecords, setNumberOfProcessedRecords] = useState<number>(0);
-
-  const [archiveBlob, setArchiveBlob] = useState<Blob | null>(null);
-
-  const mainViewModel = useContext(RootContext);
-
-  useEffect(() => {
-    exportHistory();
-  }, []);
-
-  if (!mainViewModel) {
-    return null;
-  }
-
-  const {content: contentViewModel} = mainViewModel;
-  const backupRepository = contentViewModel.repositories.backup;
-
-  const loadingProgress = Math.floor((numberOfProcessedRecords / numberOfRecords) * 100);
-
-  const isPreparing = !hasError && historyState === ExportState.PREPARING;
-  const isExporting = !hasError && [ExportState.EXPORTING, ExportState.COMPRESSING].includes(historyState);
-  const isDone = !hasError && historyState === ExportState.DONE;
-
-  const replacements = {
-    processed: numberOfProcessedRecords.toString(),
-    progress: loadingProgress.toString(),
-    total: numberOfRecords.toString(),
-  };
-
-  const historyMessages: Partial<Record<ExportState, string>> = {
-    [ExportState.PREPARING]: t('backupExportProgressHeadline'),
-    [ExportState.EXPORTING]: t('backupExportProgressSecondary', replacements),
-    [ExportState.COMPRESSING]: t('backupExportProgressCompressing'),
-  };
-
-  const loadingMessage = historyMessages?.[historyState] || '';
-
-  const dismissExport = () => {
-    switchContent(ContentState.PREFERENCES_ACCOUNT);
-  };
-
-  const onProgress = (processedNumber: number) => {
-    setHistoryState(ExportState.EXPORTING);
-    setNumberOfProcessedRecords(prevState => prevState + processedNumber);
-  };
-
-  const onSuccess = (archiveBlob: Blob) => {
-    setHistoryState(ExportState.DONE);
-    setHasError(false);
-    setArchiveBlob(archiveBlob);
-  };
-
-  const onError = (error: Error) => {
-    if (error instanceof CancelError) {
-      logger.log('History export was cancelled');
-      dismissExport();
-
-      return;
-    }
-
-    setHasError(true);
-    logger.error(`Failed to export history: ${error.message}`, error);
-  };
-
-  const downloadArchiveFile = () => {
-    const userName = user.username();
-    const fileExtension = CONFIG.FILE_EXTENSION;
-    const sanitizedBrandName = Config.getConfig().BRAND_NAME.replace(/[^A-Za-z0-9_]/g, '');
-    const filename = `${sanitizedBrandName}-${userName}-Backup_${getCurrentDate()}.${fileExtension}`;
-
-    dismissExport();
-
-    if (archiveBlob) {
-      downloadBlob(archiveBlob, filename, 'application/octet-stream');
-    }
-  };
-
-  const onCancel = () => backupRepository.cancelAction();
-
-  const exportHistory = async () => {
-    setHistoryState(ExportState.PREPARING);
-    setHasError(false);
-
-    try {
-      const numberOfRecords = await backupRepository.getBackupInitData();
-      logger.log(`Exporting '${numberOfRecords}' records from history`);
-
-      setNumberOfRecords(numberOfRecords);
-      setNumberOfProcessedRecords(0);
-
-      const archiveBlob = await backupRepository.generateHistory(user, clientState.currentClient().id, onProgress);
-
-      onSuccess(archiveBlob);
-      logger.log(`Completed export of '${numberOfRecords}' records from history`);
-    } catch (error) {
-      onError(error as Error);
-    }
-  };
-
-  return (
-    <div id="history-export">
-      {isPreparing && <LoadingBar progress={loadingProgress} message={loadingMessage} />}
-
-      {isExporting && (
-        <>
-          <LoadingBar progress={loadingProgress} message={loadingMessage} className="with-cancel" />
-
-          <button
-            type="button"
-            className="cancel-button accent-text"
-            onClick={onCancel}
-            data-uie-name="do-cancel-history-export"
-          >
-            {t('backupCancel')}
-          </button>
-        </>
-      )}
-
-      {isDone && (
-        <>
-          <div className="history-message">
-            <h2 className="history-message__headline" data-uie-name="status-history-export-success-headline">
-              {t('backupExportSuccessHeadline')}
-            </h2>
-
-            <p className="history-message__info" data-uie-name="status-history-export-success-info">
-              {t('backupExportSuccessSecondary')}
-            </p>
-
-            <div className="history-message__buttons">
-              <button className="button" onClick={downloadArchiveFile} data-uie-name="do-save-history-export">
-                {t('backupExportSaveFileAction')}
-              </button>
-            </div>
-          </div>
-
-          <button
-            type="button"
-            className="cancel-button accent-text"
-            onClick={dismissExport}
-            data-uie-name="do-cancel-history-export"
-          >
-            {t('backupCancel')}
-          </button>
-        </>
-      )}
-
-      {hasError && (
-        <div className="history-message" data-uie-name="status-history-export-error">
-          <h2 className="history-message__headline" data-uie-name="status-history-export-error-headline">
-            {t('backupExportGenericErrorHeadline')}
-          </h2>
-
-          <p className="history-message__info" data-uie-name="status-history-export-error-info">
-            {t('backupExportGenericErrorSecondary')}
-          </p>
-
-          <div className="history-message__buttons">
-            <button
-              className="button button-inverted"
-              onClick={exportHistory}
-              data-uie-name="do-try-again-history-export-error"
-            >
-              {t('backupTryAgain')}
-            </button>
-
-            <button className="button" data-uie-name="do-dismiss-history-export-error" onClick={dismissExport}>
-              {t('backupCancel')}
-            </button>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export {HistoryExport};
+export * from './HistoryExport';
diff --git a/src/script/components/HistoryImport/BackupFileUpload.tsx b/src/script/components/HistoryImport/BackupFileUpload.tsx
new file mode 100644
index 00000000000..ba69d806e22
--- /dev/null
+++ b/src/script/components/HistoryImport/BackupFileUpload.tsx
@@ -0,0 +1,77 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useRef} from 'react';
+
+import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
+
+import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
+
+import {CONFIG as HistoryExportConfig} from 'Components/HistoryExport';
+import {handleKeyDown} from 'Util/KeyboardUtil';
+
+interface BackupFileUploadProps {
+  onFileChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+  backupImportHeadLine: string;
+  variant: ButtonVariant;
+  cssClassName?: string;
+}
+
+const BackupFileUpload = ({
+  onFileChange,
+  backupImportHeadLine,
+  variant,
+  cssClassName = 'button button-secondary',
+}: BackupFileUploadProps) => {
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const fileInputClick = () => fileInputRef.current?.click();
+
+  return (
+    <>
+      <label className="preferences-history-backup-import-field" data-uie-name="do-backup-import" id="do-backup-import">
+        <input
+          id="file-import-input"
+          ref={fileInputRef}
+          tabIndex={TabIndex.UNFOCUSABLE}
+          type="file"
+          accept={`.${HistoryExportConfig.FILE_EXTENSION}`}
+          onChange={onFileChange}
+          onFocus={({target}) => target.blur()}
+          data-uie-name="input-import-file"
+          aria-describedby="preferences-history-describe-2"
+        />
+      </label>
+
+      <Button
+        variant={variant}
+        className={cssClassName}
+        role="button"
+        tabIndex={TabIndex.FOCUSABLE}
+        onKeyDown={event => handleKeyDown(event, fileInputClick)}
+        onClick={() => fileInputRef.current?.click()}
+        aria-labelledby="do-backup-import"
+      >
+        <span>{backupImportHeadLine}</span>
+      </Button>
+    </>
+  );
+};
+
+export {BackupFileUpload};
diff --git a/src/script/components/HistoryImport/HistoryImport.tsx b/src/script/components/HistoryImport/HistoryImport.tsx
new file mode 100644
index 00000000000..1e32ead0480
--- /dev/null
+++ b/src/script/components/HistoryImport/HistoryImport.tsx
@@ -0,0 +1,271 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect, useState} from 'react';
+
+import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
+
+import {Icon} from 'Components/Icon';
+import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {User} from 'src/script/entity/User';
+import {ContentState} from 'src/script/page/useAppState';
+import {checkBackupEncryption} from 'Util/BackupUtil';
+import {t} from 'Util/LocalizerUtil';
+import {getLogger} from 'Util/Logger';
+import {loadFileBuffer} from 'Util/util';
+
+import {BackupFileUpload} from './BackupFileUpload';
+
+import {BackupRepository} from '../../backup/BackupRepository';
+import {
+  CancelError,
+  DifferentAccountError,
+  IncompatibleBackupError,
+  IncompatibleBackupFormatError,
+  InvalidPassword,
+} from '../../backup/Error';
+import {Config} from '../../Config';
+import {MotionDuration} from '../../motion/MotionDuration';
+
+export enum HistoryImportState {
+  DONE = 'HistoryImportState.STATE.DONE',
+  IMPORTING = 'HistoryImportState.STATE.IMPORTING',
+  PREPARING = 'HistoryImportState.STATE.PREPARING',
+}
+
+interface HistoryImportProps {
+  readonly backupRepository: BackupRepository;
+  file: File;
+  switchContent: (contentState: ContentState) => void;
+  user: User;
+}
+
+const HistoryImport = ({user, backupRepository, file, switchContent}: HistoryImportProps) => {
+  const logger = getLogger('HistoryImportViewModel');
+
+  const [historyImportState, setHistoryImportState] = useState(HistoryImportState.PREPARING);
+  const [error, setError] = useState<Error | null>(null);
+  const [errorHeadline, setErrorHeadline] = useState('');
+  const [errorSecondary, setErrorSecondary] = useState('');
+
+  const [numberOfRecords, setNumberOfRecords] = useState<number>(0);
+  const [numberOfProcessedRecords, setNumberOfProcessedRecords] = useState<number>(0);
+  const loadingProgress = Math.floor((numberOfProcessedRecords / numberOfRecords) * 100);
+
+  const isPreparing = !error && historyImportState === HistoryImportState.PREPARING;
+  const isImporting = !error && historyImportState === HistoryImportState.IMPORTING;
+  const isDone = !error && historyImportState === HistoryImportState.DONE;
+
+  const replacements = {
+    processed: numberOfProcessedRecords.toString(),
+    progress: loadingProgress.toString(),
+    total: numberOfRecords.toString(),
+  };
+
+  const historyImportMessages: Partial<Record<HistoryImportState, string>> = {
+    [HistoryImportState.PREPARING]: t('backupImportProgressHeadline'),
+    [HistoryImportState.IMPORTING]: t('backupImportProgressSecondary', replacements),
+  };
+
+  const loadingMessage = historyImportMessages?.[historyImportState] || '';
+
+  const onCancel = () => backupRepository.cancelAction();
+
+  const dismissImport = () => {
+    switchContent(ContentState.PREFERENCES_ACCOUNT);
+  };
+
+  const onInit = (numberOfRecords: number) => {
+    setHistoryImportState(HistoryImportState.IMPORTING);
+    setNumberOfRecords(numberOfRecords);
+    setNumberOfProcessedRecords(0);
+  };
+
+  const onProgress = (numberProcessed: number) => setNumberOfProcessedRecords(prevState => prevState + numberProcessed);
+
+  const onSuccess = (): void => {
+    setError(null);
+    setHistoryImportState(HistoryImportState.DONE);
+
+    window.setTimeout(dismissImport, MotionDuration.X_LONG * 2);
+  };
+
+  const onError = (error: Error) => {
+    if (error instanceof CancelError) {
+      logger.log('History import was cancelled');
+      dismissImport();
+
+      return;
+    }
+
+    setError(error);
+    logger.error(`Failed to import history: ${error.message}`, error);
+
+    if (error instanceof DifferentAccountError) {
+      setErrorHeadline(t('backupImportAccountErrorHeadline'));
+      setErrorSecondary(t('backupImportAccountErrorSecondary'));
+    } else if (error instanceof IncompatibleBackupError) {
+      setErrorHeadline(t('backupImportVersionErrorHeadline'));
+      setErrorSecondary(t('backupImportVersionErrorSecondary', Config.getConfig().BRAND_NAME));
+    } else if (error instanceof IncompatibleBackupFormatError) {
+      setErrorHeadline(t('backupImportFormatErrorHeadline'));
+      setErrorSecondary(t('backupImportFormatErrorSecondary'));
+    } else if (error instanceof InvalidPassword) {
+      setErrorHeadline(t('backupImportPasswordErrorHeadline'));
+      setErrorSecondary(t('backupImportPasswordErrorSecondary'));
+    } else {
+      setErrorHeadline(t('backupImportGenericErrorHeadline'));
+      setErrorSecondary(t('backupImportGenericErrorSecondary'));
+    }
+  };
+
+  const getBackUpPassword = (): Promise<string> => {
+    return new Promise(resolve => {
+      PrimaryModal.show(PrimaryModal.type.PASSWORD_ADVANCED_SECURITY, {
+        primaryAction: {
+          action: async (password: string) => {
+            resolve(password);
+          },
+          text: t('backupDecryptionModalAction'),
+        },
+        secondaryAction: [
+          {
+            action: () => {
+              resolve('');
+              dismissImport();
+            },
+            text: t('backupEncryptionModalCloseBtn'),
+          },
+        ],
+        passwordOptional: false,
+        text: {
+          closeBtnLabel: t('backupEncryptionModalCloseBtn'),
+          input: t('backupDecryptionModalPlaceholder'),
+          message: t('backupDecryptionModalMessage'),
+          title: t('backupDecryptionModalTitle'),
+        },
+      });
+    });
+  };
+
+  const importHistory = async (file: File) => {
+    const isEncrypted = await checkBackupEncryption(file);
+
+    if (isEncrypted) {
+      const password = await getBackUpPassword();
+
+      if (password) {
+        await processHistoryImport(file, password);
+      }
+    } else {
+      await processHistoryImport(file);
+    }
+  };
+
+  const processHistoryImport = async (file: File, password?: string) => {
+    setHistoryImportState(HistoryImportState.PREPARING);
+    setError(null);
+
+    const data = await loadFileBuffer(file);
+
+    try {
+      await backupRepository.importHistory(user, data, onInit, onProgress, password);
+      onSuccess();
+    } catch (error) {
+      onError(error as Error);
+    }
+  };
+
+  useEffect(() => {
+    importHistory(file);
+  }, []);
+
+  const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      setError(null);
+      await importHistory(file);
+    }
+  };
+
+  return (
+    <div style={{height: '100%'}}>
+      <h2 className="visually-hidden">{t('accessibility.headings.historyImport')}</h2>
+
+      <div id="history-import">
+        {isPreparing && <LoadingBar progress={loadingProgress} message={loadingMessage} />}
+
+        {isImporting && (
+          <>
+            <LoadingBar progress={loadingProgress} message={loadingMessage} className="with-cancel" />
+
+            <button
+              type="button"
+              className="cancel-button accent-text"
+              onClick={onCancel}
+              data-uie-name="do-cancel-history-import"
+            >
+              {t('backupCancel')}
+            </button>
+          </>
+        )}
+
+        {isDone && (
+          <div className="history-message">
+            <Icon.Check />
+            <h2 className="history-message__headline" data-uie-name="status-history-import-success">
+              {t('backupImportSuccessHeadline')}
+            </h2>
+          </div>
+        )}
+
+        {error && (
+          <div className="history-message">
+            <h2 className="history-message__headline" data-uie-name="status-history-import-error-headline">
+              {errorHeadline}
+            </h2>
+
+            <p className="history-message__info" data-uie-name="status-history-import-error-info">
+              {errorSecondary}
+            </p>
+
+            <div className="history-message__buttons">
+              <Button
+                variant={ButtonVariant.SECONDARY}
+                className="button button-secondary"
+                onClick={dismissImport}
+                data-uie-name="do-dismiss-history-import-error"
+              >
+                {t('backupCancel')}
+              </Button>
+              <BackupFileUpload
+                onFileChange={handleFileChange}
+                backupImportHeadLine={t('preferencesOptionsBackupTryAgain')}
+                variant={ButtonVariant.PRIMARY}
+              />
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export {HistoryImport};
diff --git a/src/script/components/HistoryImport/index.tsx b/src/script/components/HistoryImport/index.tsx
index 37d1e823d94..bb683232cc1 100644
--- a/src/script/components/HistoryImport/index.tsx
+++ b/src/script/components/HistoryImport/index.tsx
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,176 +17,4 @@
  *
  */
 
-import {FC, useEffect, useState} from 'react';
-
-import {Icon} from 'Components/Icon';
-import {LoadingBar} from 'Components/LoadingBar/LoadingBar';
-import {User} from 'src/script/entity/User';
-import {ContentState} from 'src/script/page/useAppState';
-import {t} from 'Util/LocalizerUtil';
-import {getLogger} from 'Util/Logger';
-import {loadFileBuffer} from 'Util/util';
-
-import {BackupRepository} from '../../backup/BackupRepository';
-import {CancelError, DifferentAccountError, IncompatibleBackupError} from '../../backup/Error';
-import {Config} from '../../Config';
-import {MotionDuration} from '../../motion/MotionDuration';
-
-export enum HistoryImportState {
-  DONE = 'HistoryImportState.STATE.DONE',
-  IMPORTING = 'HistoryImportState.STATE.IMPORTING',
-  PREPARING = 'HistoryImportState.STATE.PREPARING',
-}
-
-interface HistoryImportProps {
-  readonly backupRepository: BackupRepository;
-  file: File;
-  switchContent: (contentState: ContentState) => void;
-  user: User;
-}
-
-const HistoryImport: FC<HistoryImportProps> = ({user, backupRepository, file, switchContent}) => {
-  const logger = getLogger('HistoryImportViewModel');
-
-  const [historyImportState, setHistoryImportState] = useState(HistoryImportState.PREPARING);
-  const [error, setError] = useState<Error | null>(null);
-  const [errorHeadline, setErrorHeadline] = useState('');
-  const [errorSecondary, setErrorSecondary] = useState('');
-
-  const [numberOfRecords, setNumberOfRecords] = useState<number>(0);
-  const [numberOfProcessedRecords, setNumberOfProcessedRecords] = useState<number>(0);
-  const loadingProgress = Math.floor((numberOfProcessedRecords / numberOfRecords) * 100);
-
-  const isPreparing = !error && historyImportState === HistoryImportState.PREPARING;
-  const isImporting = !error && historyImportState === HistoryImportState.IMPORTING;
-  const isDone = !error && historyImportState === HistoryImportState.DONE;
-
-  const replacements = {
-    processed: numberOfProcessedRecords.toString(),
-    progress: loadingProgress.toString(),
-    total: numberOfRecords.toString(),
-  };
-
-  const historyImportMessages: Partial<Record<HistoryImportState, string>> = {
-    [HistoryImportState.PREPARING]: t('backupImportProgressHeadline'),
-    [HistoryImportState.IMPORTING]: t('backupImportProgressSecondary', replacements),
-  };
-
-  const loadingMessage = historyImportMessages?.[historyImportState] || '';
-
-  const onCancel = () => backupRepository.cancelAction();
-
-  const dismissImport = () => {
-    switchContent(ContentState.PREFERENCES_ACCOUNT);
-  };
-
-  const onInit = (numberOfRecords: number) => {
-    setHistoryImportState(HistoryImportState.IMPORTING);
-    setNumberOfRecords(numberOfRecords);
-    setNumberOfProcessedRecords(0);
-  };
-
-  const onProgress = (numberProcessed: number) => setNumberOfProcessedRecords(prevState => prevState + numberProcessed);
-
-  const onSuccess = (): void => {
-    setError(null);
-    setHistoryImportState(HistoryImportState.DONE);
-
-    window.setTimeout(dismissImport, MotionDuration.X_LONG * 2);
-  };
-
-  const onError = (error: Error) => {
-    if (error instanceof CancelError) {
-      logger.log('History import was cancelled');
-      dismissImport();
-
-      return;
-    }
-
-    setError(error);
-    logger.error(`Failed to import history: ${error.message}`, error);
-
-    if (error instanceof DifferentAccountError) {
-      setErrorHeadline(t('backupImportAccountErrorHeadline'));
-      setErrorSecondary(t('backupImportAccountErrorSecondary'));
-    } else if (error instanceof IncompatibleBackupError) {
-      setErrorHeadline(t('backupImportVersionErrorHeadline'));
-      setErrorSecondary(t('backupImportVersionErrorSecondary', Config.getConfig().BRAND_NAME));
-    } else {
-      setErrorHeadline(t('backupImportGenericErrorHeadline'));
-      setErrorSecondary(t('backupImportGenericErrorSecondary'));
-    }
-  };
-
-  const importHistory = async (file: File) => {
-    setHistoryImportState(HistoryImportState.PREPARING);
-    setError(null);
-
-    const data = await loadFileBuffer(file);
-
-    try {
-      await backupRepository.importHistory(user, data, onInit, onProgress);
-      onSuccess();
-    } catch (error) {
-      onError(error as Error);
-    }
-  };
-
-  useEffect(() => {
-    importHistory(file);
-  }, []);
-
-  return (
-    <div style={{height: '100%'}}>
-      <h2 className="visually-hidden">{t('accessibility.headings.historyImport')}</h2>
-
-      <div id="history-import">
-        {isPreparing && <LoadingBar progress={loadingProgress} message={loadingMessage} />}
-
-        {isImporting && (
-          <>
-            <LoadingBar progress={loadingProgress} message={loadingMessage} className="with-cancel" />
-
-            <button
-              type="button"
-              className="cancel-button accent-text"
-              onClick={onCancel}
-              data-uie-name="do-cancel-history-import"
-            >
-              {t('backupCancel')}
-            </button>
-          </>
-        )}
-
-        {isDone && (
-          <div className="history-message">
-            <Icon.Check />
-            <h2 className="history-message__headline" data-uie-name="status-history-import-success">
-              {t('backupImportSuccessHeadline')}
-            </h2>
-          </div>
-        )}
-
-        {error && (
-          <div className="history-message">
-            <h2 className="history-message__headline" data-uie-name="status-history-import-error-headline">
-              {errorHeadline}
-            </h2>
-
-            <p className="history-message__info" data-uie-name="status-history-import-error-info">
-              {errorSecondary}
-            </p>
-
-            <div className="history-message__buttons">
-              <button className="button" onClick={dismissImport} data-uie-name="do-dismiss-history-import-error">
-                {t('backupCancel')}
-              </button>
-            </div>
-          </div>
-        )}
-      </div>
-    </div>
-  );
-};
-
-export {HistoryImport};
+export * from './HistoryImport';
diff --git a/src/script/components/InputBar/InputBar.test.tsx b/src/script/components/InputBar/InputBar.test.tsx
index b7cab7a0198..bf245ded4b5 100644
--- a/src/script/components/InputBar/InputBar.test.tsx
+++ b/src/script/components/InputBar/InputBar.test.tsx
@@ -24,7 +24,6 @@ import {withTheme} from 'src/script/auth/util/test/TestUtil';
 import {Config} from 'src/script/Config';
 import {PropertiesService} from 'src/script/properties/PropertiesService';
 import {SelfService} from 'src/script/self/SelfService';
-import {createMentionEntity, getMentionCandidate} from 'Util/MentionUtil';
 import {createUuid} from 'Util/uuid';
 
 import {TestFactory} from '../../../../test/helper/TestFactory';
@@ -46,18 +45,18 @@ let eventRepository: EventRepository;
 let searchRepository: SearchRepository;
 let storageRepository: StorageRepository;
 
-beforeAll(() => {
-  testFactory.exposeEventActors().then(factory => {
+beforeAll(async () => {
+  await testFactory.exposeEventActors().then(factory => {
     eventRepository = factory;
     return eventRepository;
   });
 
-  testFactory.exposeSearchActors().then(factory => {
+  await testFactory.exposeSearchActors().then(factory => {
     searchRepository = factory;
     return searchRepository;
   });
 
-  testFactory.exposeStorageActors().then(factory => {
+  await testFactory.exposeStorageActors().then(factory => {
     storageRepository = factory;
     return storageRepository;
   });
@@ -73,7 +72,7 @@ describe('InputBar', () => {
 
   const getDefaultProps = () => ({
     assetRepository: new AssetRepository(new AssetService()),
-    conversationEntity: new Conversation(createUuid()),
+    conversation: new Conversation(createUuid()),
     conversationRepository: {
       sendTypingStart: jest.fn(),
       sendTypingStop: jest.fn(),
@@ -102,35 +101,38 @@ describe('InputBar', () => {
     jest.clearAllMocks();
   });
 
-  const testMessage = 'Write custom text message';
+  const testMessage = 'text';
   const pngFile = new File(['(⌐□_□)'], 'wire-example-image.png', {type: 'image/png'});
 
   it('has passed value', async () => {
-    const promise = Promise.resolve();
     const props = getDefaultProps();
     const {getByTestId} = render(withTheme(<InputBar {...props} />));
-    await promise;
 
-    const textArea = getByTestId('input-message');
+    await new Promise(resolve => setTimeout(resolve));
+    const inputBar = getByTestId('input-message');
 
-    expect(textArea).not.toBeNull();
-    fireEvent.change(textArea!, {target: {value: testMessage}});
+    expect(inputBar).not.toBeNull();
 
-    await waitFor(() => {
-      expect((textArea as HTMLTextAreaElement).value).toBe(testMessage);
+    await act(async () => {
+      fireEvent.input(inputBar, {data: testMessage});
     });
+
+    expect(inputBar.textContent).toBe(testMessage);
   });
 
-  it('typing request is sent if the typing indicator mode is enabled and user is typing', async () => {
+  it.skip('typing request is sent if the typing indicator mode is enabled and user is typing', async () => {
     const props = getDefaultProps();
-    const {getByTestId} = render(withTheme(<InputBar {...props} />));
-    const textArea = getByTestId('input-message');
+    const {getByTestId, container} = render(withTheme(<InputBar {...props} />));
+    const inputBar = getByTestId('input-message');
 
-    expect(textArea).not.toBeNull();
-    fireEvent.change(textArea!, {target: {value: testMessage}});
+    fireEvent.keyDown(container, {key: 'Enter', code: 'Enter'});
+    act(() => {
+      fireEvent.input(inputBar, {data: testMessage});
+      fireEvent.keyPress(inputBar, {key: 'Enter', code: 'Enter'});
+    });
 
     await waitFor(() => {
-      expect((textArea as HTMLTextAreaElement).value).toBe(testMessage);
+      expect(inputBar.textContent).toBe(testMessage);
     });
 
     const property = PropertiesRepository.CONFIG.WIRE_TYPING_INDICATOR_MODE;
@@ -143,7 +145,7 @@ describe('InputBar', () => {
   it('typing request is not sent when user is typing but the typing indicator mode is disabled', async () => {
     const props = getDefaultProps();
     const {getByTestId} = render(withTheme(<InputBar {...props} />));
-    const textArea = getByTestId('input-message');
+    const inputBar = getByTestId('input-message');
     const property = PropertiesRepository.CONFIG.WIRE_TYPING_INDICATOR_MODE;
     const defaultValue = property.defaultValue;
 
@@ -152,11 +154,13 @@ describe('InputBar', () => {
     });
     expect(propertiesRepository.typingIndicatorMode()).not.toBe(defaultValue);
 
-    expect(textArea).not.toBeNull();
-    fireEvent.change(textArea!, {target: {value: testMessage}});
+    await new Promise(resolve => setTimeout(resolve));
+    await act(async () => {
+      fireEvent.input(inputBar, {data: testMessage});
+    });
 
     await waitFor(() => {
-      expect((textArea as HTMLTextAreaElement).value).toBe(testMessage);
+      expect(inputBar.textContent).toBe(testMessage);
     });
     expect(props.conversationRepository.sendTypingStart).not.toHaveBeenCalled();
     expect(props.conversationRepository.sendTypingStop).not.toHaveBeenCalled();
@@ -165,14 +169,15 @@ describe('InputBar', () => {
   it('has pasted image', async () => {
     const promise = Promise.resolve();
     const props = getDefaultProps();
-    const {container} = render(withTheme(<InputBar {...props} />));
+    const {getByTestId, queryByTestId} = render(withTheme(<InputBar {...props} />));
     await promise;
 
-    const textArea = await container.querySelector('textarea[data-uie-name="input-message"]');
+    const textArea = getByTestId('input-message');
 
     expect(textArea).not.toBeNull();
+    expect(queryByTestId('pasted-file-controls')).toBeNull();
 
-    fireEvent.paste(textArea!, {
+    fireEvent.paste(document, {
       clipboardData: {
         files: [pngFile],
         types: ['image/png'],
@@ -180,25 +185,8 @@ describe('InputBar', () => {
     });
 
     await waitFor(() => {
-      const pastedFileControls = container.querySelector('[data-uie-name="pasted-file-controls"]');
+      const pastedFileControls = getByTestId('pasted-file-controls');
       expect(pastedFileControls).toBeDefined();
     });
   });
-
-  it('matches multibyte characters in mentioned user names', () => {
-    const selectionStart = 5;
-    const selectionEnd = 5;
-    const inputValue = 'Hi @p';
-    const userName = 'rzemvs';
-
-    const mentionCandidate = getMentionCandidate([], selectionStart, selectionEnd, inputValue);
-
-    const userEntity = new User(createUuid());
-    userEntity.name(userName);
-
-    const mentionEntity = createMentionEntity(userEntity, mentionCandidate);
-
-    expect(mentionEntity?.startIndex).toBe(3);
-    expect(mentionEntity?.length).toBe(7);
-  });
 });
diff --git a/src/script/components/InputBar/InputBar.tsx b/src/script/components/InputBar/InputBar.tsx
index 1656ead6068..14b5c8cdbc1 100644
--- a/src/script/components/InputBar/InputBar.tsx
+++ b/src/script/components/InputBar/InputBar.tsx
@@ -17,10 +17,11 @@
  *
  */
 
-import {ChangeEvent, FormEvent, KeyboardEvent as ReactKeyboardEvent, useEffect, useRef, useState} from 'react';
+import {useCallback, useEffect, useRef, useState} from 'react';
 
 import {amplify} from 'amplify';
 import cx from 'classnames';
+import {CLEAR_EDITOR_COMMAND, LexicalEditor} from 'lexical';
 import {container} from 'tsyringe';
 
 import {useMatchMedia} from '@wireapp/react-ui-kit';
@@ -28,45 +29,36 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
 import {checkFileSharingPermission} from 'Components/Conversation/utils/checkFileSharingPermission';
-import {useEmoji} from 'Components/Emoji/useEmoji';
-import {Icon} from 'Components/Icon';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {ConversationClassifiedBar} from 'Components/input/ClassifiedBar';
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
 import {showWarningModal} from 'Components/Modals/utils/showWarningModal';
+import {RichTextContent, RichTextEditor} from 'Components/RichTextEditor';
+import {SendMessageButton} from 'Components/RichTextEditor/components/SendMessageButton';
 import {ConversationRepository} from 'src/script/conversation/ConversationRepository';
+import {useUserPropertyValue} from 'src/script/hooks/useUserProperty';
 import {PropertiesRepository} from 'src/script/properties/PropertiesRepository';
+import {PROPERTIES_TYPE} from 'src/script/properties/PropertiesType';
 import {CONVERSATION_TYPING_INDICATOR_MODE} from 'src/script/user/TypingIndicatorMode';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
-import {loadDraftState, saveDraftState} from 'Util/DraftStateUtil';
-import {insertAtCaret, isFunctionKey, isTabKey, KEY} from 'Util/KeyboardUtil';
+import {KEY} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
-import {
-  createMentionEntity,
-  detectMentionEdgeDeletion,
-  getMentionCandidate,
-  updateMentionRanges,
-} from 'Util/MentionUtil';
-import {formatDuration, formatLocale, TIME_IN_MILLIS} from 'Util/TimeUtil';
-import {getFileExtension, getSelectionPosition} from 'Util/util';
+import {formatLocale, TIME_IN_MILLIS} from 'Util/TimeUtil';
+import {getFileExtension} from 'Util/util';
 
 import {ControlButtons} from './components/InputBarControls/ControlButtons';
 import {GiphyButton} from './components/InputBarControls/GiphyButton';
-import {MentionSuggestionList} from './components/MentionSuggestions';
 import {PastedFileControls} from './components/PastedFileControls';
 import {ReplyBar} from './components/ReplyBar';
-import {TYPING_TIMEOUT} from './components/TypingIndicator';
 import {TypingIndicator} from './components/TypingIndicator/TypingIndicator';
-import {getRichTextInput} from './getRichTextInput';
 import {useFilePaste} from './hooks/useFilePaste';
-import {useResizeTarget} from './hooks/useResizeTarget';
-import {useScrollSync} from './hooks/useScrollSync';
-import {useTextAreaFocus} from './hooks/useTextAreaFocus';
+import {useTypingIndicator} from './hooks/useTypingIndicator';
 import {handleClickOutsideOfInputBar, IgnoreOutsideClickWrapper} from './util/clickHandlers';
+import {loadDraftState, saveDraftState} from './util/DraftStateUtil';
 
 import {Config} from '../../Config';
 import {MessageRepository, OutgoingQuote} from '../../conversation/MessageRepository';
 import {Conversation} from '../../entity/Conversation';
 import {ContentMessage} from '../../entity/message/ContentMessage';
-import {Text as TextAsset} from '../../entity/message/Text';
 import {User} from '../../entity/User';
 import {ConversationError} from '../../error/ConversationError';
 import {EventRepository} from '../../event/EventRepository';
@@ -83,8 +75,12 @@ const CONFIG = {
   PING_TIMEOUT: TIME_IN_MILLIS.SECOND * 2,
 };
 
+const config = {
+  GIPHY_TEXT_LENGTH: 256,
+};
+
 interface InputBarProps {
-  readonly conversationEntity: Conversation;
+  readonly conversation: Conversation;
   readonly conversationRepository: ConversationRepository;
   readonly eventRepository: EventRepository;
   readonly messageRepository: MessageRepository;
@@ -102,8 +98,8 @@ interface InputBarProps {
 
 const conversationInputBarClassName = 'conversation-input-bar';
 
-const InputBar = ({
-  conversationEntity,
+export const InputBar = ({
+  conversation,
   conversationRepository,
   eventRepository,
   messageRepository,
@@ -124,17 +120,13 @@ const InputBar = ({
   );
   const {
     connection,
-    participating_user_ets: participatingUserEts,
-    allUserEntities: allUsers,
     localMessageTimer,
     messageTimer,
     hasGlobalMessageTimer,
     removed_from_conversation: removedFromConversation,
-  } = useKoSubscribableChildren(conversationEntity, [
+    is1to1,
+  } = useKoSubscribableChildren(conversation, [
     'connection',
-    'firstUserEntity',
-    'allUserEntities',
-    'participating_user_ets',
     'localMessageTimer',
     'messageTimer',
     'hasGlobalMessageTimer',
@@ -146,23 +138,27 @@ const InputBar = ({
     'isIncomingRequest',
   ]);
 
+  // Lexical
+  const editorRef = useRef<LexicalEditor | null>(null);
+
+  // Typing indicator
   const {typingIndicatorMode} = useKoSubscribableChildren(propertiesRepository, ['typingIndicatorMode']);
   const isTypingIndicatorEnabled = typingIndicatorMode === CONVERSATION_TYPING_INDICATOR_MODE.ON;
-  const shadowInputRef = useRef<HTMLDivElement>(null);
-  const textareaRef = useRef<HTMLTextAreaElement>(null);
 
-  const [editMessageEntity, setEditMessageEntity] = useState<ContentMessage | null>(null);
+  // Message
+  /** the messageContent represents the message being edited. It's directly derived from the editor state */
+  const [messageContent, setMessageContent] = useState<RichTextContent>({text: ''});
+  const [editedMessage, setEditedMessage] = useState<ContentMessage | undefined>();
   const [replyMessageEntity, setReplyMessageEntity] = useState<ContentMessage | null>(null);
-  const [currentMentions, setCurrentMentions] = useState<MentionEntity[]>([]);
+  const textValue = messageContent.text;
+
+  // Files
   const [pastedFile, setPastedFile] = useState<File | null>(null);
-  const [inputValue, setInputValue] = useState<string>('');
-  const [selectionStart, setSelectionStart] = useState<number>(0);
-  const [selectionEnd, setSelectionEnd] = useState<number>(0);
+
+  // Common
   const [pingDisabled, setIsPingDisabled] = useState<boolean>(false);
-  const [isTyping, setIsTyping] = useState<boolean>(false);
-  const hasUserTyped = useRef<boolean>(false);
-  const [editedMention, setEditedMention] = useState<{startIndex: number; term: string} | undefined>(undefined);
 
+  // Right sidebar
   const {rightSidebar} = useAppMainState.getState();
   const lastItem = rightSidebar.history.length - 1;
   const currentState = rightSidebar.history[lastItem];
@@ -170,60 +166,45 @@ const InputBar = ({
 
   const inputPlaceholder = messageTimer ? t('tooltipConversationEphemeral') : t('tooltipConversationInputPlaceholder');
 
-  const candidates = participatingUserEts.filter(userEntity => !userEntity.isService);
-  const mentionSuggestions = editedMention ? searchRepository.searchUserInSet(editedMention.term, candidates) : [];
-
-  const isEditing = !!editMessageEntity;
+  const isEditing = !!editedMessage;
   const isReplying = !!replyMessageEntity;
   const isConnectionRequest = isOutgoingRequest || isIncomingRequest;
-  const hasLocalEphemeralTimer = isSelfDeletingMessagesEnabled && localMessageTimer && !hasGlobalMessageTimer;
-
-  const richTextInput = getRichTextInput(currentMentions, inputValue);
+  const hasLocalEphemeralTimer = isSelfDeletingMessagesEnabled && !!localMessageTimer && !hasGlobalMessageTimer;
 
   // To be changed when design chooses a breakpoint, the conditional can be integrated to the ui-kit directly
   const isScaledDown = useMatchMedia('max-width: 768px');
 
-  const config = {
-    GIPHY_TEXT_LENGTH: 256,
-  };
+  const showGiphyButton = textValue.length > 0 && textValue.length <= config.GIPHY_TEXT_LENGTH;
 
-  const showGiphyButton = inputValue.length > 0 && inputValue.length <= config.GIPHY_TEXT_LENGTH;
-
-  const updateSelectionState = (updateOnInit = true) => {
-    if (!updateOnInit) {
-      return;
-    }
-
-    if (!textareaRef.current) {
-      return;
-    }
-
-    const {selectionStart: start, selectionEnd: end} = textareaRef.current;
-    const {newEnd, newStart} = getSelectionPosition(textareaRef.current, currentMentions);
-
-    if (newStart !== start || newEnd !== end) {
-      textareaRef.current.selectionStart = newStart;
-      textareaRef.current.selectionEnd = newEnd;
-    }
-
-    setSelectionStart(newStart);
-    setSelectionEnd(newEnd);
-  };
+  const shouldReplaceEmoji = useUserPropertyValue(
+    () => propertiesRepository.getPreference(PROPERTIES_TYPE.EMOJI.REPLACE_INLINE),
+    WebAppEvents.PROPERTIES.UPDATE.EMOJI.REPLACE_INLINE,
+  );
 
-  const moveCursorToEnd = (endPosition: number, updateSelection = true) => {
-    updateSelectionState(updateSelection);
-    setTimeout(() => {
-      textareaRef.current?.setSelectionRange(endPosition, endPosition);
-      textareaRef.current?.focus();
-    }, 0);
+  // Mentions
+  const getMentionCandidates = (search?: string | null) => {
+    const candidates = conversation.participating_user_ets().filter(userEntity => !userEntity.isService);
+    return typeof search === 'string' ? searchRepository.searchUserInSet(search, candidates) : candidates;
   };
 
-  const resetDraftState = (resetInputValue = false) => {
-    setCurrentMentions([]);
+  useTypingIndicator({
+    isEnabled: isTypingIndicatorEnabled,
+    text: textValue,
+    onTypingChange: useCallback(
+      isTyping => {
+        if (isTyping) {
+          void conversationRepository.sendTypingStart(conversation);
+        } else {
+          void conversationRepository.sendTypingStop(conversation);
+        }
+      },
+      [conversationRepository, conversation],
+    ),
+  });
 
-    if (resetInputValue) {
-      setInputValue('');
-    }
+  const resetDraftState = () => {
+    setReplyMessageEntity(null);
+    editorRef.current?.dispatchCommand(CLEAR_EDITOR_COMMAND, undefined);
   };
 
   const clearPastedFile = () => setPastedFile(null);
@@ -235,56 +216,6 @@ const InputBar = ({
     }
   };
 
-  const endMentionFlow = () => {
-    setEditedMention(undefined);
-    updateSelectionState();
-  };
-
-  const addMention = (userEntity: User) => {
-    const mentionEntity = createMentionEntity(userEntity, editedMention);
-
-    if (mentionEntity && editedMention) {
-      // keep track of what is before and after the mention being edited
-      const beforeMentionPartial = inputValue.slice(0, mentionEntity.startIndex);
-      const afterMentionPartial = inputValue
-        .slice(mentionEntity.startIndex + editedMention.term.length + 1)
-        .replace(/^ /, '');
-
-      const newInputValue = `${beforeMentionPartial}@${userEntity.name()} ${afterMentionPartial}`;
-      // insert the mention in between
-      setInputValue(newInputValue);
-
-      const currentValueLength = newInputValue.length;
-      const inputValueLength = inputValue.length;
-      const difference = currentValueLength - inputValueLength;
-
-      const updatedMentions = updateMentionRanges(currentMentions, selectionStart, selectionEnd, difference);
-      const newMentions = [...updatedMentions, mentionEntity];
-      const sortedMentions = newMentions.sort((mentionA, mentionB) => mentionA.startIndex - mentionB.startIndex);
-      setCurrentMentions(sortedMentions);
-
-      const caretPosition = mentionEntity.endIndex + 1;
-
-      setEditedMention(undefined);
-      setSelectionStart(caretPosition);
-      setSelectionEnd(caretPosition);
-
-      // Need to use setTimeout, because the setSelectionRange works asynchronously
-      setTimeout(() => {
-        textareaRef.current?.setSelectionRange(caretPosition, caretPosition);
-        textareaRef.current?.focus();
-      }, 0);
-    }
-  };
-
-  const handleMentionFlow = (event: ReactKeyboardEvent<HTMLTextAreaElement> | FormEvent<HTMLTextAreaElement>) => {
-    const {selectionStart: start, selectionEnd: end, value} = event.currentTarget;
-    const mentionCandidate = getMentionCandidate(currentMentions, start, end, value);
-
-    setEditedMention(mentionCandidate);
-    updateSelectionState();
-  };
-
   const cancelMessageReply = (resetDraft = true) => {
     setReplyMessageEntity(null);
 
@@ -293,181 +224,53 @@ const InputBar = ({
     }
   };
 
-  const cancelMessageEditing = (resetDraft = true, resetInputValue = false) => {
-    setEditMessageEntity(null);
+  useEffect(() => {
+    amplify.subscribe(WebAppEvents.CONVERSATION.MESSAGE.EDIT, (messageEntity: ContentMessage) => {
+      editMessage(messageEntity);
+    });
+
+    return () => {
+      amplify.unsubscribeAll(WebAppEvents.CONVERSATION.MESSAGE.EDIT);
+    };
+  });
+
+  const cancelMessageEditing = (resetDraft = true) => {
+    setEditedMessage(undefined);
     setReplyMessageEntity(null);
 
     if (resetDraft) {
-      resetDraftState(resetInputValue);
+      resetDraftState();
     }
   };
 
   const handleCancelReply = () => {
-    if (!mentionSuggestions.length) {
-      cancelMessageReply(false);
-    }
-
-    textareaRef.current?.focus();
+    cancelMessageReply(false);
   };
 
-  const editMessage = (messageEntity: ContentMessage) => {
-    if (messageEntity?.isEditable() && messageEntity !== editMessageEntity) {
-      const firstAsset = messageEntity.getFirstAsset() as TextAsset;
-      const newMentions = firstAsset.mentions().slice();
-
+  const editMessage = (messageEntity?: ContentMessage) => {
+    if (messageEntity?.isEditable() && messageEntity !== editedMessage) {
       cancelMessageReply();
-      cancelMessageEditing(true, true);
-      setEditMessageEntity(messageEntity);
-      setInputValue(firstAsset.text);
-      setCurrentMentions(newMentions);
-
-      if (messageEntity.quote() && conversationEntity) {
-        messageRepository
-          .getMessageInConversationById(conversationEntity, messageEntity.quote().messageId)
+      cancelMessageEditing(true);
+      setEditedMessage(messageEntity);
+
+      if (messageEntity.quote() && conversation) {
+        void messageRepository
+          .getMessageInConversationById(conversation, messageEntity.quote().messageId)
           .then(quotedMessage => setReplyMessageEntity(quotedMessage));
       }
     }
   };
 
-  useEffect(() => {
-    if (editMessageEntity?.isEditable()) {
-      const firstAsset = editMessageEntity.getFirstAsset() as TextAsset;
-      moveCursorToEnd(firstAsset.text.length);
-    }
-  }, [editMessageEntity]); // eslint-disable-line react-hooks/exhaustive-deps
-
-  useEffect(() => {
-    if (!hasUserTyped.current || !isTypingIndicatorEnabled) {
-      return;
-    }
-    if (isTyping) {
-      conversationRepository.sendTypingStart(conversationEntity);
-    } else {
-      conversationRepository.sendTypingStop(conversationEntity);
-    }
-  }, [isTyping, conversationRepository, conversationEntity, isTypingIndicatorEnabled]);
-
-  useEffect(() => {
-    if (!hasUserTyped.current) {
-      return () => {};
-    }
-    let timerId: number;
-    if (inputValue.length > 0) {
-      setIsTyping(true);
-      timerId = window.setTimeout(() => setIsTyping(false), TYPING_TIMEOUT);
-    } else {
-      setIsTyping(false);
-    }
-    return () => {
-      window.clearTimeout(timerId);
-    };
-  }, [inputValue]);
-
   const replyMessage = (messageEntity: ContentMessage): void => {
     if (messageEntity?.isReplyable() && messageEntity !== replyMessageEntity) {
       cancelMessageReply(false);
-      cancelMessageEditing(!!editMessageEntity);
+      cancelMessageEditing(!!editedMessage);
       setReplyMessageEntity(messageEntity);
 
-      textareaRef.current?.focus();
-    }
-  };
-
-  const updateMentions = (event: ReactKeyboardEvent<HTMLTextAreaElement>) => {
-    const textarea = event.currentTarget;
-    const value = textarea.value;
-    const lengthDifference = value.length - inputValue.length;
-
-    const edgeMention = detectMentionEdgeDeletion(
-      textarea,
-      currentMentions,
-      selectionStart,
-      selectionEnd,
-      lengthDifference,
-    );
-
-    if (edgeMention) {
-      textarea.value = inputValue;
-      textarea.selectionStart = edgeMention.startIndex;
-      textarea.selectionEnd = edgeMention.endIndex;
+      editorRef.current?.focus();
     }
   };
 
-  const onTextAreaKeyDown = (keyboardEvent: ReactKeyboardEvent<HTMLTextAreaElement>): void | boolean => {
-    const inputHandledByEmoji = !editedMention && emojiKeyDown(keyboardEvent);
-    // shift+tab from message input bar set last focused message's elements non focusable
-    if (keyboardEvent.shiftKey && isTabKey(keyboardEvent)) {
-      onShiftTab();
-    }
-    if (!inputHandledByEmoji) {
-      switch (keyboardEvent.key) {
-        case KEY.ARROW_UP: {
-          if (!isFunctionKey(keyboardEvent) && !inputValue.length) {
-            editMessage(conversationEntity.getLastEditableMessage() as ContentMessage);
-            updateMentions(keyboardEvent);
-          }
-          break;
-        }
-        case KEY.ESC: {
-          if (mentionSuggestions.length) {
-            endMentionFlow();
-          } else if (pastedFile) {
-            setPastedFile(null);
-          } else if (isEditing) {
-            cancelMessageEditing(true, true);
-          } else if (isReplying) {
-            cancelMessageReply(false);
-          }
-          break;
-        }
-        case KEY.ENTER: {
-          if (!keyboardEvent.shiftKey && !keyboardEvent.altKey && !keyboardEvent.metaKey) {
-            keyboardEvent.preventDefault();
-            onSend(inputValue);
-          }
-
-          if (keyboardEvent.altKey || keyboardEvent.metaKey) {
-            if (keyboardEvent.target) {
-              keyboardEvent.preventDefault();
-              insertAtCaret(keyboardEvent.target.toString(), '\n');
-            }
-          }
-
-          break;
-        }
-
-        default:
-          break;
-      }
-
-      return true;
-    }
-  };
-
-  const onTextareaKeyUp = (keyboardEvent: ReactKeyboardEvent<HTMLTextAreaElement>): void => {
-    if (!editedMention) {
-      emojiKeyUp(keyboardEvent);
-    }
-
-    if (keyboardEvent.key !== KEY.ESC) {
-      handleMentionFlow(keyboardEvent);
-    }
-  };
-
-  const onChange = (event: ChangeEvent<HTMLTextAreaElement>) => {
-    event.preventDefault();
-
-    const {value: currentValue} = event.currentTarget;
-    hasUserTyped.current = true;
-    setInputValue(currentValue);
-    const currentValueLength = currentValue.length;
-    const previousValueLength = inputValue.length;
-    const difference = currentValueLength - previousValueLength;
-
-    const updatedMentions = updateMentionRanges(currentMentions, selectionStart, selectionEnd, difference);
-    setCurrentMentions(updatedMentions);
-  };
-
   const generateQuote = (): Promise<OutgoingQuote | undefined> => {
     return !replyMessageEntity
       ? Promise.resolve(undefined)
@@ -483,48 +286,45 @@ const InputBar = ({
           });
   };
 
-  const sendMessage = (messageText: string, mentions: MentionEntity[]) => {
-    if (messageText.length) {
-      const mentionEntities = mentions.slice(0);
-
-      generateQuote().then(quoteEntity => {
-        messageRepository.sendTextWithLinkPreview(conversationEntity, messageText, mentionEntities, quoteEntity);
-        cancelMessageReply();
-      });
-    }
-  };
-
   const sendMessageEdit = (messageText: string, mentions: MentionEntity[]): void | Promise<any> => {
     const mentionEntities = mentions.slice(0);
-    cancelMessageEditing(true, true);
+    cancelMessageEditing(true);
 
-    if (!messageText.length && editMessageEntity) {
-      return messageRepository.deleteMessageForEveryone(conversationEntity, editMessageEntity);
+    if (!messageText.length && editedMessage) {
+      return messageRepository.deleteMessageForEveryone(conversation, editedMessage);
     }
 
-    if (editMessageEntity) {
-      messageRepository
-        .sendMessageEdit(conversationEntity, messageText, editMessageEntity, mentionEntities)
-        .catch(error => {
-          if (error.type !== ConversationError.TYPE.NO_MESSAGE_CHANGES) {
-            throw error;
-          }
-        });
+    if (editedMessage) {
+      messageRepository.sendMessageEdit(conversation, messageText, editedMessage, mentionEntities).catch(error => {
+        if (error.type !== ConversationError.TYPE.NO_MESSAGE_CHANGES) {
+          throw error;
+        }
+      });
 
       cancelMessageReply();
     }
   };
 
-  const onSend = (text: string): void | boolean => {
+  const sendTextMessage = (messageText: string, mentions: MentionEntity[]) => {
+    if (messageText.length) {
+      const mentionEntities = mentions.slice(0);
+
+      void generateQuote().then(quoteEntity => {
+        void messageRepository.sendTextWithLinkPreview(conversation, messageText, mentionEntities, quoteEntity);
+        cancelMessageReply();
+      });
+    }
+  };
+
+  const sendMessage = (): void => {
     if (pastedFile) {
-      return sendPastedFile();
+      return void sendPastedFile();
     }
 
-    const beforeLength = text.length;
-    const messageTrimmedStart = text.trimLeft();
-    const trimmedStartLength = messageTrimmedStart.length;
-    const messageText = messageTrimmedStart.trimRight();
-    const isMessageTextTooLong = messageText.length > CONFIG.MAXIMUM_MESSAGE_LENGTH;
+    const messageTrimmedStart = textValue.trimStart();
+    const text = messageTrimmedStart.trimEnd();
+    const isMessageTextTooLong = text.length > CONFIG.MAXIMUM_MESSAGE_LENGTH;
+    const mentions = messageContent.mentions ?? [];
 
     if (isMessageTextTooLong) {
       showWarningModal(
@@ -535,48 +335,53 @@ const InputBar = ({
       return;
     }
 
-    const updatedMentions = updateMentionRanges(currentMentions, 0, 0, trimmedStartLength - beforeLength);
-
     if (isEditing) {
-      sendMessageEdit(messageText, updatedMentions);
+      void sendMessageEdit(text, mentions);
     } else {
-      sendMessage(messageText, updatedMentions);
+      sendTextMessage(text, mentions);
     }
-    /*
-      When trying to update a textarea with japanese value to
-      empty in onKeyDown handler the text is not fully cleared
-      and some parts of text is pasted by the OS/Browser after
-      we do setInputValue('');
-      To fix this we have to add a setTimeout in order to postpone
-      the operation of clearing the text to after of the proccess
-      of the onKeyDown and onKeyUp DOM events.
-    */
-    setTimeout(() => {
-      resetDraftState(true);
-    }, 0);
-    textareaRef.current?.focus();
+
+    editorRef.current?.focus();
+    resetDraftState();
   };
 
-  const {
-    onInputKeyDown: emojiKeyDown,
-    onInputKeyUp: emojiKeyUp,
-    renderEmojiComponent,
-  } = useEmoji(propertiesRepository, setInputValue, onSend, currentMentions, setCurrentMentions, textareaRef.current);
+  const onGifClick = () => openGiphy(textValue);
 
-  const onGifClick = () => openGiphy(inputValue);
+  const pingConversation = () => {
+    setIsPingDisabled(true);
+    void messageRepository.sendPing(conversation).then(() => {
+      window.setTimeout(() => setIsPingDisabled(false), CONFIG.PING_TIMEOUT);
+    });
+  };
 
   const onPingClick = () => {
-    if (conversationEntity && !pingDisabled) {
-      setIsPingDisabled(true);
+    if (pingDisabled) {
+      return;
+    }
 
-      messageRepository.sendPing(conversationEntity).then(() => {
-        window.setTimeout(() => setIsPingDisabled(false), CONFIG.PING_TIMEOUT);
+    const totalConversationUsers = conversation.participating_user_ets().length;
+    if (
+      !CONFIG.FEATURE.ENABLE_PING_CONFIRMATION ||
+      is1to1 ||
+      totalConversationUsers < CONFIG.FEATURE.MAX_USERS_TO_PING_WITHOUT_ALERT
+    ) {
+      pingConversation();
+    } else {
+      PrimaryModal.show(PrimaryModal.type.CONFIRM, {
+        primaryAction: {
+          action: pingConversation,
+          text: t('tooltipConversationPing'),
+        },
+        text: {
+          title: t('conversationPingConfirmTitle', {memberCount: totalConversationUsers.toString()}),
+        },
       });
     }
   };
 
   const handlePasteFiles = (files: FileList): void => {
     const [pastedFile] = files;
+
     if (!pastedFile) {
       return;
     }
@@ -592,54 +397,21 @@ const InputBar = ({
     setPastedFile(newFile);
   };
 
-  const loadInitialStateForConversation = async (): Promise<void> => {
-    setPastedFile(null);
-    cancelMessageEditing(true, true);
-    cancelMessageReply();
-    endMentionFlow();
-
-    if (conversationEntity) {
-      const previousSessionData = await loadDraftState(conversationEntity, storageRepository, messageRepository);
-
-      if (previousSessionData?.text) {
-        setInputValue(previousSessionData.text);
-
-        setSelectionStart(previousSessionData.text.length);
-        setSelectionEnd(previousSessionData.text.length);
-      }
-
-      if (previousSessionData?.mentions.length > 0) {
-        setCurrentMentions(previousSessionData.mentions);
-      }
-
-      if (previousSessionData.replyEntityPromise) {
-        previousSessionData.replyEntityPromise.then(replyEntity => {
-          if (replyEntity?.isReplyable()) {
-            setReplyMessageEntity(replyEntity);
-          }
-        });
-      }
-
-      moveCursorToEnd(previousSessionData.text.length, false);
-    }
-  };
-
   const sendGiphy = (gifUrl: string, tag: string): void => {
-    generateQuote().then(quoteEntity => {
-      messageRepository.sendGif(conversationEntity, gifUrl, tag, quoteEntity);
-      cancelMessageEditing(true, true);
+    void generateQuote().then(quoteEntity => {
+      void messageRepository.sendGif(conversation, gifUrl, tag, quoteEntity);
+      cancelMessageEditing(true);
     });
   };
 
   const onWindowClick = (event: Event): void =>
     handleClickOutsideOfInputBar(event, () => {
-      cancelMessageEditing(true, true);
+      cancelMessageEditing(true);
       cancelMessageReply();
     });
 
   useEffect(() => {
     amplify.subscribe(WebAppEvents.CONVERSATION.IMAGE.SEND, uploadImages);
-    amplify.subscribe(WebAppEvents.CONVERSATION.MESSAGE.EDIT, editMessage);
     amplify.subscribe(WebAppEvents.CONVERSATION.MESSAGE.REPLY, replyMessage);
     amplify.subscribe(WebAppEvents.EXTENSIONS.GIPHY.SEND, sendGiphy);
     amplify.subscribe(WebAppEvents.SHORTCUT.PING, onPingClick);
@@ -647,40 +419,28 @@ const InputBar = ({
     return () => {
       amplify.unsubscribeAll(WebAppEvents.SHORTCUT.PING);
       amplify.unsubscribeAll(WebAppEvents.CONVERSATION.IMAGE.SEND);
-      amplify.unsubscribeAll(WebAppEvents.CONVERSATION.MESSAGE.EDIT);
       amplify.unsubscribeAll(WebAppEvents.CONVERSATION.MESSAGE.REPLY);
       amplify.unsubscribeAll(WebAppEvents.EXTENSIONS.GIPHY.SEND);
     };
   }, []);
 
-  useEffect(() => {
-    hasUserTyped.current = false;
-    loadInitialStateForConversation();
-  }, [conversationEntity]);
+  const saveDraft = async (editorState: string) => {
+    await saveDraftState(storageRepository, conversation, editorState, replyMessageEntity?.id);
+  };
 
-  useEffect(() => {
-    if (!isEditing) {
-      saveDraftState(storageRepository, conversationEntity, {
-        mentions: currentMentions,
-        text: inputValue,
-        ...(replyMessageEntity && {reply: replyMessageEntity}),
+  const loadDraft = async () => {
+    const draftState = await loadDraftState(conversation, storageRepository, messageRepository);
+
+    if (draftState.messageReply) {
+      void draftState.messageReply.then(replyEntity => {
+        if (replyEntity?.isReplyable()) {
+          setReplyMessageEntity(replyEntity);
+        }
       });
     }
-  }, [isEditing, currentMentions, replyMessageEntity, inputValue]);
 
-  useTextAreaFocus(() => textareaRef.current?.focus());
-
-  useScrollSync(textareaRef.current, shadowInputRef.current, [
-    textareaRef.current,
-    shadowInputRef.current,
-    richTextInput,
-  ]);
-
-  useResizeTarget(shadowInputRef.current, textareaRef.current, [
-    textareaRef.current,
-    shadowInputRef.current,
-    richTextInput,
-  ]);
+    return draftState;
+  };
 
   const handleRepliedMessageDeleted = (messageId: string) => {
     if (replyMessageEntity?.id === messageId) {
@@ -736,30 +496,14 @@ const InputBar = ({
     };
   }, [pastedFile]);
 
-  const sendButton = (
-    <li>
-      <button
-        type="button"
-        className={cx('controls-right-button controls-right-button--send')}
-        disabled={inputValue.length === 0}
-        title={t('tooltipConversationSendMessage')}
-        aria-label={t('tooltipConversationSendMessage')}
-        onClick={() => onSend(inputValue)}
-        data-uie-name="do-send-message"
-      >
-        <Icon.Send />
-      </button>
-    </li>
-  );
-
   const controlButtonsProps = {
-    conversation: conversationEntity,
+    conversation: conversation,
     disableFilesharing: !isFileSharingSendingEnabled,
     disablePing: pingDisabled,
-    input: inputValue,
+    input: textValue,
     isEditing: isEditing,
     isScaledDown: isScaledDown,
-    onCancelEditing: () => cancelMessageEditing(true, true),
+    onCancelEditing: () => cancelMessageEditing(true),
     onClickPing: onPingClick,
     onGifClick: onGifClick,
     onSelectFiles: uploadFiles,
@@ -767,20 +511,18 @@ const InputBar = ({
     showGiphyButton: showGiphyButton,
   };
 
+  const enableSending = textValue.length > 0;
+
   return (
     <IgnoreOutsideClickWrapper
       id={conversationInputBarClassName}
       className={cx(conversationInputBarClassName, {'is-right-panel-open': isRightSidebarOpen})}
       aria-live="assertive"
     >
-      {!!isTypingIndicatorEnabled && <TypingIndicator conversationId={conversationEntity.id} />}
+      {isTypingIndicatorEnabled && <TypingIndicator conversationId={conversation.id} />}
 
       {classifiedDomains && !isConnectionRequest && (
-        <ClassifiedBar
-          conversationDomain={conversationEntity.domain}
-          users={allUsers}
-          classifiedDomains={classifiedDomains}
-        />
+        <ConversationClassifiedBar conversation={conversation} classifiedDomains={classifiedDomains} />
       )}
 
       {isReplying && !isEditing && <ReplyBar replyMessageEntity={replyMessageEntity} onCancel={handleCancelReply} />}
@@ -793,70 +535,59 @@ const InputBar = ({
         {!isOutgoingRequest && (
           <>
             <div className="controls-left">
-              {!!inputValue.length && (
+              {!!textValue.length && (
                 <Avatar className="cursor-default" participant={selfUser} avatarSize={AVATAR_SIZE.X_SMALL} />
               )}
             </div>
 
             {!removedFromConversation && !pastedFile && (
-              <>
-                {renderEmojiComponent()}
-
-                <div className="controls-center">
-                  <textarea
-                    ref={textareaRef}
-                    id={`${conversationInputBarClassName}-text`}
-                    className={cx(`${conversationInputBarClassName}-text`, {
-                      [`${conversationInputBarClassName}-text--accent`]: hasLocalEphemeralTimer,
-                    })}
-                    onKeyDown={onTextAreaKeyDown}
-                    onKeyUp={onTextareaKeyUp}
-                    onClick={handleMentionFlow}
-                    onInput={updateMentions}
-                    onChange={onChange}
-                    onBlur={() => setIsTyping(false)}
-                    value={inputValue}
-                    placeholder={inputPlaceholder}
-                    aria-label={
-                      messageTimer
-                        ? t('tooltipConversationEphemeralAriaLabel', {time: formatDuration(messageTimer).text})
-                        : inputPlaceholder
-                    }
-                    data-uie-name="input-message"
-                    dir="auto"
-                  />
-
-                  <div
-                    ref={shadowInputRef}
-                    className="shadow-input"
-                    dangerouslySetInnerHTML={{__html: richTextInput}}
-                    data-uie-name="input-message-rich-text"
-                    dir="auto"
-                  />
-                </div>
-
-                <MentionSuggestionList
-                  targetInput={textareaRef.current}
-                  suggestions={mentionSuggestions}
-                  onSelectionValidated={addMention}
-                />
+              <RichTextEditor
+                onSetup={lexical => {
+                  editorRef.current = lexical;
+                }}
+                editedMessage={editedMessage}
+                onEscape={() => {
+                  if (editedMessage) {
+                    cancelMessageEditing(true);
+                  } else if (replyMessageEntity) {
+                    cancelMessageReply();
+                  }
+                }}
+                onArrowUp={() => {
+                  if (textValue.length === 0) {
+                    editMessage(conversation.getLastEditableMessage());
+                  }
+                }}
+                getMentionCandidates={getMentionCandidates}
+                replaceEmojis={shouldReplaceEmoji}
+                placeholder={inputPlaceholder}
+                onUpdate={setMessageContent}
+                hasLocalEphemeralTimer={hasLocalEphemeralTimer}
+                saveDraftState={saveDraft}
+                loadDraftState={loadDraft}
+                onShiftTab={onShiftTab}
+                onSend={sendMessage}
+                onBlur={() => isTypingIndicatorEnabled && conversationRepository.sendTypingStop(conversation)}
+              >
                 {isScaledDown ? (
                   <>
                     <ul className="controls-right buttons-group" css={{minWidth: '95px'}}>
                       {showGiphyButton && <GiphyButton onGifClick={onGifClick} />}
-                      {sendButton}
+                      <SendMessageButton disabled={!enableSending} onSend={sendMessage} />
                     </ul>
                     <ul className="controls-right buttons-group" css={{justifyContent: 'center', width: '100%'}}>
                       <ControlButtons {...controlButtonsProps} isScaledDown={isScaledDown} />
                     </ul>
                   </>
                 ) : (
-                  <ul className="controls-right buttons-group">
-                    <ControlButtons {...controlButtonsProps} showGiphyButton={showGiphyButton} />
-                    {sendButton}
-                  </ul>
+                  <>
+                    <ul className="controls-right buttons-group">
+                      <ControlButtons {...controlButtonsProps} showGiphyButton={showGiphyButton} />
+                      <SendMessageButton disabled={!enableSending} onSend={sendMessage} />
+                    </ul>
+                  </>
                 )}
-              </>
+              </RichTextEditor>
             )}
           </>
         )}
@@ -866,5 +597,3 @@ const InputBar = ({
     </IgnoreOutsideClickWrapper>
   );
 };
-
-export {InputBar};
diff --git a/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.test.tsx b/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.test.tsx
deleted file mode 100644
index e6c66d49089..00000000000
--- a/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.test.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {render, fireEvent, screen} from '@testing-library/react';
-
-import {createUuid} from 'Util/uuid';
-
-import {MentionSuggestionList} from './MentionSuggestions';
-
-import {User} from '../../../../entity/User';
-
-// mocked data
-const first = generateUser('patryktest1', 'patryktest1');
-const second = generateUser('patryktest2', 'patryktest2');
-const third = generateUser('patrykjozwik', 'Patryk Jozwik');
-const fourth = generateUser('patrykarjita', 'Patryk Arjita');
-const sortedSuggestions = [first, second, third, fourth];
-const suggestions = [third, first, fourth, second];
-
-const onSelectionValidated = jest.fn();
-
-beforeAll(() => {
-  //component uses textArea element by accessing it via querySelector, we need to insert it to the DOM
-  const input = document.createElement('textarea');
-  document.body.appendChild(input);
-  Element.prototype.scrollIntoView = jest.fn();
-});
-
-describe('MentionSuggestionList', () => {
-  it("properly selects mentioned user when only array's order changes", async () => {
-    const input = screen.getByRole('textbox') as HTMLTextAreaElement;
-
-    const {rerender} = render(
-      <MentionSuggestionList
-        onSelectionValidated={onSelectionValidated}
-        suggestions={sortedSuggestions}
-        targetInput={input}
-      />,
-    );
-
-    fireEvent.keyDown(input, {code: 'Tab', key: 'Tab'});
-    expect(onSelectionValidated).toHaveBeenCalledWith(first);
-
-    //suggestions prop changed, component rerenders (
-    rerender(
-      <MentionSuggestionList
-        onSelectionValidated={onSelectionValidated}
-        suggestions={suggestions}
-        targetInput={input}
-      />,
-    );
-
-    fireEvent.keyDown(input, {code: 'Tab', key: 'Tab'});
-    expect(onSelectionValidated).toHaveBeenCalledWith(third);
-  });
-});
-
-function generateUser(username: string, name: string) {
-  const user = new User();
-  user.username(username);
-  user.name(name);
-  user.id = createUuid();
-  return user;
-}
diff --git a/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.tsx b/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.tsx
deleted file mode 100644
index a1351ce8265..00000000000
--- a/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestions.tsx
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import React, {useEffect, useMemo, useRef, useState} from 'react';
-
-import {FadingScrollbar} from 'Components/FadingScrollbar';
-import {IgnoreOutsideClickWrapper} from 'Components/InputBar/util/clickHandlers';
-import {KEY} from 'Util/KeyboardUtil';
-import {clamp} from 'Util/NumberUtil';
-
-import {MentionSuggestionsItem} from './MentionSuggestionsItem';
-
-import {User} from '../../../../entity/User';
-
-type MentionSuggestionListProps = {
-  onSelectionValidated: (data: User) => void;
-  suggestions: User[];
-  targetInput?: HTMLTextAreaElement | null;
-};
-
-const MentionSuggestionList: React.FunctionComponent<MentionSuggestionListProps> = ({
-  suggestions,
-  onSelectionValidated,
-  targetInput,
-}) => {
-  const [selectedSuggestionIndex, setSelectedSuggestionIndex] = useState(0);
-  const selectedItem = useRef<HTMLElement | null>();
-
-  const isVisible = suggestions.length > 0;
-
-  const bottom = useMemo(() => {
-    const boundingClientRect = targetInput?.getBoundingClientRect?.();
-
-    if (!isVisible || !boundingClientRect) {
-      return 0;
-    }
-
-    return window.innerHeight - boundingClientRect.top + 24;
-  }, [isVisible, targetInput]);
-
-  useEffect(
-    () => selectedItem.current?.scrollIntoView({behavior: 'auto', block: 'nearest'}),
-    [selectedSuggestionIndex, suggestions.length],
-  );
-
-  useEffect(() => {
-    const updateSelectedIndex = (delta: number = 0) => {
-      setSelectedSuggestionIndex(curr => clamp(curr + delta, 0, suggestions.length - 1));
-    };
-
-    const onInput = (event: KeyboardEvent) => {
-      const moveSelection = (delta: number) => {
-        updateSelectedIndex(delta);
-        event.preventDefault();
-        event.stopPropagation();
-      };
-
-      const validateSelection = () => {
-        if (!event.shiftKey) {
-          onSelectionValidated(suggestions[selectedSuggestionIndex]);
-          event.preventDefault();
-          event.stopPropagation();
-        }
-      };
-
-      const actions = {
-        [KEY.ARROW_UP]: () => moveSelection(1),
-        [KEY.ARROW_DOWN]: () => moveSelection(-1),
-        [KEY.ENTER]: validateSelection,
-        [KEY.TAB]: validateSelection,
-      };
-
-      actions[event.key]?.();
-    };
-
-    if (isVisible) {
-      targetInput?.addEventListener('keydown', onInput);
-    }
-
-    updateSelectedIndex();
-
-    return () => {
-      targetInput?.removeEventListener('keydown', onInput);
-    };
-  }, [isVisible, suggestions, selectedSuggestionIndex]);
-
-  return isVisible ? (
-    <IgnoreOutsideClickWrapper>
-      <FadingScrollbar
-        className="conversation-input-bar-mention-suggestion"
-        style={{bottom, overflowY: 'auto'}}
-        data-uie-name="list-mention-suggestions"
-      >
-        <div className="mention-suggestion-list">
-          {suggestions
-            .map((suggestion, index) => (
-              <MentionSuggestionsItem
-                key={suggestion.id}
-                suggestion={suggestion}
-                isSelected={index === selectedSuggestionIndex}
-                onSuggestionClick={() => onSelectionValidated(suggestion)}
-                onMouseEnter={() => setSelectedSuggestionIndex(index)}
-                ref={index === selectedSuggestionIndex ? element => (selectedItem.current = element) : undefined}
-              />
-            ))
-            .reverse()}
-        </div>
-      </FadingScrollbar>
-    </IgnoreOutsideClickWrapper>
-  ) : null;
-};
-
-export {MentionSuggestionList};
diff --git a/src/script/components/InputBar/getRichTextInput.ts b/src/script/components/InputBar/getRichTextInput.ts
deleted file mode 100644
index caff8b7ddbf..00000000000
--- a/src/script/components/InputBar/getRichTextInput.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {escape} from 'underscore';
-
-import {MentionEntity} from '../../message/MentionEntity';
-
-const mentionAttributes = ' class="input-mention" data-uie-name="item-input-mention"';
-
-const getPieces = (currentMentions: MentionEntity[], inputValue: string) => {
-  const revertedCurrentMentions = currentMentions.slice().reverse();
-
-  return revertedCurrentMentions.reduce(
-    (currentPieces, mentionEntity) => {
-      const currentPiece = currentPieces.shift();
-
-      if (currentPiece) {
-        currentPieces.unshift(currentPiece.slice(mentionEntity.endIndex));
-        currentPieces.unshift(
-          currentPiece.slice(mentionEntity.startIndex, mentionEntity.startIndex + mentionEntity.length),
-        );
-        currentPieces.unshift(currentPiece.slice(0, mentionEntity.startIndex));
-      }
-
-      return currentPieces;
-    },
-    [inputValue],
-  );
-};
-
-const getRichTextInput = (currentMentions: MentionEntity[], inputValue: string) => {
-  const pieces = getPieces(currentMentions, inputValue);
-
-  return pieces
-    .map((piece, index) => {
-      const textPiece = escape(piece).replace(/[\r\n]/g, '<br>');
-
-      return `<span${index % 2 ? mentionAttributes : ''}>${textPiece}</span>`;
-    })
-    .join('')
-    .replace(/<br><\/span>$/, '<br>&nbsp;</span>');
-};
-
-export {getRichTextInput};
diff --git a/src/script/components/InputBar/hooks/useResizeTarget.ts b/src/script/components/InputBar/hooks/useResizeTarget.ts
deleted file mode 100644
index 7a6137bb73b..00000000000
--- a/src/script/components/InputBar/hooks/useResizeTarget.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {useEffect, DependencyList} from 'react';
-
-const alignScrollBars = (shadowInput: HTMLElement, textarea: HTMLElement) => {
-  /* According to documentation (https://developer.mozilla.org/en-US/docs/Web/API/Element/scrollHeight) scrollHeight always shows the height of an element's content,
-    including content not visible on the screen due to overflow.
-    Using scroll and hidden values, we're making sure that scroll behaves the same way on both elements
-    (overflow: auto behaviour differs on textarea and div).
-  */
-  const shouldForceScrollbar = textarea.clientHeight < textarea.scrollHeight;
-
-  shadowInput.style.overflowY = shouldForceScrollbar ? 'scroll' : 'hidden';
-  textarea.style.overflowY = shouldForceScrollbar ? 'scroll' : 'hidden';
-};
-
-const alignHeights = (shadowInput: HTMLElement, textarea: HTMLElement) => {
-  const {offsetHeight: shadowInputHeight, scrollHeight: shadowInputScrollHeight} = shadowInput;
-  const {offsetHeight: textAreaOffsetHeight} = textarea;
-
-  if (shadowInputHeight !== textAreaOffsetHeight) {
-    textarea.style.height = `${shadowInputScrollHeight}px`;
-  }
-};
-
-const useResizeTarget = (shadowInput: HTMLElement | null, textarea: HTMLElement | null, deps?: DependencyList) => {
-  const resizeTarget = () => {
-    if (shadowInput && textarea) {
-      if (!textarea?.offsetHeight) {
-        return;
-      }
-
-      alignHeights(shadowInput, textarea);
-      alignScrollBars(shadowInput, textarea);
-
-      //changing scroll appearance might change elements' height, we need to double check if their heights match
-      alignHeights(shadowInput, textarea);
-    }
-  };
-
-  useEffect(() => {
-    resizeTarget();
-
-    window.addEventListener('resize', resizeTarget);
-
-    return () => {
-      window.removeEventListener('resize', resizeTarget);
-    };
-  }, deps);
-};
-
-export {useResizeTarget};
diff --git a/src/script/components/InputBar/hooks/useScrollSync.ts b/src/script/components/InputBar/hooks/useScrollSync.ts
deleted file mode 100644
index 2cb5e894836..00000000000
--- a/src/script/components/InputBar/hooks/useScrollSync.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {useEffect, DependencyList} from 'react';
-
-const useScrollSync = (element: HTMLElement | null, targetElement: HTMLElement | null, deps?: DependencyList) => {
-  const syncScroll = () => {
-    if (element && targetElement) {
-      if (element?.scrollTop !== targetElement?.scrollTop) {
-        targetElement.scrollTop = element.scrollTop;
-      }
-    }
-  };
-
-  useEffect(() => {
-    window.addEventListener('resize', syncScroll);
-    element?.addEventListener('scroll', syncScroll);
-
-    return () => {
-      window.removeEventListener('resize', syncScroll);
-      element?.removeEventListener('scroll', syncScroll);
-    };
-  }, deps);
-};
-
-export {useScrollSync};
diff --git a/src/script/components/InputBar/hooks/useTypingIndicator.test.ts b/src/script/components/InputBar/hooks/useTypingIndicator.test.ts
new file mode 100644
index 00000000000..0d77d059543
--- /dev/null
+++ b/src/script/components/InputBar/hooks/useTypingIndicator.test.ts
@@ -0,0 +1,164 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {fireEvent, renderHook} from '@testing-library/react';
+
+import {useTypingIndicator} from './useTypingIndicator';
+
+import {TYPING_TIMEOUT} from '../components/TypingIndicator';
+
+describe('useTypingIndicator', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('never calls the callback if user has not yet touched the keyboard', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+    expect(onTypingChange).not.toHaveBeenCalled();
+  });
+
+  it('never calls the callback if user has typed but indicator is disabled', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: false, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+    expect(onTypingChange).not.toHaveBeenCalledWith();
+  });
+
+  it('calls the callback when user starts typing', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledWith(true);
+  });
+
+  it('calls the callback with false after user stops typing for a little while', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+
+    jest.advanceTimersByTime(TYPING_TIMEOUT - 1);
+    expect(onTypingChange).not.toHaveBeenCalledWith(false);
+
+    jest.advanceTimersByTime(1);
+    expect(onTypingChange).toHaveBeenCalledWith(false);
+  });
+
+  it('calls the callback with false if user deletes the text', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+
+    expect(onTypingChange).toHaveBeenCalledWith(true);
+
+    rerender({text: '', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledWith(false);
+  });
+
+  it('calls the callback with false if component is unloaded', () => {
+    const onTypingChange = jest.fn();
+    const {rerender, unmount} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledWith(true);
+
+    unmount();
+    expect(onTypingChange).toHaveBeenCalledWith(false);
+  });
+
+  it('calls the callback only once as user types', () => {
+    const onTypingChange = jest.fn();
+    const {rerender} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    expect(onTypingChange).not.toHaveBeenCalled();
+
+    fireEvent.keyDown(document);
+
+    rerender({text: 'a', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledWith(true);
+
+    rerender({text: 'ab', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledTimes(1);
+
+    rerender({text: 'abc', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledTimes(1);
+
+    jest.advanceTimersByTime(TYPING_TIMEOUT + 1);
+    expect(onTypingChange).toHaveBeenCalledWith(false);
+
+    rerender({text: 'abcd', isEnabled: true, onTypingChange});
+    expect(onTypingChange).toHaveBeenCalledTimes(3);
+  });
+
+  it('does not call the callback with false on unmount when the user has not typed', () => {
+    const onTypingChange = jest.fn();
+    const {unmount} = renderHook(useTypingIndicator, {
+      initialProps: {text: '', isEnabled: true, onTypingChange},
+    });
+
+    unmount();
+    expect(onTypingChange).not.toHaveBeenCalledWith(false);
+  });
+});
diff --git a/src/script/components/InputBar/hooks/useTypingIndicator.ts b/src/script/components/InputBar/hooks/useTypingIndicator.ts
new file mode 100644
index 00000000000..193887933ed
--- /dev/null
+++ b/src/script/components/InputBar/hooks/useTypingIndicator.ts
@@ -0,0 +1,74 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useCallback, useEffect, useRef} from 'react';
+
+import {TYPING_TIMEOUT} from '../components/TypingIndicator';
+
+type TypingIndicatorProps = {
+  text: string;
+  isEnabled: boolean;
+  onTypingChange: (isTyping: boolean) => void;
+};
+
+export function useTypingIndicator({text, isEnabled, onTypingChange}: TypingIndicatorProps) {
+  const hasHitKeyboard = useRef(false);
+  const isTypingRef = useRef(false);
+
+  const setTyping = useCallback(
+    (isTyping: boolean) => {
+      if (isTyping !== isTypingRef.current) {
+        isTypingRef.current = isTyping;
+        onTypingChange(isTyping);
+      }
+    },
+    [onTypingChange],
+  );
+
+  useEffect(() => {
+    if (!hasHitKeyboard.current && isEnabled) {
+      // If the user hasn't typed yet, we register a callback that will set the flag to true when the user first type
+      const setHasHitKeyboard = () => {
+        hasHitKeyboard.current = true;
+      };
+      document.addEventListener('keydown', setHasHitKeyboard);
+      return () => document.removeEventListener('keydown', setHasHitKeyboard);
+    }
+
+    return () => {};
+  }, [onTypingChange, isEnabled]);
+
+  useEffect(() => {
+    let timerId: number;
+    if (!hasHitKeyboard.current) {
+      return () => {};
+    }
+
+    if (text.length > 0) {
+      setTyping(true);
+      timerId = window.setTimeout(() => setTyping(false), TYPING_TIMEOUT);
+    } else {
+      setTyping(false);
+    }
+
+    return () => window.clearTimeout(timerId);
+  }, [text, setTyping]);
+
+  useEffect(() => () => setTyping(false), [setTyping]);
+}
diff --git a/src/script/util/DraftStateUtil.ts b/src/script/components/InputBar/util/DraftStateUtil.ts
similarity index 51%
rename from src/script/util/DraftStateUtil.ts
rename to src/script/components/InputBar/util/DraftStateUtil.ts
index 7f9954ec1c6..946c85b28c8 100644
--- a/src/script/util/DraftStateUtil.ts
+++ b/src/script/components/InputBar/util/DraftStateUtil.ts
@@ -17,44 +17,31 @@
  *
  */
 
-import {generateConversationInputStorageKey} from 'Util/util';
+import {MessageRepository} from '../../../conversation/MessageRepository';
+import {Conversation} from '../../../entity/Conversation';
+import {ContentMessage} from '../../../entity/message/ContentMessage';
+import {StorageKey, StorageRepository} from '../../../storage';
 
-import {MessageRepository} from '../conversation/MessageRepository';
-import {Conversation} from '../entity/Conversation';
-import {ContentMessage} from '../entity/message/ContentMessage';
-import {MentionEntity} from '../message/MentionEntity';
-import {StorageRepository} from '../storage';
-
-interface DraftMessage {
-  mentions: MentionEntity[];
-  reply?: ContentMessage;
-  replyEntityPromise?: Promise<ContentMessage>;
-  text: string;
+export interface DraftState {
+  editorState: string | null;
+  messageReply?: Promise<ContentMessage>;
 }
 
-type Reply = {
-  messageId?: string;
-};
-
-export interface Draft {
-  mentions: MentionEntity[];
-  reply: Reply;
-  text: string;
-}
+const generateConversationInputStorageKey = (conversationEntity: Conversation): string =>
+  `${StorageKey.CONVERSATION.INPUT}|${conversationEntity.id}`;
 
 export const saveDraftState = async (
   storageRepository: StorageRepository,
   conversationEntity: Conversation,
-  draftMessage: DraftMessage,
+  editorState: string,
+  replyMessageId?: string,
 ): Promise<void> => {
   // we only save state for newly written messages
-  const storeReply = draftMessage.reply?.id ? {messageId: draftMessage.reply.id} : {};
   const storageKey = generateConversationInputStorageKey(conversationEntity);
 
-  await storageRepository.storageService.saveToSimpleStorage<Draft>(storageKey, {
-    mentions: draftMessage.mentions,
-    reply: storeReply,
-    text: draftMessage.text,
+  await storageRepository.storageService.saveToSimpleStorage<any>(storageKey, {
+    editorState,
+    replyId: replyMessageId,
   });
 };
 
@@ -62,33 +49,25 @@ export const loadDraftState = async (
   conversationEntity: Conversation,
   storageRepository: StorageRepository,
   messageRepository: MessageRepository,
-): Promise<DraftMessage> => {
+): Promise<DraftState> => {
   const storageKey = generateConversationInputStorageKey(conversationEntity);
-  const storageValue = await storageRepository.storageService.loadFromSimpleStorage<Draft>(storageKey);
+  const storageValue = await storageRepository.storageService.loadFromSimpleStorage<any>(storageKey);
 
   if (typeof storageValue === 'undefined') {
-    return {mentions: [], text: ''};
+    return {editorState: null};
   }
 
-  if (typeof storageValue === 'string') {
-    return {mentions: [], text: storageValue};
-  }
-
-  const draftMessage: DraftMessage = {
-    mentions: storageValue.mentions.map(
-      mention => new MentionEntity(mention.startIndex, mention.length, mention.userId, mention.domain),
-    ),
-    text: storageValue.text,
-  };
+  const replyMessageId = storageValue?.replyId;
 
-  const replyMessageId = storageValue.reply.messageId;
+  let messageReply = null;
 
   if (replyMessageId) {
     const message =
       (await messageRepository.getMessageInConversationById(conversationEntity, replyMessageId)) ||
       (await messageRepository.getMessageInConversationByReplacementId(conversationEntity, replyMessageId));
-    draftMessage.replyEntityPromise = messageRepository.ensureMessageSender(message) as Promise<ContentMessage>;
+
+    messageReply = messageRepository.ensureMessageSender(message) as Promise<ContentMessage>;
   }
 
-  return draftMessage;
+  return {...storageValue, messageReply};
 };
diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx
index 14c62e5f184..6c19c71673b 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.test.tsx
@@ -54,12 +54,12 @@ describe('message', () => {
       onClickCancelRequest: jest.fn(),
       onClickImage: jest.fn(),
       onClickInvitePeople: jest.fn(),
-      onClickLikes: jest.fn(),
       onClickMessage: jest.fn(),
       onClickParticipants: jest.fn(),
-      onClickReceipts: jest.fn(),
+      onClickReaction: jest.fn(),
+      onClickReactionDetails: jest.fn(),
+      onClickDetails: jest.fn(),
       onClickTimestamp: jest.fn(),
-      onLike: jest.fn(),
       onRetry: jest.fn(),
       previousMessage: undefined,
       selfId: {domain: '', id: createUuid()},
diff --git a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx
index a23d2334ca5..da96641e786 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/ContentMessage.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useMemo} from 'react';
+import React, {useMemo, useState, useEffect} from 'react';
 
 import {QualifiedId} from '@wireapp/api-client/lib/user';
 
@@ -25,23 +25,23 @@ import {Conversation} from 'src/script/entity/Conversation';
 import {CompositeMessage} from 'src/script/entity/message/CompositeMessage';
 import {ContentMessage} from 'src/script/entity/message/ContentMessage';
 import {Message} from 'src/script/entity/message/Message';
+import {useRelativeTimestamp} from 'src/script/hooks/useRelativeTimestamp';
 import {StatusType} from 'src/script/message/StatusType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {getMessageAriaLabel} from 'Util/conversationMessages';
-import {KEY} from 'Util/KeyboardUtil';
-import {t} from 'Util/LocalizerUtil';
-import {setContextMenuPosition} from 'Util/util';
+import {groupByReactionUsers} from 'Util/ReactionUtil';
 
 import {ContentAsset} from './asset';
-import {MessageFooterLike} from './MessageFooterLike';
+import {MessageActionsMenu} from './MessageActions/MessageActions';
+import {useMessageActionsState} from './MessageActions/MessageActions.state';
+import {MessageReactionsList} from './MessageActions/MessageReactions/MessageReactionsList';
 import {MessageHeader} from './MessageHeader';
-import {MessageLike} from './MessageLike';
 import {Quote} from './MessageQuote';
 import {CompleteFailureToSendWarning, PartialFailureToSendWarning} from './Warnings';
 
 import {MessageActions} from '..';
 import {EphemeralStatusType} from '../../../../message/EphemeralStatusType';
-import {ContextMenuEntry, showContextMenu} from '../../../../ui/ContextMenu';
+import {ContextMenuEntry} from '../../../../ui/ContextMenu';
 import {EphemeralTimer} from '../EphemeralTimer';
 import {MessageTime} from '../MessageTime';
 import {ReadReceiptStatus} from '../ReadReceiptStatus';
@@ -62,6 +62,7 @@ export interface ContentMessageProps extends Omit<MessageActions, 'onClickResetS
   quotedMessage?: ContentMessage;
   selfId: QualifiedId;
   isMsgElementsFocusable: boolean;
+  onClickReaction: (emoji: string) => void;
 }
 
 const ContentMessageComponent: React.FC<ContentMessageProps> = ({
@@ -69,37 +70,36 @@ const ContentMessageComponent: React.FC<ContentMessageProps> = ({
   message,
   findMessage,
   selfId,
-  hasMarker,
+  hasMarker = false,
   isMessageFocused,
   isLastDeliveredMessage,
   contextMenu,
   previousMessage,
-  onClickReceipts,
   onClickAvatar,
   onClickImage,
   onClickTimestamp,
   onClickMessage,
-  onClickLikes,
+  onClickReactionDetails,
   onClickButton,
-  onLike,
   onRetry,
   isMsgElementsFocusable,
+  onClickReaction,
 }) => {
+  // check if current message is focused and its elements focusable
   const msgFocusState = useMemo(
     () => isMsgElementsFocusable && isMessageFocused,
     [isMsgElementsFocusable, isMessageFocused],
   );
   const messageFocusedTabIndex = useMessageFocusedTabIndex(msgFocusState);
-  const {entries: menuEntries} = useKoSubscribableChildren(contextMenu, ['entries']);
   const {
     senderName,
     timestamp,
     ephemeral_caption,
     ephemeral_status,
     assets,
-    other_likes,
     was_edited,
     failedToSend,
+    reactions,
     status,
     user,
   } = useKoSubscribableChildren(message, [
@@ -111,6 +111,7 @@ const ContentMessageComponent: React.FC<ContentMessageProps> = ({
     'other_likes',
     'was_edited',
     'failedToSend',
+    'reactions',
     'status',
     'user',
   ]);
@@ -126,139 +127,139 @@ const ContentMessageComponent: React.FC<ContentMessageProps> = ({
 
     return !previousMessage.isContent() || previousMessage.user().id !== user.id;
   };
-
-  const handleContextKeyDown = (event: React.KeyboardEvent) => {
-    if ([KEY.SPACE, KEY.ENTER].includes(event.key)) {
-      const newEvent = setContextMenuPosition(event);
-      showContextMenu(newEvent, menuEntries, 'message-options-menu');
-    }
-  };
-
+  const timeAgo = useRelativeTimestamp(message.timestamp());
   const [messageAriaLabel] = getMessageAriaLabel({
     assets,
     displayTimestampShort: message.displayTimestampShort(),
     senderName,
   });
 
+  const [isActionMenuVisible, setActionMenuVisibility] = useState(false);
+  const isMenuOpen = useMessageActionsState(state => state.isMenuOpen);
+  useEffect(() => {
+    setActionMenuVisibility(isMessageFocused || msgFocusState);
+  }, [msgFocusState, isMessageFocused]);
+
+  const reactionGroupedByUser = groupByReactionUsers(reactions);
+  const reactionsTotalCount = Array.from(reactionGroupedByUser).length;
+
   return (
-    <div aria-label={messageAriaLabel}>
+    <div
+      aria-label={messageAriaLabel}
+      className="content-message-wrapper"
+      ref={element => {
+        setTimeout(() => {
+          if (element?.parentElement?.querySelector(':hover') === element) {
+            // Trigger the action menu in case the component is rendered with the mouse already hovering over it
+            setActionMenuVisibility(true);
+          }
+        });
+      }}
+      onMouseEnter={() => {
+        // open another floating action menu if none already open
+        if (!isMenuOpen) {
+          setActionMenuVisibility(true);
+        }
+      }}
+      onMouseLeave={() => {
+        // close floating message actions when no active menu is open like context menu/emoji picker
+        if (!isMenuOpen) {
+          setActionMenuVisibility(false);
+        }
+      }}
+    >
       {shouldShowAvatar() && (
         <MessageHeader onClickAvatar={onClickAvatar} message={message} focusTabIndex={messageFocusedTabIndex}>
           {was_edited && (
             <span className="message-header-label-icon icon-edit" title={message.displayEditedTimestamp()}></span>
           )}
+          <span className="content-message-timestamp">
+            <MessageTime timestamp={timestamp} className="label-xs" data-timestamp-type="normal">
+              {timeAgo}
+            </MessageTime>
+          </span>
         </MessageHeader>
       )}
-      {message.quote() && (
-        <Quote
-          conversation={conversation}
-          quote={message.quote()}
-          selfId={selfId}
-          findMessage={findMessage}
-          showDetail={onClickImage}
-          focusMessage={onClickTimestamp}
-          handleClickOnMessage={onClickMessage}
-          showUserDetails={onClickAvatar}
-          isMessageFocused={msgFocusState}
-        />
-      )}
-      <div className="message-body" title={ephemeral_caption}>
-        {ephemeral_status === EphemeralStatusType.ACTIVE && (
-          <div className="message-ephemeral-timer">
-            <EphemeralTimer message={message} />
-          </div>
-        )}
-
-        {assets.map(asset => (
-          <ContentAsset
-            key={asset.type}
-            asset={asset}
-            message={message}
-            selfId={selfId}
-            onClickButton={onClickButton}
-            onClickImage={onClickImage}
-            onClickMessage={onClickMessage}
-            isMessageFocused={msgFocusState}
-          />
-        ))}
-
-        {failedToSend && (
-          <PartialFailureToSendWarning
-            isMessageFocused={msgFocusState}
-            failedToSend={failedToSend}
-            knownUsers={conversation.allUserEntities()}
-          />
-        )}
-
-        {[StatusType.FAILED, StatusType.FEDERATION_ERROR].includes(status) && (
-          <CompleteFailureToSendWarning
-            {...(status === StatusType.FEDERATION_ERROR && {unreachableDomain: conversation.domain})}
-            isMessageFocused={msgFocusState}
-            onRetry={() => onRetry(message)}
-          />
-        )}
-
-        {!other_likes.length && message.isReactable() && (
-          <div className="message-body-like">
-            <MessageLike
-              className="message-body-like-icon like-button message-show-on-hover"
-              message={message}
-              onLike={onLike}
+      <div className="message-body">
+        <div className="message-body-content" title={ephemeral_caption}>
+          {ephemeral_status === EphemeralStatusType.ACTIVE && (
+            <div className="message-ephemeral-timer">
+              <EphemeralTimer message={message} />
+            </div>
+          )}
+          {message.quote() && (
+            <Quote
+              conversation={conversation}
+              quote={message.quote()}
+              selfId={selfId}
+              findMessage={findMessage}
+              showDetail={onClickImage}
+              focusMessage={onClickTimestamp}
+              handleClickOnMessage={onClickMessage}
+              showUserDetails={onClickAvatar}
               isMessageFocused={msgFocusState}
             />
-          </div>
-        )}
-
-        <div className="message-body-actions">
-          {menuEntries.length > 0 && (
-            <button
-              tabIndex={messageFocusedTabIndex}
-              className="context-menu icon-more font-size-xs"
-              aria-label={t('accessibility.conversationContextMenuOpenLabel')}
-              onKeyDown={handleContextKeyDown}
-              onClick={event => showContextMenu(event, menuEntries, 'message-options-menu')}
-            ></button>
           )}
-
-          {ephemeral_status === EphemeralStatusType.ACTIVE && (
-            <time
-              className="time"
-              data-uie-uid={message.id}
-              title={ephemeral_caption}
-              data-timestamp={timestamp}
-              data-bind="showAllTimestamps"
-            >
-              {message.displayTimestampShort()}
-            </time>
+          {assets.map(asset => (
+            <ContentAsset
+              key={asset.type}
+              asset={asset}
+              message={message}
+              selfId={selfId}
+              onClickButton={onClickButton}
+              onClickImage={onClickImage}
+              onClickMessage={onClickMessage}
+              isMessageFocused={msgFocusState}
+            />
+          ))}
+          {failedToSend && (
+            <PartialFailureToSendWarning
+              isMessageFocused={msgFocusState}
+              failedToSend={failedToSend}
+              knownUsers={conversation.allUserEntities()}
+            />
           )}
 
-          {ephemeral_status !== EphemeralStatusType.ACTIVE && (
-            <MessageTime data-uie-uid={message.id} timestamp={timestamp}>
-              {message.displayTimestampShort()}
-            </MessageTime>
+          {[StatusType.FAILED, StatusType.FEDERATION_ERROR].includes(status) && (
+            <CompleteFailureToSendWarning
+              {...(status === StatusType.FEDERATION_ERROR && {unreachableDomain: conversation.domain})}
+              isMessageFocused={msgFocusState}
+              onRetry={() => onRetry(message)}
+            />
           )}
+        </div>
+        {isActionMenuVisible && (
+          <MessageActionsMenu
+            isMsgWithHeader={shouldShowAvatar()}
+            message={message}
+            handleActionMenuVisibility={setActionMenuVisibility}
+            contextMenu={contextMenu}
+            isMessageFocused={msgFocusState}
+            messageWithSection={hasMarker}
+            handleReactionClick={onClickReaction}
+            reactionsTotalCount={reactionsTotalCount}
+            isRemovedFromConversation={conversation.removed_from_conversation()}
+          />
+        )}
 
+        <div className="message-body-actions">
           <ReadReceiptStatus
             message={message}
             is1to1Conversation={conversation.is1to1()}
             isLastDeliveredMessage={isLastDeliveredMessage}
-            onClickReceipts={onClickReceipts}
-            isMessageFocused={msgFocusState}
           />
         </div>
       </div>
 
-      {other_likes.length > 0 && (
-        <div>
-          <MessageFooterLike
-            message={message}
-            is1to1Conversation={conversation.is1to1()}
-            onLike={onLike}
-            onClickLikes={onClickLikes}
-            isMessageFocused={msgFocusState}
-          />
-        </div>
-      )}
+      <MessageReactionsList
+        reactions={reactions}
+        userId={selfId.id}
+        handleReactionClick={onClickReaction}
+        isMessageFocused={msgFocusState}
+        onTooltipReactionCountClick={() => onClickReactionDetails(message)}
+        onLastReactionKeyEvent={() => setActionMenuVisibility(false)}
+        isRemovedFromConversation={conversation.removed_from_conversation()}
+      />
     </div>
   );
 };
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/DownloadButton.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/DownloadButton.tsx
new file mode 100644
index 00000000000..7077465993e
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/DownloadButton.tsx
@@ -0,0 +1,55 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC, ReactNode} from 'react';
+
+import {t} from 'Util/LocalizerUtil';
+
+export interface DownloadButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  actionId: string;
+  messageFocusedTabIndex: number;
+  onDownloadClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  onKeyPress: (event: React.KeyboardEvent<HTMLButtonElement>) => void;
+  children: ReactNode;
+}
+
+const DownloadButton: FC<DownloadButtonProps> = ({
+  actionId,
+  messageFocusedTabIndex,
+  onDownloadClick,
+  onKeyPress,
+  children,
+  ...rest
+}) => {
+  return (
+    <button
+      {...rest}
+      type="button"
+      tabIndex={messageFocusedTabIndex}
+      data-uie-name={actionId}
+      aria-label={t('conversationContextMenuDownload')}
+      onClick={onDownloadClick}
+      onKeyDown={onKeyPress}
+    >
+      {children}
+    </button>
+  );
+};
+
+export {DownloadButton};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state.tsx
new file mode 100644
index 00000000000..636293baead
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state.tsx
@@ -0,0 +1,34 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {create} from 'zustand';
+
+type MessageActionsState = {
+  isMenuOpen: boolean;
+  handleMenuOpen: (isMenuOpen: boolean) => void;
+  getMenuState: () => boolean;
+};
+
+const useMessageActionsState = create<MessageActionsState>((set, get) => ({
+  isMenuOpen: false,
+  handleMenuOpen: isMenuOpen => set(state => ({...state, isMenuOpen: isMenuOpen})),
+  getMenuState: () => get().isMenuOpen,
+}));
+
+export {useMessageActionsState};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.styles.ts b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.styles.ts
new file mode 100644
index 00000000000..2f408f149db
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.styles.ts
@@ -0,0 +1,106 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {CSSObject} from '@emotion/react';
+
+export const messageActionsGroup: CSSObject = {
+  display: 'flex',
+  marginLeft: '8px',
+  padding: '2px',
+};
+
+export const messageBodyActions: CSSObject = {
+  display: 'inline-flex',
+  alignItems: 'center',
+  minHeight: '32px',
+  minWidth: '40px',
+  position: 'absolute',
+  right: '16px',
+  top: '-20px',
+  '@media (max-width: @screen-md-min)': {
+    height: '45px',
+    flexDirection: 'column',
+  },
+};
+
+export const messageActionsMenuButton = (isReactable = true): CSSObject => {
+  const defaultStyle: CSSObject = {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'center',
+    alignItems: 'center',
+    padding: '8px 12px',
+    cursor: 'pointer',
+  };
+  if (isReactable) {
+    return {
+      ...defaultStyle,
+      '&:first-of-type': {
+        borderRadius: '12px 0px 0px 12px',
+      },
+      '&:last-of-type': {
+        borderRadius: '0px 12px 12px 0px',
+      },
+    };
+  }
+  return {
+    ...defaultStyle,
+    borderRadius: '12px',
+  };
+};
+
+export const getIconCSS: CSSObject = {
+  'body.theme-dark &': {
+    'svg path': {
+      fill: 'var(--white)',
+    },
+    'svg path:nth-of-type(2)': {
+      stroke: 'var(--white)',
+    },
+  },
+};
+
+export const getActionsMenuCSS = (isActive?: boolean): CSSObject => {
+  if (isActive) {
+    return {
+      border: '1px solid var(--message-actions-active-border)',
+      backgroundColor: 'var(--message-actions-active-background)',
+      color: 'var(--accent-color)',
+      outline: 'none',
+    };
+  }
+  return {
+    border: '1px solid var(--message-actions-border)',
+    backgroundColor: 'var(--message-actions-background)',
+    outline: 'none',
+
+    '&:hover': {
+      backgroundColor: 'var(--message-actions-background-hover)',
+      border: '1px solid var(--message-actions-border-hover)',
+    },
+    '&:focus-visible': {
+      border: '1px solid var(--accent-color-focus)',
+      outline: 'none',
+    },
+  };
+};
+
+export const messageWithHeaderTop: CSSObject = {
+  top: '-53px',
+};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.test.tsx
new file mode 100644
index 00000000000..bec180349a6
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.test.tsx
@@ -0,0 +1,90 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {render, fireEvent} from '@testing-library/react';
+import ko from 'knockout';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+import {t} from 'Util/LocalizerUtil';
+import {createUuid} from 'Util/uuid';
+
+import {MessageActionsMenu, MessageActionsMenuProps} from './MessageActions';
+const defaultProps: MessageActionsMenuProps = {
+  isMsgWithHeader: true,
+  message: new ContentMessage(createUuid()),
+  contextMenu: {entries: ko.observable([{label: 'option1', text: 'option1'}])},
+  isMessageFocused: true,
+  handleActionMenuVisibility: jest.fn(),
+  messageWithSection: false,
+  handleReactionClick: jest.fn(),
+  reactionsTotalCount: 0,
+  isRemovedFromConversation: false,
+};
+
+describe('MessageActions', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  test('renders the message actions menu', () => {
+    const {getByLabelText} = render(<MessageActionsMenu {...defaultProps} />);
+    const messageActionsMenu = getByLabelText(t('accessibility.messageActionsMenuLabel'));
+    expect(messageActionsMenu).toBeDefined();
+  });
+
+  test('renders the message actions buttons', () => {
+    const {getByLabelText} = render(<MessageActionsMenu {...defaultProps} />);
+    const thumbsUpButton = getByLabelText(t('accessibility.messageActionsMenuThumbsUp'));
+    const likeButton = getByLabelText(t('accessibility.messageActionsMenuLike'));
+    const emojiButton = getByLabelText(t('accessibility.messageActionsMenuEmoji'));
+    const optionsButton = getByLabelText(t('accessibility.conversationContextMenuOpenLabel'));
+    expect(thumbsUpButton).toBeDefined();
+    expect(likeButton).toBeDefined();
+    expect(emojiButton).toBeDefined();
+    expect(optionsButton).toBeDefined();
+  });
+
+  test('displays the context menu on options button click', () => {
+    const {getByLabelText, getByText, queryByText} = render(<MessageActionsMenu {...defaultProps} />);
+    const optionsButton = getByLabelText(t('accessibility.conversationContextMenuOpenLabel'));
+    fireEvent.click(optionsButton);
+    expect(getByText('option1')).toBeDefined();
+    expect(queryByText('option2')).toBeNull();
+  });
+
+  test('keeps the message actions menu open when context menu is open', () => {
+    const {getByLabelText, getByText} = render(<MessageActionsMenu {...defaultProps} />);
+    const optionsButton = getByLabelText(t('accessibility.conversationContextMenuOpenLabel'));
+    fireEvent.click(optionsButton);
+    expect(getByText('option1')).toBeDefined();
+  });
+
+  test('toggles the active message action on click of any action button', () => {
+    const {getByLabelText} = render(<MessageActionsMenu {...defaultProps} />);
+    const thumbsUpButton = getByLabelText(t('accessibility.messageActionsMenuThumbsUp'));
+    const likeButton = getByLabelText(t('accessibility.messageActionsMenuLike'));
+
+    fireEvent.click(thumbsUpButton);
+    expect(thumbsUpButton.getAttribute('aria-pressed')).toBe('true');
+    expect(likeButton.getAttribute('aria-pressed')).toBe('false');
+
+    fireEvent.click(likeButton);
+    expect(thumbsUpButton.getAttribute('aria-pressed')).toBe('false');
+    expect(likeButton.getAttribute('aria-pressed')).toBe('true');
+  });
+});
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.tsx
new file mode 100644
index 00000000000..cd8299b1d42
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.tsx
@@ -0,0 +1,223 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC, useCallback, useRef, useState} from 'react';
+
+import {amplify} from 'amplify';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+import {useClickOutside} from 'src/script/hooks/useClickOutside';
+import {ContextMenuEntry, showContextMenu} from 'src/script/ui/ContextMenu';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {isTabKey, KEY} from 'Util/KeyboardUtil';
+import {t} from 'Util/LocalizerUtil';
+import {setContextMenuPosition} from 'Util/util';
+
+import {useMessageActionsState} from './MessageActions.state';
+import {
+  messageActionsGroup,
+  messageBodyActions,
+  messageActionsMenuButton,
+  getActionsMenuCSS,
+  getIconCSS,
+  messageWithHeaderTop,
+} from './MessageActions.styles';
+import {MessageReactions} from './MessageReactions/MessageReactions';
+import {ReplyButton} from './ReplyButton';
+
+import {useMessageFocusedTabIndex} from '../../util';
+
+export const MessageActionsId = {
+  THUMBSUP: 'reactwith-thumbsup-messag',
+  HEART: 'reactwith-love-message',
+  EMOJI: 'reactwith-emoji-message',
+  REPLY: 'do-reply-message',
+  OPTIONS: 'go-options',
+} as const;
+
+export interface MessageActionsMenuProps {
+  isMsgWithHeader: boolean;
+  message: ContentMessage;
+  contextMenu: {entries: ko.Subscribable<ContextMenuEntry[]>};
+  isMessageFocused: boolean;
+  handleActionMenuVisibility: (isVisible: boolean) => void;
+  messageWithSection: boolean;
+  handleReactionClick: (emoji: string) => void;
+  reactionsTotalCount: number;
+  isRemovedFromConversation: boolean;
+}
+
+const MessageActionsMenu: FC<MessageActionsMenuProps> = ({
+  isMsgWithHeader,
+  contextMenu,
+  isMessageFocused,
+  handleActionMenuVisibility,
+  message,
+  messageWithSection,
+  handleReactionClick,
+  reactionsTotalCount,
+  isRemovedFromConversation,
+}) => {
+  const {entries: menuEntries} = useKoSubscribableChildren(contextMenu, ['entries']);
+  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
+  const [currentMsgActionName, setCurrentMsgAction] = useState('');
+  const wrapperRef = useRef<HTMLDivElement>(null);
+  const messageReactionTop = isMsgWithHeader ? messageWithHeaderTop : null;
+  const {handleMenuOpen, isMenuOpen} = useMessageActionsState();
+
+  const resetActionMenuStates = useCallback(() => {
+    setCurrentMsgAction('');
+    handleMenuOpen(false);
+    handleActionMenuVisibility(false);
+  }, [handleActionMenuVisibility, handleMenuOpen]);
+
+  const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (isTabKey(event)) {
+      setCurrentMsgAction('');
+    }
+  }, []);
+
+  const handleContextKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLButtonElement>) => {
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      if ([KEY.SPACE, KEY.ENTER].includes(event.key)) {
+        if (selectedMsgActionName) {
+          setCurrentMsgAction(selectedMsgActionName);
+          handleMenuOpen(true);
+          const newEvent = setContextMenuPosition(event);
+          showContextMenu(newEvent, menuEntries, 'message-options-menu');
+        }
+      } else if (!event.shiftKey && isTabKey(event) && !reactionsTotalCount) {
+        // if there's no reaction then on tab from context menu hide the message actions menu
+        setCurrentMsgAction('');
+        handleActionMenuVisibility(false);
+        handleMenuOpen(false);
+      } else if (isTabKey(event)) {
+        // shift+tab/tab will remove the focus from the menu button
+        setCurrentMsgAction('');
+      }
+    },
+    [handleActionMenuVisibility, menuEntries, reactionsTotalCount],
+  );
+
+  const handleContextMenuClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      if (currentMsgActionName === selectedMsgActionName) {
+        // reset on double click
+        setCurrentMsgAction('');
+        handleMenuOpen(false);
+      } else if (selectedMsgActionName) {
+        setCurrentMsgAction(selectedMsgActionName);
+        handleMenuOpen(true);
+        showContextMenu(event, menuEntries, 'message-options-menu', resetActionMenuStates);
+      }
+    },
+    [currentMsgActionName, handleMenuOpen, menuEntries],
+  );
+
+  const toggleActiveMenu = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement> | React.KeyboardEvent<HTMLButtonElement>) => {
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      handleMenuOpen(false);
+      if (currentMsgActionName === selectedMsgActionName) {
+        // reset on double click
+        setCurrentMsgAction('');
+      } else if (selectedMsgActionName) {
+        setCurrentMsgAction(selectedMsgActionName);
+      }
+    },
+    [currentMsgActionName, handleMenuOpen],
+  );
+
+  const handleMessageReply = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      toggleActiveMenu(event);
+      amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.REPLY, message);
+    },
+    [message, toggleActiveMenu],
+  );
+
+  const isMsgReactable = message.isReactable() && !isRemovedFromConversation;
+  // clicking anywhere else other than the message action menu removes action menu active state
+  useClickOutside(wrapperRef, () => {
+    if (!isMenuOpen) {
+      setCurrentMsgAction('');
+    }
+  });
+  return (
+    <div css={{...messageBodyActions, ...messageReactionTop}} ref={wrapperRef}>
+      <div
+        css={messageActionsGroup}
+        role="group"
+        aria-label={t('accessibility.messageActionsMenuLabel')}
+        data-uie-name="message-actions"
+      >
+        {isMsgReactable && (
+          <>
+            <MessageReactions
+              messageFocusedTabIndex={messageFocusedTabIndex}
+              currentMsgActionName={currentMsgActionName}
+              handleCurrentMsgAction={setCurrentMsgAction}
+              toggleActiveMenu={toggleActiveMenu}
+              handleKeyDown={handleKeyDown}
+              resetActionMenuStates={resetActionMenuStates}
+              wrapperRef={wrapperRef}
+              message={message}
+              handleReactionClick={handleReactionClick}
+            />
+            {message.isReplyable() && (
+              <ReplyButton
+                actionId={MessageActionsId.REPLY}
+                currentMsgActionName={currentMsgActionName}
+                messageFocusedTabIndex={messageFocusedTabIndex}
+                onReplyClick={handleMessageReply}
+                onKeyPress={handleKeyDown}
+              />
+            )}
+          </>
+        )}
+
+        {menuEntries.length > 0 && (
+          <button
+            tabIndex={messageFocusedTabIndex}
+            css={{
+              ...messageActionsMenuButton(isMsgReactable),
+              ...getIconCSS,
+              ...getActionsMenuCSS(currentMsgActionName === MessageActionsId.OPTIONS),
+            }}
+            className="icon-more font-size-xs"
+            data-uie-name={MessageActionsId.OPTIONS}
+            aria-label={t('accessibility.conversationContextMenuOpenLabel')}
+            onClick={event => {
+              handleContextMenuClick(event);
+            }}
+            onKeyDown={event => {
+              handleContextKeyDown(event);
+            }}
+          ></button>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export {MessageActionsMenu};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.styles.ts b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.styles.ts
new file mode 100644
index 00000000000..8b60dfe271e
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.styles.ts
@@ -0,0 +1,51 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {CSSObject} from '@emotion/react';
+
+export const messageReactionEmoji: CSSObject = {
+  display: 'inline-flex',
+  alignItems: 'center',
+  objectFit: 'contain',
+  overflow: 'hidden',
+  verticalAlign: 'top',
+};
+
+export const reactionImgSize = {
+  width: '16px',
+};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.tsx
new file mode 100644
index 00000000000..b1a9392b911
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg.tsx
@@ -0,0 +1,48 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC} from 'react';
+
+import {CSSObject} from '@emotion/react';
+
+import {messageReactionEmoji, reactionImgSize} from './EmojiImg.styles';
+
+export interface EmojiImgProps {
+  emojiUrl: string;
+  emojiName: string;
+  emojiImgSize?: CSSObject;
+  styles?: CSSObject;
+}
+
+const EmojiImg: FC<EmojiImgProps> = ({emojiUrl, styles, emojiName, emojiImgSize = reactionImgSize}) => {
+  return (
+    <>
+      <img
+        alt={emojiName}
+        aria-hidden={true}
+        css={{...emojiImgSize, ...messageReactionEmoji, ...styles}}
+        draggable="false"
+        loading="eager"
+        src={emojiUrl}
+      />
+    </>
+  );
+};
+
+export {EmojiImg};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPicker.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPicker.tsx
new file mode 100644
index 00000000000..d27e54ebf74
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPicker.tsx
@@ -0,0 +1,141 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useState, useEffect, useRef, FC, RefObject} from 'react';
+
+import EmojiPicker, {EmojiClickData, SkinTones} from 'emoji-picker-react';
+import {createPortal} from 'react-dom';
+
+import {useClickOutside} from 'src/script/hooks/useClickOutside';
+import {isEnterKey, isEscapeKey} from 'Util/KeyboardUtil';
+import {t} from 'Util/LocalizerUtil';
+import {getEmojiUrl} from 'Util/ReactionUtil';
+
+interface EmojiPickerContainerProps {
+  posX: number;
+  posY: number;
+  onKeyPress: () => void;
+  resetActionMenuStates: () => void;
+  wrapperRef: RefObject<HTMLDivElement>;
+  handleReactionClick: (emoji: string) => void;
+}
+
+const EmojiPickerContainer: FC<EmojiPickerContainerProps> = ({
+  posX,
+  posY,
+  onKeyPress,
+  resetActionMenuStates,
+  wrapperRef,
+  handleReactionClick,
+}) => {
+  const emojiRef = useRef<HTMLDivElement>(null);
+  useClickOutside(emojiRef, resetActionMenuStates, wrapperRef);
+  const [style, setStyle] = useState<object>({
+    left: 0,
+    top: 0,
+    opacity: 0,
+    width: '0px',
+    position: 'absolute',
+  });
+  let isKeyboardEvent = false;
+
+  useEffect(() => {
+    const mainElement = emojiRef && emojiRef.current;
+    function updateSize() {
+      const emojiPickerWidth = 350;
+      const reactionMenuOpenerButtonHeight = 40;
+      const left = mainElement && posX - emojiPickerWidth;
+      const top = Math.max(
+        mainElement && window.innerHeight - posY < mainElement.clientHeight
+          ? posY - mainElement.offsetHeight + reactionMenuOpenerButtonHeight
+          : posY,
+        0,
+      );
+      const style = {
+        left,
+        top,
+        width: 'auto',
+        opacity: 1,
+        position: 'absolute',
+      };
+      setStyle(style);
+    }
+    window.addEventListener('resize', updateSize);
+    updateSize();
+    return () => window.removeEventListener('resize', updateSize);
+  }, [posX, posY]);
+
+  function onEmojiClick(emojiData: EmojiClickData, event: MouseEvent) {
+    localStorage.setItem('activeSkinTone', emojiData.activeSkinTone);
+
+    handleReactionClick(emojiData.emoji);
+
+    if (isKeyboardEvent) {
+      // keyboard event still retains emoji button focus
+      onKeyPress();
+    } else {
+      // click event will close the picker and reset active states
+      resetActionMenuStates();
+    }
+  }
+
+  function getSkinTone() {
+    const currentSkinTone = localStorage.getItem('activeSkinTone');
+    const skinTone = currentSkinTone ? (currentSkinTone as SkinTones) : SkinTones.NEUTRAL;
+    return skinTone;
+  }
+  return (
+    <>
+      {createPortal(
+        // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+        <div
+          className="overlay"
+          onKeyDown={event => {
+            // prevent emoji picker up/down arrow key to naviage between messages in background
+            event.stopPropagation();
+            if (isEscapeKey(event)) {
+              onKeyPress();
+            }
+            if (isEnterKey(event)) {
+              isKeyboardEvent = true;
+            }
+          }}
+        >
+          <div
+            ref={emojiRef}
+            style={{maxHeight: window.innerHeight, ...style}}
+            role="dialog"
+            data-uie-name="emoji-picker-dialog"
+          >
+            <EmojiPicker
+              onEmojiClick={onEmojiClick}
+              getEmojiUrl={getEmojiUrl}
+              lazyLoadEmojis={true}
+              searchPlaceHolder={t('accessibility.emojiPickerSearchPlaceholder')}
+              defaultSkinTone={getSkinTone()}
+            />
+          </div>
+        </div>,
+        document.body,
+      )}
+    </>
+  );
+};
+
+export {EmojiPickerContainer};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx
new file mode 100644
index 00000000000..1d0709f3a52
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiPill.tsx
@@ -0,0 +1,148 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC, useState} from 'react';
+
+import {Tooltip} from '@wireapp/react-ui-kit';
+
+import {useMessageFocusedTabIndex} from 'Components/MessagesList/Message/util';
+import {getEmojiTitleFromEmojiUnicode} from 'Util/EmojiUtil';
+import {isTabKey} from 'Util/KeyboardUtil';
+import {t} from 'Util/LocalizerUtil';
+import {getEmojiUrl} from 'Util/ReactionUtil';
+
+import {EmojiImg} from './EmojiImg';
+import {
+  getReactionsButtonCSS,
+  messageReactionButton,
+  messageReactionButtonTooltip,
+  messageReactionButtonTooltipImage,
+  messageReactionButtonTooltipText,
+  messageReactionButtonTooltipTextLink,
+  messageReactionCount,
+} from './MessageReactions.styles';
+
+export interface EmojiPillProps {
+  emoji: string;
+  emojiUnicode: string;
+  emojiCount: number;
+  handleReactionClick: (emoji: string) => void;
+  isMessageFocused: boolean;
+  onTooltipReactionCountClick: () => void;
+  onLastReactionKeyEvent: () => void;
+  isRemovedFromConversation: boolean;
+  index: number;
+  emojiListCount: number;
+  hasUserReacted: boolean;
+}
+
+const EmojiPill: FC<EmojiPillProps> = ({
+  emoji,
+  emojiUnicode,
+  emojiCount,
+  handleReactionClick,
+  isMessageFocused,
+  onTooltipReactionCountClick,
+  onLastReactionKeyEvent,
+  isRemovedFromConversation,
+  index,
+  emojiListCount,
+  hasUserReacted,
+}) => {
+  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
+  const [isOpen, setTooltipVisibility] = useState(false);
+  const emojiUrl = getEmojiUrl(emojiUnicode);
+  const emojiName = getEmojiTitleFromEmojiUnicode(emojiUnicode);
+  const isActive = hasUserReacted && !isRemovedFromConversation;
+
+  const showTooltip = () => {
+    setTooltipVisibility(true);
+  };
+
+  const hideTooltip = () => {
+    setTooltipVisibility(false);
+  };
+  return (
+    <div onMouseEnter={showTooltip} onMouseLeave={hideTooltip} onFocus={showTooltip} onBlur={hideTooltip}>
+      <Tooltip
+        body={
+          <div css={messageReactionButtonTooltip}>
+            <EmojiImg
+              emojiImgSize={{
+                width: '1.2rem',
+              }}
+              styles={messageReactionButtonTooltipImage}
+              emojiUrl={emojiUrl}
+              emojiName={emojiName}
+            />
+            <p css={messageReactionButtonTooltipText}>
+              {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions, jsx-a11y/click-events-have-key-events */}
+              <span onClick={onTooltipReactionCountClick} css={messageReactionButtonTooltipTextLink}>
+                {emojiCount > 1
+                  ? t('conversationLikesCaptionPlural', {number: emojiCount.toString()})
+                  : t('conversationLikesCaptionSingular', {number: emojiCount.toString()})}
+              </span>{' '}
+              {emojiCount > 1
+                ? t('conversationLikesCaptionReactedPlural', {emojiName})
+                : t('conversationLikesCaptionReactedSingular', {emojiName})}
+            </p>
+          </div>
+        }
+        isOpen={isOpen}
+      >
+        <button
+          css={{...messageReactionButton, ...getReactionsButtonCSS(isActive, isRemovedFromConversation)}}
+          aria-label={
+            emojiCount > 1
+              ? t('accessibility.messageReactionDetailsPlural', {emojiCount: emojiCount.toString(), emojiName})
+              : t('accessibility.messageReactionDetailsSingular', {emojiCount: emojiCount.toString(), emojiName})
+          }
+          title={emojiName}
+          aria-pressed={isActive}
+          type="button"
+          tabIndex={messageFocusedTabIndex}
+          className="button-reset-default"
+          data-uie-name="emoji-pill"
+          onClick={() => {
+            handleReactionClick(emoji);
+          }}
+          onKeyDown={event => {
+            // is last reaction then on tab key press it should hide the reaction menu
+            if (index === emojiListCount - 1) {
+              if (!event.shiftKey && isTabKey(event)) {
+                onLastReactionKeyEvent();
+              }
+            }
+          }}
+        >
+          <EmojiImg
+            emojiUrl={emojiUrl}
+            emojiName={emojiName}
+            emojiImgSize={{
+              width: 'var(--font-size-medium)',
+            }}
+          />
+          <span css={messageReactionCount(isActive)}>{emojiCount}</span>
+        </button>
+      </Tooltip>
+    </div>
+  );
+};
+
+export {EmojiPill};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.styles.ts b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.styles.ts
new file mode 100644
index 00000000000..6320dad981c
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.styles.ts
@@ -0,0 +1,123 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {CSSObject} from '@emotion/react';
+
+export const messageReactionWrapper: CSSObject = {
+  display: 'flex',
+  gap: '0.5rem',
+  paddingLeft: '56px',
+  flexWrap: 'wrap',
+  maxWidth: '100%',
+  marginRight: 'var(--conversation-message-timestamp-width)',
+  '.tooltip-content': {marginBottom: '0 !important'},
+};
+
+export const messageReactionButton: CSSObject = {
+  alignItems: 'center',
+  borderRadius: '4px',
+  color: 'var(--white)',
+  display: 'inline-flex',
+  gap: '4px',
+  margin: '0.5rem 0rem',
+  padding: '3px',
+  verticalAlign: 'top',
+};
+
+export const messageReactionButtonTooltip: CSSObject = {display: 'flex', maxWidth: 130, whiteSpace: 'break-spaces'};
+export const messageReactionButtonTooltipImage: CSSObject = {marginRight: 8};
+export const messageReactionDetailsMargin: CSSObject = {marginRight: '0.4rem'};
+export const reactionsCountAlignment: CSSObject = {display: 'flex', alignItems: 'center'};
+export const messageReactionButtonTooltipText: CSSObject = {fontSize: '0.7rem'};
+export const messageReactionButtonTooltipTextLink: CSSObject = {
+  color: 'var(--blue-500)',
+  cursor: 'pointer',
+  textDecoration: 'underline',
+};
+
+export const messageReactionCount = (isActive?: boolean): CSSObject => {
+  return {
+    color: isActive ? 'var(--accent-color)' : 'var(--message-reactions-count)',
+    fontSize: 'var(--font-size-small)',
+    letterSpacing: '0.031rem',
+  };
+};
+export const getReactionsButtonCSS = (isActive?: boolean, isDisabled?: boolean): CSSObject => {
+  if (isActive) {
+    return {
+      border: '1px solid var(--message-reactions-active-border)',
+      backgroundColor: 'var(--message-reactions-active-background)',
+      color: 'var(--accent-color)',
+      outline: 'none',
+
+      '&:focus-visible': {
+        border: '1px solid var(--message-reactions-focus-border)',
+        outline: 'none',
+      },
+    };
+  }
+  if (isDisabled) {
+    return {
+      border: '1px solid var(--gray-40)',
+      backgroundColor: 'var(--gray-20)',
+      color: 'var(--gray-60)',
+      cursor: 'not-allowed',
+      outline: 'none',
+
+      'body.theme-dark &': {
+        border: '1px solid var(--gray-95)',
+        backgroundColor: 'var(--gray-90)',
+        color: 'var(--gray-60)',
+      },
+    };
+  }
+  return {
+    border: '1px solid var(--message-reactions-border)',
+    backgroundColor: 'var(--message-reactions-background)',
+    outline: 'none',
+
+    '&:focus-visible': {
+      border: '1px solid var(--message-reactions-focus-border)',
+      outline: 'none',
+    },
+  };
+};
+
+export const actionMenuEmojiSize = {
+  width: '16px',
+};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.test.tsx
new file mode 100644
index 00000000000..cbc9d7841e6
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.test.tsx
@@ -0,0 +1,97 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React from 'react';
+
+import {render, act, fireEvent, waitFor} from '@testing-library/react';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+import {t} from 'Util/LocalizerUtil';
+
+import {MessageReactions, MessageReactionsProps} from './MessageReactions';
+
+import {MessageActionsId} from '../MessageActions';
+
+const thumbsUpEmoji = '👍';
+const likeEmoji = '❤️';
+const wrapperRef = React.createRef<HTMLDivElement>();
+const defaultProps: MessageReactionsProps = {
+  message: new ContentMessage(),
+  handleReactionClick: jest.fn(),
+  messageFocusedTabIndex: 0,
+  currentMsgActionName: '',
+  toggleActiveMenu: jest.fn(),
+  handleKeyDown: jest.fn(),
+  handleCurrentMsgAction: jest.fn(),
+  resetActionMenuStates: jest.fn(),
+  wrapperRef: wrapperRef,
+};
+describe('MessageReactions', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('outside click should close the emoji picker', async () => {
+    let currentMsgActionName = defaultProps.currentMsgActionName; // preserve initial value
+
+    const MessageReactionsComponent = (props: MessageReactionsProps) => {
+      return (
+        <div ref={wrapperRef}>
+          <MessageReactions {...props} />
+        </div>
+      );
+    };
+    const {getByLabelText, getByTestId, queryByTestId, rerender} = render(
+      <MessageReactionsComponent {...defaultProps} />,
+    );
+
+    const emojiButton = getByLabelText(t('accessibility.messageActionsMenuEmoji'));
+
+    act(() => {
+      fireEvent.click(emojiButton);
+      currentMsgActionName = MessageActionsId.EMOJI; // Update the value
+      rerender(<MessageReactionsComponent {...defaultProps} currentMsgActionName={currentMsgActionName} />);
+    });
+
+    const emojiPickerDialogId = 'emoji-picker-dialog';
+    await waitFor(() => {
+      expect(getByTestId(emojiPickerDialogId)).toBeDefined();
+    });
+
+    act(() => {
+      fireEvent.click(document);
+    });
+
+    expect(queryByTestId(emojiPickerDialogId)).toBeNull();
+  });
+
+  test('should call handleReactionClick on reaction click', () => {
+    const {getByLabelText} = render(<MessageReactions {...defaultProps} />);
+
+    const thumbsUpButton = getByLabelText(t('accessibility.messageActionsMenuThumbsUp'));
+    const likeButton = getByLabelText(t('accessibility.messageActionsMenuLike'));
+
+    fireEvent.click(thumbsUpButton);
+    fireEvent.click(likeButton);
+
+    expect(defaultProps.handleReactionClick).toHaveBeenCalledTimes(2);
+    expect(defaultProps.handleReactionClick).toHaveBeenCalledWith(thumbsUpEmoji);
+    expect(defaultProps.handleReactionClick).toHaveBeenCalledWith(likeEmoji);
+  });
+});
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.tsx
new file mode 100644
index 00000000000..2d613020179
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.tsx
@@ -0,0 +1,262 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useState, useCallback, RefObject, FC, useRef} from 'react';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+import {KEY} from 'Util/KeyboardUtil';
+import {t} from 'Util/LocalizerUtil';
+
+import {EmojiImg} from './EmojiImg';
+import {reactionImgSize} from './EmojiImg.styles';
+import {EmojiPickerContainer} from './EmojiPicker';
+import {actionMenuEmojiSize} from './MessageReactions.styles';
+
+import {MessageActionsId} from '../MessageActions';
+import {useMessageActionsState} from '../MessageActions.state';
+import {messageActionsMenuButton, getActionsMenuCSS, getIconCSS} from '../MessageActions.styles';
+
+const thumbsUpEmoji = '👍';
+const likeEmoji = '❤️';
+const thumbsUpEmojiUrl = '/image/emojis/img-apple-64/1f44d.png';
+const likeEmojiUrl = '/image/emojis/img-apple-64/2764-fe0f.png';
+const INITIAL_CLIENT_X_POS = 0;
+const INITIAL_CLIENT_Y_POS = 0;
+export interface MessageReactionsProps {
+  messageFocusedTabIndex: number;
+  currentMsgActionName: string;
+  toggleActiveMenu: (event: React.MouseEvent<HTMLButtonElement> | React.KeyboardEvent<HTMLButtonElement>) => void;
+  handleKeyDown: (event: React.KeyboardEvent<HTMLButtonElement>) => void;
+  handleCurrentMsgAction: (actionName: string) => void;
+  resetActionMenuStates: () => void;
+  wrapperRef: RefObject<HTMLDivElement>;
+  message: ContentMessage;
+  handleReactionClick: (emoji: string) => void;
+}
+
+const MessageReactions: FC<MessageReactionsProps> = ({
+  messageFocusedTabIndex,
+  currentMsgActionName,
+  handleCurrentMsgAction,
+  toggleActiveMenu,
+  handleKeyDown,
+  resetActionMenuStates,
+  wrapperRef,
+  message,
+  handleReactionClick,
+}) => {
+  const isThumbUpAction = currentMsgActionName === MessageActionsId.THUMBSUP;
+  const isLikeAction = currentMsgActionName === MessageActionsId.HEART;
+  const [showEmojis, setShowEmojis] = useState(false);
+  const {handleMenuOpen} = useMessageActionsState();
+  const [clientX, setPOSX] = useState(INITIAL_CLIENT_X_POS);
+  const [clientY, setPOSY] = useState(INITIAL_CLIENT_Y_POS);
+  const emojiButtonRef = useRef<HTMLButtonElement>(null);
+
+  const handleEmojiSelectionWithKeyboard = () => {
+    if (showEmojis) {
+      handleMenuOpen(false);
+      setShowEmojis(false);
+    }
+    if (emojiButtonRef.current) {
+      emojiButtonRef.current.focus();
+    }
+  };
+
+  const handleOutsideClick = () => {
+    resetActionMenuStates();
+    setShowEmojis(false);
+  };
+
+  const handleReactionCurrentState = useCallback(
+    (actionName = '') => {
+      const isActive = !!actionName;
+      handleCurrentMsgAction(actionName);
+      handleMenuOpen(isActive);
+      setShowEmojis(isActive);
+    },
+    [handleCurrentMsgAction, handleMenuOpen],
+  );
+
+  const handleEmojiBtnClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      if (currentMsgActionName === selectedMsgActionName) {
+        // reset on double click
+        handleReactionCurrentState('');
+      } else if (selectedMsgActionName) {
+        handleReactionCurrentState(selectedMsgActionName);
+        showReactions(event.currentTarget.getBoundingClientRect());
+      }
+    },
+    [currentMsgActionName, handleReactionCurrentState],
+  );
+
+  const handleEmojiKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      handleKeyDown(event);
+      if ([KEY.SPACE, KEY.ENTER].includes(event.key)) {
+        if (currentMsgActionName === selectedMsgActionName) {
+          // reset on double click
+          handleReactionCurrentState('');
+        } else if (selectedMsgActionName) {
+          handleReactionCurrentState(selectedMsgActionName);
+          showReactions(event.currentTarget.getBoundingClientRect());
+        }
+      }
+    },
+    [currentMsgActionName, handleKeyDown, handleReactionCurrentState],
+  );
+
+  const showReactions = (rect: DOMRect) => {
+    setPOSX(rect.x);
+    setPOSY(rect.y);
+  };
+
+  const handleMsgActionClick = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      const actionType = event.currentTarget.dataset.uieName;
+      switch (actionType) {
+        case MessageActionsId.EMOJI:
+          handleEmojiBtnClick(event);
+          break;
+        case MessageActionsId.THUMBSUP:
+          toggleActiveMenu(event);
+          handleReactionClick(thumbsUpEmoji);
+          break;
+        case MessageActionsId.HEART:
+          toggleActiveMenu(event);
+          handleReactionClick(likeEmoji);
+          break;
+      }
+    },
+    [handleEmojiBtnClick, handleReactionClick, toggleActiveMenu],
+  );
+
+  const handleMsgActionKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLButtonElement>) => {
+      event.stopPropagation();
+      const actionType = event.currentTarget.dataset.uieName;
+      switch (actionType) {
+        case MessageActionsId.EMOJI:
+          handleEmojiKeyDown(event);
+          break;
+        case MessageActionsId.THUMBSUP:
+          handleKeyDown(event);
+          break;
+        case MessageActionsId.HEART:
+          handleKeyDown(event);
+          break;
+      }
+    },
+    [handleEmojiKeyDown, handleKeyDown],
+  );
+
+  return (
+    <>
+      <button
+        css={{
+          ...messageActionsMenuButton(),
+          ...getIconCSS,
+          ...getActionsMenuCSS(isThumbUpAction),
+        }}
+        aria-label={t('accessibility.messageActionsMenuThumbsUp')}
+        data-uie-name={MessageActionsId.THUMBSUP}
+        aria-pressed={isThumbUpAction}
+        type="button"
+        tabIndex={messageFocusedTabIndex}
+        onClick={handleMsgActionClick}
+        onKeyDown={handleMsgActionKeyDown}
+      >
+        <EmojiImg
+          emojiUrl={thumbsUpEmojiUrl}
+          emojiName={t('accessibility.messageActionsMenuThumbsUp')}
+          emojiImgSize={actionMenuEmojiSize}
+        />
+      </button>
+      <button
+        css={{
+          ...messageActionsMenuButton(),
+          ...getIconCSS,
+          ...getActionsMenuCSS(isLikeAction),
+        }}
+        aria-label={t('accessibility.messageActionsMenuLike')}
+        data-uie-name={MessageActionsId.HEART}
+        aria-pressed={isLikeAction}
+        type="button"
+        tabIndex={messageFocusedTabIndex}
+        onClick={handleMsgActionClick}
+        onKeyDown={handleMsgActionKeyDown}
+      >
+        <EmojiImg
+          emojiUrl={likeEmojiUrl}
+          emojiName={t('accessibility.messageActionsMenuLike')}
+          emojiImgSize={actionMenuEmojiSize}
+        />
+      </button>
+      <button
+        css={{
+          ...messageActionsMenuButton(),
+          ...getIconCSS,
+          ...getActionsMenuCSS(currentMsgActionName === MessageActionsId.EMOJI),
+        }}
+        aria-label={t('accessibility.messageActionsMenuEmoji')}
+        data-uie-name={MessageActionsId.EMOJI}
+        type="button"
+        tabIndex={messageFocusedTabIndex}
+        onClick={handleMsgActionClick}
+        onKeyDown={handleMsgActionKeyDown}
+        ref={emojiButtonRef}
+      >
+        <svg css={reactionImgSize} viewBox="0 0 23 23" fill="none">
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M19.4908 9.20192C19.7806 10.0821 19.9375 11.0227 19.9375 12C19.9375 16.936 15.936 20.9375 11 20.9375C6.06396 20.9375 2.0625 16.936 2.0625 12C2.0625 7.06396 6.06396 3.0625 11 3.0625C11.9773 3.0625 12.9179 3.21935 13.7981 3.50925C13.8958 2.80497 14.1389 2.1472 14.4963 1.56728C13.3979 1.19934 12.2222 1 11 1C4.92487 1 0 5.92487 0 12C0 18.0751 4.92487 23 11 23C17.0751 23 22 18.0751 22 12C22 10.7778 21.8007 9.6021 21.4327 8.50372C20.8528 8.86105 20.195 9.10423 19.4908 9.20192ZM11 18.875C7.67393 18.875 4.89952 16.5131 4.26253 13.375H17.7375C17.1005 16.5131 14.3261 18.875 11 18.875ZM15.7764 14.75C12.0833 14.75 6.24584 14.7695 6.24584 14.7695C6.5442 15.2807 6.92214 15.7378 7.36161 16.125H14.6384C15.4473 15.4123 15.7764 14.75 15.7764 14.75ZM13.75 10.625C14.5094 10.625 15.125 10.0094 15.125 9.25C15.125 8.49061 14.5094 7.875 13.75 7.875C12.9906 7.875 12.375 8.49061 12.375 9.25C12.375 10.0094 12.9906 10.625 13.75 10.625ZM9.625 9.25C9.625 10.0094 9.00939 10.625 8.25 10.625C7.49061 10.625 6.875 10.0094 6.875 9.25C6.875 8.49061 7.49061 7.875 8.25 7.875C9.00939 7.875 9.625 8.49061 9.625 9.25Z"
+            fill="#34373D"
+          />
+          <path
+            fillRule="evenodd"
+            clipRule="evenodd"
+            d="M15.5835 3.64687V4.40312H18.2304V7.05H18.9866V4.40312H21.6335V3.64687H18.9866V1H18.2304V3.64687H15.5835Z"
+            fill="#34373D"
+            stroke="#34373D"
+            strokeWidth="1.25"
+          />
+        </svg>
+      </button>
+      {showEmojis ? (
+        <EmojiPickerContainer
+          posX={clientX}
+          posY={clientY}
+          onKeyPress={handleEmojiSelectionWithKeyboard}
+          resetActionMenuStates={handleOutsideClick}
+          wrapperRef={wrapperRef}
+          handleReactionClick={handleReactionClick}
+        />
+      ) : null}
+    </>
+  );
+};
+
+export {MessageReactions};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.test.tsx
new file mode 100644
index 00000000000..19b1a74d45d
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.test.tsx
@@ -0,0 +1,82 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {render, fireEvent, within} from '@testing-library/react';
+
+import {withTheme} from 'src/script/auth/util/test/TestUtil';
+import {createUuid} from 'Util/uuid';
+
+import {MessageReactionsList, MessageReactionsListProps} from './MessageReactionsList';
+
+const reactions = {
+  '1': '😇,😊',
+  '2': '😊,👍,😉,😇',
+  '3': '😇',
+};
+
+const defaultProps: MessageReactionsListProps = {
+  reactions: reactions,
+  handleReactionClick: jest.fn(),
+  onTooltipReactionCountClick: jest.fn(),
+  isMessageFocused: false,
+  onLastReactionKeyEvent: jest.fn(),
+  isRemovedFromConversation: false,
+  userId: createUuid(),
+};
+
+describe('MessageReactionsList', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('renders a button for each reaction and user count', () => {
+    const {getAllByTitle} = render(withTheme(<MessageReactionsList {...defaultProps} />));
+
+    const winkButton = getAllByTitle('wink');
+    const smileyFace1 = getAllByTitle('innocent');
+    const thumbsUpButton = getAllByTitle('+1');
+    const smileyFace2 = getAllByTitle('blush');
+
+    expect(smileyFace1).toHaveLength(1);
+    expect(smileyFace2).toHaveLength(1);
+    expect(winkButton).toHaveLength(1);
+    expect(thumbsUpButton).toHaveLength(1);
+
+    const smileyFaceCount = within(smileyFace1[0]).getByText('3');
+    expect(smileyFaceCount).toBeDefined();
+
+    const winkFaceCount = within(winkButton[0]).getByText('1');
+    expect(winkFaceCount).toBeDefined();
+
+    const thumbsUpButtonCount = within(winkButton[0]).getByText('1');
+    expect(thumbsUpButtonCount).toBeDefined();
+
+    const smileyFace2Count = within(winkButton[0]).getByText('1');
+    expect(smileyFace2Count).toBeDefined();
+  });
+
+  test('handles click on reaction button', () => {
+    const {getByTitle} = render(withTheme(<MessageReactionsList {...defaultProps} />));
+
+    fireEvent.click(getByTitle('+1'));
+    const {handleReactionClick} = defaultProps;
+    expect(handleReactionClick).toHaveBeenCalled();
+    expect(handleReactionClick).toHaveBeenCalledWith('👍');
+  });
+});
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.tsx
new file mode 100644
index 00000000000..4c3b49442cf
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactionsList.tsx
@@ -0,0 +1,71 @@
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC} from 'react';
+
+import {getEmojiUnicode} from 'Util/EmojiUtil';
+import {Reactions, groupByReactionUsers, sortReactionsByUserCount} from 'Util/ReactionUtil';
+
+import {EmojiPill} from './EmojiPill';
+import {messageReactionWrapper} from './MessageReactions.styles';
+
+export interface MessageReactionsListProps {
+  reactions: Reactions;
+  handleReactionClick: (emoji: string) => void;
+  userId: string;
+  isMessageFocused: boolean;
+  onTooltipReactionCountClick: () => void;
+  onLastReactionKeyEvent: () => void;
+  isRemovedFromConversation: boolean;
+}
+
+const MessageReactionsList: FC<MessageReactionsListProps> = ({reactions, ...props}) => {
+  const reactionGroupedByUser = groupByReactionUsers(reactions);
+  const reactionsGroupedByUserArray = Array.from(reactionGroupedByUser);
+  const reactionsList =
+    reactionsGroupedByUserArray.length > 1
+      ? sortReactionsByUserCount(reactionsGroupedByUserArray)
+      : reactionsGroupedByUserArray;
+  const {userId, ...emojiPillProps} = props;
+
+  return (
+    <div css={messageReactionWrapper} data-uie-name="message-reactions">
+      {reactionsList.map(([emoji, users], index) => {
+        const emojiUnicode = getEmojiUnicode(emoji);
+        const emojiListCount = reactionsList.length;
+        const hasUserReacted = users.includes(userId);
+
+        return (
+          <EmojiPill
+            emojiCount={users.length}
+            hasUserReacted={hasUserReacted}
+            emojiUnicode={emojiUnicode}
+            emoji={emoji}
+            index={index}
+            emojiListCount={emojiListCount}
+            {...emojiPillProps}
+            key={emojiUnicode + index}
+          />
+        );
+      })}
+    </div>
+  );
+};
+
+export {MessageReactionsList};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx
new file mode 100644
index 00000000000..72fd67bba21
--- /dev/null
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton.tsx
@@ -0,0 +1,62 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FC} from 'react';
+
+import {Icon} from 'Components/Icon';
+import {t} from 'Util/LocalizerUtil';
+
+import {getActionsMenuCSS, getIconCSS, messageActionsMenuButton} from './MessageActions.styles';
+import {reactionImgSize} from './MessageReactions/EmojiImg.styles';
+
+export interface ReplyButtonProps {
+  actionId: string;
+  currentMsgActionName: string;
+  messageFocusedTabIndex: number;
+  onReplyClick: (event: React.MouseEvent<HTMLButtonElement>) => void;
+  onKeyPress: (event: React.KeyboardEvent<HTMLButtonElement>) => void;
+}
+
+const ReplyButton: FC<ReplyButtonProps> = ({
+  actionId,
+  currentMsgActionName,
+  messageFocusedTabIndex,
+  onReplyClick,
+  onKeyPress,
+}) => {
+  return (
+    <button
+      css={{
+        ...messageActionsMenuButton(),
+        ...getIconCSS,
+        ...getActionsMenuCSS(currentMsgActionName === actionId),
+      }}
+      type="button"
+      tabIndex={messageFocusedTabIndex}
+      data-uie-name={actionId}
+      aria-label={t('conversationContextMenuReply')}
+      onClick={onReplyClick}
+      onKeyDown={onKeyPress}
+    >
+      <Icon.Reply className="svg-icon" css={reactionImgSize} />
+    </button>
+  );
+};
+
+export {ReplyButton};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.test.tsx
deleted file mode 100644
index 3ba13a00b16..00000000000
--- a/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.test.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {render, fireEvent} from '@testing-library/react';
-import ko from 'knockout';
-
-import {ContentMessage} from 'src/script/entity/message/ContentMessage';
-
-import {MessageFooterLike} from './MessageFooterLike';
-
-const createLikeMessage = (partialLikeMessage: Partial<ContentMessage>) => {
-  const likeMessage: Partial<ContentMessage> = {
-    is_liked: ko.pureComputed(() => false),
-    like_caption: ko.pureComputed(() => ''),
-    reactions_user_ids: ko.pureComputed(() => ''),
-    ...partialLikeMessage,
-  };
-  return likeMessage as ContentMessage;
-};
-
-describe('MessageFooterLike', () => {
-  it('triggers message likes', async () => {
-    const message = createLikeMessage({});
-
-    const props = {
-      isMessageFocused: true,
-      is1to1Conversation: false,
-      message,
-      onClickLikes: jest.fn(),
-      onLike: jest.fn(),
-    };
-
-    const {getByTestId} = render(<MessageFooterLike {...props} />);
-    const likeMessageElement = getByTestId('do-like-message');
-
-    fireEvent.click(likeMessageElement);
-    expect(props.onLike).toHaveBeenCalledWith(message);
-  });
-
-  it('does open conversation details in group conversation when clicking on like names', async () => {
-    const props = {
-      isMessageFocused: true,
-      is1to1Conversation: false,
-      message: createLikeMessage({
-        is_liked: ko.pureComputed(() => true),
-      }),
-      onClickLikes: jest.fn(),
-      onLike: jest.fn(),
-    };
-
-    const {getByTestId} = render(<MessageFooterLike {...props} />);
-    const likeNameList = getByTestId('message-liked-names');
-
-    fireEvent.click(likeNameList);
-    expect(props.onClickLikes).toHaveBeenCalled();
-  });
-
-  it('does not open conversation details in 1:1 conversation when clicking on like names', async () => {
-    const props = {
-      isMessageFocused: true,
-      is1to1Conversation: true,
-      message: createLikeMessage({
-        is_liked: ko.pureComputed(() => true),
-      }),
-      onClickLikes: jest.fn(),
-      onLike: jest.fn(),
-    };
-
-    const {getByTestId} = render(<MessageFooterLike {...props} />);
-
-    const likeNameList = getByTestId('message-liked-names');
-    expect(likeNameList).not.toBeNull();
-
-    fireEvent.click(likeNameList);
-    expect(props.onClickLikes).not.toHaveBeenCalled();
-  });
-});
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.tsx
deleted file mode 100644
index 9595373691f..00000000000
--- a/src/script/components/MessagesList/Message/ContentMessage/MessageFooterLike.tsx
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import React from 'react';
-
-import cx from 'classnames';
-
-import {ContentMessage} from 'src/script/entity/message/ContentMessage';
-import {Message} from 'src/script/entity/message/Message';
-import {useKoSubscribableChildren} from 'Util/ComponentUtil';
-
-import {MessageLike} from './MessageLike';
-
-import {useMessageFocusedTabIndex} from '../util';
-
-export interface MessageFooterLikeProps {
-  is1to1Conversation: boolean;
-  message: ContentMessage;
-  onClickLikes: (message: Message) => void;
-  onLike: (message: ContentMessage, button?: boolean) => void;
-  isMessageFocused: boolean;
-}
-
-const MessageFooterLike: React.FC<MessageFooterLikeProps> = ({
-  message,
-  is1to1Conversation,
-  onLike,
-  onClickLikes,
-  isMessageFocused,
-}) => {
-  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
-  const {like_caption: likeCaption, reactions_user_ids: reactionsUserIds} = useKoSubscribableChildren(message, [
-    'is_liked',
-    'like_caption',
-    'reactions_user_ids',
-  ]);
-
-  return (
-    <div className="message-footer">
-      <div className="message-footer-icon">
-        <MessageLike className="like-button" message={message} onLike={onLike} isMessageFocused={isMessageFocused} />
-      </div>
-      <button
-        type="button"
-        className={cx('button-reset-default', 'message-footer-label', {
-          'cursor-pointer': !is1to1Conversation,
-        })}
-        onClick={is1to1Conversation ? undefined : () => onClickLikes(message)}
-        tabIndex={messageFocusedTabIndex}
-      >
-        <span className="message-footer-text" data-uie-name="message-liked-names" data-uie-value={reactionsUserIds}>
-          {likeCaption}
-        </span>
-      </button>
-    </div>
-  );
-};
-
-export {MessageFooterLike};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
index a7d73d84e06..f8a2ba2ec8c 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageHeader.tsx
@@ -19,6 +19,7 @@
 
 import {AVATAR_SIZE, Avatar} from 'Components/Avatar';
 import {Icon} from 'Components/Icon';
+import {UserName} from 'Components/UserName';
 import {ContentMessage} from 'src/script/entity/message/ContentMessage';
 import {DeleteMessage} from 'src/script/entity/message/DeleteMessage';
 import {User} from 'src/script/entity/User';
@@ -90,7 +91,7 @@ export function MessageHeader({
   children,
 }: MessageHeaderParams) {
   const {user: sender} = useKoSubscribableChildren(message, ['user']);
-  const {name: senderName, isAvailable} = useKoSubscribableChildren(sender, ['name', 'isAvailable']);
+  const {isAvailable} = useKoSubscribableChildren(sender, ['isAvailable']);
 
   return (
     <div className="message-header">
@@ -110,7 +111,7 @@ export function MessageHeader({
           data-uie-name={uieName ? `${uieName}-sender-name` : 'sender-name'}
           data-uie-uid={sender.id}
         >
-          {!isAvailable ? t('unavailableUser') : senderName}
+          <UserName user={sender} />
         </h4>
 
         {!noBadges && <BadgeSection sender={sender} />}
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageLike.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageLike.tsx
deleted file mode 100644
index e64fb47fdc4..00000000000
--- a/src/script/components/MessagesList/Message/ContentMessage/MessageLike.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import React from 'react';
-
-import cx from 'classnames';
-
-import {ContentMessage} from 'src/script/entity/message/ContentMessage';
-import {useKoSubscribableChildren} from 'Util/ComponentUtil';
-import {t} from 'Util/LocalizerUtil';
-
-import {useMessageFocusedTabIndex} from '../util';
-
-export interface MessageLikeProps {
-  className?: string;
-  message: ContentMessage;
-  onLike: (message: ContentMessage, button?: boolean) => void;
-  isMessageFocused: boolean;
-}
-
-const MessageLike: React.FC<MessageLikeProps> = ({message, onLike, className, isMessageFocused}) => {
-  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
-  const {is_liked: isLiked} = useKoSubscribableChildren(message, ['is_liked']);
-
-  return (
-    <button
-      className={cx(className, {
-        'like-button-liked': isLiked,
-      })}
-      style={{
-        opacity: isLiked ? 1 : undefined,
-      }}
-      data-uie-name="do-like-message"
-      data-uie-value={isLiked}
-      aria-label={t(isLiked ? 'accessibility.messages.liked' : 'accessibility.messages.like')}
-      onClick={() => onLike(message)}
-      type="button"
-      tabIndex={messageFocusedTabIndex}
-    >
-      <span className="icon-like-small"></span>
-      <span className="icon-liked-small"></span>
-    </button>
-  );
-};
-
-export {MessageLike};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
index 3738573cea5..de221aedb50 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/MessageQuote.tsx
@@ -58,7 +58,7 @@ export interface QuoteProps {
   isMessageFocused: boolean;
 }
 
-const Quote: FC<QuoteProps> = ({
+export const Quote: FC<QuoteProps> = ({
   conversation,
   findMessage,
   focusMessage,
@@ -256,5 +256,3 @@ const QuotedMessage: FC<QuotedMessageProps> = ({
     </>
   );
 };
-
-export {Quote, QuotedMessage};
diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset.tsx
index c47de7a8a3f..be98383f497 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/asset/ImageAsset.tsx
@@ -98,7 +98,7 @@ const ImageAsset: React.FC<ImageAssetProps> = ({
   });
 
   const imageContainerStyle: CSSObject = {
-    aspectRatio: `${asset.ratio}`,
+    aspectRatio: isFileSharingReceivingEnabled ? `${asset.ratio}` : undefined,
     maxWidth: '100%',
     width: asset.width,
     maxHeight: '80vh',
diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/LinkPreviewAssetComponent.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/LinkPreviewAssetComponent.tsx
index 28e62850408..3ef33017ccc 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/asset/LinkPreviewAssetComponent.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/asset/LinkPreviewAssetComponent.tsx
@@ -26,7 +26,7 @@ import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {handleKeyDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 import {safeWindowOpen} from 'Util/SanitizationUtil';
-import {cleanURL} from 'Util/UrlUtil';
+import {cleanURL, prependProtocol} from 'Util/UrlUtil';
 import {isTweetUrl} from 'Util/ValidationUtil';
 
 import {AssetHeader} from './AssetHeader';
@@ -116,13 +116,16 @@ const LinkPreviewAsset: React.FC<LinkPreviewAssetProps> = ({header = false, mess
                 <p>{t('conversationTweetAuthor')}</p>
               </div>
             ) : (
-              <p
+              <a
                 className="link-preview-info-link text-foreground ellipsis"
+                href={prependProtocol(preview.url)}
+                target="_blank"
+                rel="noopener noreferrer"
                 title={preview.url}
                 data-uie-name="link-preview-url"
               >
                 {cleanURL(preview.url)}
-              </p>
+              </a>
             )}
           </>
         )}
diff --git a/src/script/components/MessagesList/Message/ContentMessage/asset/controls/AudioSeekBar.test.tsx b/src/script/components/MessagesList/Message/ContentMessage/asset/controls/AudioSeekBar.test.tsx
index 5f2a86c39da..29aa61a65dd 100644
--- a/src/script/components/MessagesList/Message/ContentMessage/asset/controls/AudioSeekBar.test.tsx
+++ b/src/script/components/MessagesList/Message/ContentMessage/asset/controls/AudioSeekBar.test.tsx
@@ -29,7 +29,7 @@ describe('AudioSeekBar', () => {
       meta: {
         loudness: new Uint8Array(Array.from({length: 200}, (item, index) => index)),
       },
-    } as unknown as FileAsset);
+    }) as unknown as FileAsset;
 
   const createAudioElement = (currentTime = 0) => {
     const audioElement = document.createElement('audio');
diff --git a/src/script/components/MessagesList/Message/FailedToAddUsersMessage.test.tsx b/src/script/components/MessagesList/Message/FailedToAddUsersMessage.test.tsx
index bac6e07560e..a227770ef81 100644
--- a/src/script/components/MessagesList/Message/FailedToAddUsersMessage.test.tsx
+++ b/src/script/components/MessagesList/Message/FailedToAddUsersMessage.test.tsx
@@ -18,120 +18,180 @@
  */
 
 import {act, render} from '@testing-library/react';
-import ko from 'knockout';
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {AddUsersFailureReasons} from '@wireapp/core/lib/conversation';
 
+import en from 'I18n/en-US.json';
 import {withTheme, generateQualifiedIds} from 'src/script/auth/util/test/TestUtil';
 import {FailedToAddUsersMessage as FailedToAddUsersMessageEntity} from 'src/script/entity/message/FailedToAddUsersMessage';
 import {User} from 'src/script/entity/User';
-import {UserRepository} from 'src/script/user/UserRepository';
 import {UserState} from 'src/script/user/UserState';
-import {TestFactory} from 'test/helper/TestFactory';
+import {setStrings} from 'Util/LocalizerUtil';
 
 import {FailedToAddUsersMessage} from './FailedToAddUsersMessage';
 
-const createFailedToAddUsersMessage = (partialFailedToAddUsersMessage: Partial<FailedToAddUsersMessageEntity>) => {
-  const failedToAddUsersMessage: Partial<FailedToAddUsersMessageEntity> = {
-    displayTimestampLong: () => '',
-    displayTimestampShort: () => '',
-    timestamp: ko.observable(Date.now()),
-    unsafeSenderName: ko.pureComputed(() => ''),
-    ...partialFailedToAddUsersMessage,
-  };
-  return failedToAddUsersMessage as FailedToAddUsersMessageEntity;
+setStrings({en});
+
+const createFailedToAddUsersMessage = ({
+  users,
+  reason = AddUsersFailureReasons.UNREACHABLE_BACKENDS,
+  backends = [],
+}: {
+  users: QualifiedId[];
+  reason?: AddUsersFailureReasons;
+  backends?: string[];
+}) => {
+  return new FailedToAddUsersMessageEntity(users, reason, backends, Date.now());
 };
 
-describe('FailedToAddUsersMessage', () => {
-  const testFactory = new TestFactory();
-  let userState: UserState;
-  let userRepository: UserRepository;
-
-  beforeAll(async () => {
-    userRepository = await testFactory.exposeUserActors();
-    userState = userRepository['userState'];
-  });
-
-  afterEach(() => {
-    userRepository['userState'].users.removeAll();
-  });
+function createUser(qualifiedId: QualifiedId, name: string) {
+  const user = new User(qualifiedId.id, qualifiedId.domain);
+  user.name(name);
+  return user;
+}
 
+describe('FailedToAddUsersMessage', () => {
   it('shows that 1 user could not be added', async () => {
+    const userState = new UserState();
     const [qualifiedId1] = generateQualifiedIds(1, 'test.domain');
 
-    const user1 = new User(qualifiedId1.id, qualifiedId1.domain);
+    const user1 = createUser(qualifiedId1, 'Felix');
     userState.users.push(user1);
 
     const message = createFailedToAddUsersMessage({
-      qualifiedIds: [qualifiedId1],
+      users: [qualifiedId1],
     });
 
-    const {getByTestId} = render(
+    const {getAllByText} = render(
       withTheme(<FailedToAddUsersMessage isMessageFocused message={message} userState={userState} />),
     );
 
-    const elementMessageFailedToAdd = getByTestId('element-message-failed-to-add-users');
-    expect(elementMessageFailedToAdd.getAttribute('data-uie-value')).toEqual('1-user-not-added');
+    const mainMessage = getAllByText(
+      (_, element) =>
+        element?.textContent ===
+        'Felix could not be added to the group as the backend of test.domain could not be reached.',
+    );
+    expect(mainMessage.length).toBeGreaterThanOrEqual(1);
   });
 
   it('shows that multiple users could not be added', async () => {
-    const [qualifiedId1, qualifiedId2] = generateQualifiedIds(2, 'test.domain');
+    const userState = new UserState();
+    const [qualifiedId1, qualifiedId2, qualifiedId3] = generateQualifiedIds(3, 'test.domain');
 
-    const user1 = new User(qualifiedId1.id, qualifiedId1.domain);
-    const user2 = new User(qualifiedId2.id, qualifiedId2.domain);
-    userState.users([user1, user2]);
+    const user1 = createUser(qualifiedId1, 'Virgile');
+    const user2 = createUser(qualifiedId2, 'Bardia');
+    const user3 = createUser(qualifiedId3, 'Patryk');
+    userState.users([user1, user2, user3]);
 
     const message = createFailedToAddUsersMessage({
-      qualifiedIds: [qualifiedId1, qualifiedId2],
+      users: [qualifiedId1, qualifiedId2, qualifiedId3],
+      reason: AddUsersFailureReasons.UNREACHABLE_BACKENDS,
     });
 
-    const {getByTestId} = render(
+    const {getAllByText} = render(
       withTheme(<FailedToAddUsersMessage isMessageFocused message={message} userState={userState} />),
     );
 
-    const elementMessageFailedToAdd = getByTestId('element-message-failed-to-add-users');
-    expect(elementMessageFailedToAdd.getAttribute('data-uie-value')).toEqual('multi-users-not-added');
+    const mainMessage = getAllByText(
+      (_, element) => element?.textContent === '3 participants could not be added to the group.',
+    );
+    expect(mainMessage.length).toBeGreaterThanOrEqual(1);
   });
 
   it('shows details of failed to add multi users', async () => {
-    const [qualifiedId1, qualifiedId2] = generateQualifiedIds(2, 'test.domain');
+    const userState = new UserState();
+    const [qualifiedId1, qualifiedId2, qualifiedId3] = generateQualifiedIds(3, 'test.domain');
 
-    const user1 = new User(qualifiedId1.id, qualifiedId1.domain);
-    const user2 = new User(qualifiedId2.id, qualifiedId2.domain);
-    userState.users([user1, user2]);
+    const user1 = createUser(qualifiedId1, 'Tim');
+    const user2 = createUser(qualifiedId2, 'Adrian');
+    const user3 = createUser(qualifiedId3, 'Przemek');
+    userState.users([user1, user2, user3]);
 
     const message = createFailedToAddUsersMessage({
-      qualifiedIds: [qualifiedId1, qualifiedId2],
+      users: [qualifiedId1, qualifiedId2, qualifiedId3],
+      backends: ['test.domain'],
+      reason: AddUsersFailureReasons.UNREACHABLE_BACKENDS,
     });
 
-    const {getByTestId} = render(
+    const {getByText, getAllByText} = render(
       withTheme(<FailedToAddUsersMessage isMessageFocused message={message} userState={userState} />),
     );
 
-    const elementMessageFailedToAdd = getByTestId('element-message-failed-to-add-users');
-    expect(elementMessageFailedToAdd.getAttribute('data-uie-value')).toEqual('multi-users-not-added');
+    const mainMessage = getAllByText(
+      (_, element) => element?.textContent === '3 participants could not be added to the group.',
+    );
 
-    const toggleButton = getByTestId('toggle-failed-to-add-users');
+    expect(mainMessage.length).toBeGreaterThanOrEqual(1);
+
+    const toggleButton = getByText('Show details');
 
     act(() => {
       toggleButton.click();
     });
 
-    const elementMessageFailedToAddDetails = getByTestId('multi-user-not-added-details');
-    expect(elementMessageFailedToAddDetails.getAttribute('data-uie-value')).toEqual(qualifiedId1.domain);
+    const details = getAllByText(
+      (_, element) =>
+        element?.textContent ===
+        'Adrian, Przemek and Tim could not be added to the group as the backend of test.domain could not be reached.',
+    );
+
+    expect(details.length).toBeGreaterThanOrEqual(1);
   });
 
   it('shows details of failed to add multi users from 2 different backends', async () => {
+    const userState = new UserState();
+    const [qualifiedId1] = generateQualifiedIds(1, 'test.domain');
+    const [qualifiedId2] = generateQualifiedIds(1, 'test-2.domain');
+
+    const user1 = createUser(qualifiedId1, 'Tom');
+    const user2 = createUser(qualifiedId2, 'Arjita');
+    userState.users([user1, user2]);
+
+    const message = createFailedToAddUsersMessage({
+      users: [qualifiedId1, qualifiedId2],
+      reason: AddUsersFailureReasons.UNREACHABLE_BACKENDS,
+      backends: ['test-2.domain'],
+    });
+
+    const {getByText, getAllByText} = render(
+      withTheme(<FailedToAddUsersMessage isMessageFocused message={message} userState={userState} />),
+    );
+
+    const mainMessage = getAllByText(
+      (_, element) => element?.textContent === '2 participants could not be added to the group.',
+    );
+    expect(mainMessage.length).toBeGreaterThanOrEqual(1);
+
+    const toggleButton = getByText('Show details');
+
+    act(() => {
+      toggleButton.click();
+    });
+
+    const details = getAllByText(
+      (_, element) =>
+        element?.textContent ===
+        'Arjita and Tom could not be added to the group as the backend of test-2.domain could not be reached.',
+    );
+
+    expect(details.length).toBeGreaterThanOrEqual(1);
+  });
+
+  it('shows details of failed to add users from non federating backends', async () => {
+    const userState = new UserState();
     const [qualifiedId1] = generateQualifiedIds(1, 'test.domain');
     const [qualifiedId2] = generateQualifiedIds(1, 'test-2.domain');
 
-    const user1 = new User(qualifiedId1.id, qualifiedId1.domain);
-    const user2 = new User(qualifiedId2.id, qualifiedId2.domain);
+    const user1 = createUser(qualifiedId1, 'Patryk');
+    const user2 = createUser(qualifiedId2, 'Przemek');
     userState.users([user1, user2]);
 
     const message = createFailedToAddUsersMessage({
-      qualifiedIds: [qualifiedId1, qualifiedId2],
+      users: [qualifiedId1, qualifiedId2],
+      reason: AddUsersFailureReasons.NON_FEDERATING_BACKENDS,
     });
 
-    const {getByTestId, getAllByTestId} = render(
+    const {getByTestId, getAllByText} = render(
       withTheme(<FailedToAddUsersMessage isMessageFocused message={message} userState={userState} />),
     );
 
@@ -144,8 +204,12 @@ describe('FailedToAddUsersMessage', () => {
       toggleButton.click();
     });
 
-    const elementMessageFailedToAddDetails = getAllByTestId('multi-user-not-added-details');
-    expect(elementMessageFailedToAddDetails[0].getAttribute('data-uie-value')).toEqual(qualifiedId1.domain);
-    expect(elementMessageFailedToAddDetails[1].getAttribute('data-uie-value')).toEqual(qualifiedId2.domain);
+    const details = getAllByText(
+      (_, element) =>
+        element?.textContent ===
+        'Przemek and Patryk could not be added to the group as their backends do not federate with each other.',
+    );
+
+    expect(details.length).toBeGreaterThanOrEqual(1);
   });
 });
diff --git a/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx b/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
index 0c2bcdd923b..6fbd030565a 100644
--- a/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
+++ b/src/script/components/MessagesList/Message/FailedToAddUsersMessage.tsx
@@ -17,10 +17,10 @@
  *
  */
 
-import React, {useMemo, useState} from 'react';
+import React, {ReactNode, useMemo, useState} from 'react';
 
+import {AddUsersFailureReasons} from '@wireapp/core/lib/conversation';
 import {container} from 'tsyringe';
-import {groupBy} from 'underscore';
 
 import {Button, ButtonVariant, Link, LinkVariant} from '@wireapp/react-ui-kit';
 
@@ -44,8 +44,49 @@ export interface FailedToAddUsersMessageProps {
   userState?: UserState;
 }
 
+const errorMessageType = {
+  [AddUsersFailureReasons.NON_FEDERATING_BACKENDS]: 'NonFederatingBackends',
+  [AddUsersFailureReasons.UNREACHABLE_BACKENDS]: 'OfflineBackend',
+} as const;
+
 const config = Config.getConfig();
 
+interface MessageDetailsProps {
+  children: ReactNode;
+  users: User[];
+  reason: AddUsersFailureReasons;
+  domains: string[];
+}
+const MessageDetails = ({users, children, reason, domains}: MessageDetailsProps) => {
+  const baseTranslationKey =
+    users.length === 1 ? 'failedToAddParticipantsSingularDetails' : 'failedToAddParticipantsPluralDetails';
+
+  const domainStr = domains.join(', ');
+
+  return (
+    <p
+      data-uie-name="multi-user-not-added-details"
+      data-uie-value={domainStr}
+      style={{lineHeight: 'var(--line-height-sm)'}}
+    >
+      <span
+        css={warning}
+        dangerouslySetInnerHTML={{
+          __html: t(`${baseTranslationKey}${errorMessageType[reason]}`, {
+            name: users[0].name(),
+            names: users
+              .slice(1)
+              .map(user => user.name())
+              .join(', '),
+            domain: domainStr,
+          }),
+        }}
+      />
+      {children}
+    </p>
+  );
+};
+
 const FailedToAddUsersMessage: React.FC<FailedToAddUsersMessageProps> = ({
   isMessageFocused,
   message,
@@ -58,14 +99,13 @@ const FailedToAddUsersMessage: React.FC<FailedToAddUsersMessageProps> = ({
 
   const {users: allUsers} = useKoSubscribableChildren(userState, ['users']);
 
-  const [users, total, groupedUsers] = useMemo(() => {
+  const [users, total] = useMemo(() => {
     const users: User[] = message.qualifiedIds.reduce<User[]>((previous, current) => {
       const foundUser = allUsers.find(user => matchQualifiedIds(current, user.qualifiedId));
       return foundUser ? [...previous, foundUser] : previous;
     }, []);
-    const groupedUsers = groupBy(users, user => user.domain);
     const total = users.length;
-    return [users, total, groupedUsers];
+    return [users, total];
   }, [allUsers, message.qualifiedIds]);
 
   if (users.length === 0) {
@@ -101,15 +141,28 @@ const FailedToAddUsersMessage: React.FC<FailedToAddUsersMessageProps> = ({
           data-uie-name="element-message-failed-to-add-users"
           data-uie-value={total <= 1 ? '1-user-not-added' : 'multi-users-not-added'}
         >
-          <p
-            css={warning}
-            dangerouslySetInnerHTML={{
-              __html:
-                total <= 1
-                  ? t('failedToAddParticipant', {name: users[0].name(), domain: users[0].domain})
-                  : t('failedToAddParticipants', {total: total.toString()}),
-            }}
-          />
+          {total <= 1 && (
+            <p data-uie-name="1-user-not-added-details" data-uie-value={users[0].id}>
+              <span
+                css={warning}
+                dangerouslySetInnerHTML={{
+                  __html: t(`failedToAddParticipantSingular${errorMessageType[message.reason]}`, {
+                    name: users[0].name(),
+                    domain: users[0].domain,
+                  }),
+                }}
+              />
+              {learnMore}
+            </p>
+          )}
+          {total > 1 && (
+            <p
+              css={warning}
+              dangerouslySetInnerHTML={{
+                __html: t(`failedToAddParticipantsPlural`, {total: total.toString()}),
+              }}
+            />
+          )}
         </div>
         <p className="message-body-actions">
           <MessageTime
@@ -119,57 +172,26 @@ const FailedToAddUsersMessage: React.FC<FailedToAddUsersMessageProps> = ({
           />
         </p>
       </div>
-      <div className="message-body">
+      <div className="message-body" css={{flexDirection: 'column'}}>
         {isOpen && (
-          <>
-            {total <= 1 && (
-              <p data-uie-name="1-user-not-added-details" data-uie-value={users[0].id}>
-                <span
-                  css={warning}
-                  dangerouslySetInnerHTML={{
-                    __html: t('failedToAddParticipantDetails', {name: users[0].name(), domain: users[0].domain}),
-                  }}
-                />
-                {learnMore}
-              </p>
-            )}
-            {total > 1 &&
-              Object.entries(groupedUsers).map(([domain, domainUsers]) => (
-                <p
-                  key={domain}
-                  data-uie-name="multi-user-not-added-details"
-                  data-uie-value={domain}
-                  style={{lineHeight: 'var(--line-height-sm)'}}
-                >
-                  <span
-                    css={warning}
-                    dangerouslySetInnerHTML={{
-                      __html: t('failedToAddParticipantsDetails', {
-                        name: domainUsers[domainUsers.length - 1].name(),
-                        names:
-                          domainUsers.length === 2
-                            ? domainUsers[0].name()
-                            : domainUsers.map(user => user.name()).join(', '),
-                        domain,
-                      }),
-                    }}
-                  />
-                  {learnMore}
-                </p>
-              ))}
-          </>
+          <MessageDetails users={users} reason={message.reason} domains={message.backends}>
+            {learnMore}
+          </MessageDetails>
         )}
+
         {total > 1 && (
-          <Button
-            tabIndex={messageFocusedTabIndex}
-            data-uie-name="toggle-failed-to-add-users"
-            type="button"
-            variant={ButtonVariant.TERTIARY}
-            onClick={() => setIsOpen(state => !state)}
-            style={{marginTop: 4}}
-          >
-            {isOpen ? t('messageFailedToSendHideDetails') : t('messageFailedToSendShowDetails')}
-          </Button>
+          <div>
+            <Button
+              tabIndex={messageFocusedTabIndex}
+              data-uie-name="toggle-failed-to-add-users"
+              type="button"
+              variant={ButtonVariant.TERTIARY}
+              onClick={() => setIsOpen(state => !state)}
+              style={{marginTop: 4}}
+            >
+              {isOpen ? t('messageFailedToSendHideDetails') : t('messageFailedToSendShowDetails')}
+            </Button>
+          </div>
         )}
       </div>
     </>
diff --git a/src/script/components/MessagesList/Message/FederationStopMessage.tsx b/src/script/components/MessagesList/Message/FederationStopMessage.tsx
new file mode 100644
index 00000000000..312951c9bc5
--- /dev/null
+++ b/src/script/components/MessagesList/Message/FederationStopMessage.tsx
@@ -0,0 +1,88 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React from 'react';
+
+import {Link, LinkVariant} from '@wireapp/react-ui-kit';
+
+import {Icon} from 'Components/Icon';
+import {Config} from 'src/script/Config';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {t} from 'Util/LocalizerUtil';
+
+import {MessageTime} from './MessageTime';
+import {useMessageFocusedTabIndex} from './util';
+
+import {FederationStopMessage as FederationStopMessageEntity} from '../../../entity/message/FederationStopMessage';
+
+export interface FederationStopMessageProps {
+  message: FederationStopMessageEntity;
+  isMessageFocused: boolean;
+}
+
+const config = Config.getConfig();
+
+const FederationStopMessage: React.FC<FederationStopMessageProps> = ({message, isMessageFocused}) => {
+  const {timestamp} = useKoSubscribableChildren(message, ['timestamp']);
+  const {id, domains} = message;
+  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
+
+  return (
+    <div className="message-header">
+      <div className="message-header-icon message-header-icon--svg">
+        <div>
+          <Icon.Info />
+        </div>
+      </div>
+      <div
+        className="message-header-label"
+        data-uie-name="element-message-failed-to-add-users"
+        data-uie-value={`domains-${domains.join('_')}`}
+      >
+        <span
+          dangerouslySetInnerHTML={{
+            __html:
+              domains.length === 1
+                ? t('federationDelete', {backendUrl: domains[0]})
+                : t('federationConnectionRemove', {backendUrlOne: domains[0], backendUrlTwo: domains[1]}),
+          }}
+        />
+        <Link
+          css={{fontSize: 'var(--font-size-small)', marginLeft: 2}}
+          tabIndex={messageFocusedTabIndex}
+          targetBlank
+          variant={LinkVariant.PRIMARY}
+          href={config.URL.SUPPORT.FEDERATION_STOP}
+          data-uie-name="go-stop-federation"
+        >
+          {t('offlineBackendLearnMore')}
+        </Link>
+      </div>
+      <p className="message-body-actions">
+        <MessageTime
+          timestamp={timestamp}
+          data-uie-uid={id}
+          data-uie-name="item-message-failed-to-add-users-timestamp"
+        />
+      </p>
+    </div>
+  );
+};
+
+export {FederationStopMessage};
diff --git a/src/script/components/MessagesList/Message/MemberMessage.test.tsx b/src/script/components/MessagesList/Message/MemberMessage.test.tsx
index d9dd926670a..ca43501098b 100644
--- a/src/script/components/MessagesList/Message/MemberMessage.test.tsx
+++ b/src/script/components/MessagesList/Message/MemberMessage.test.tsx
@@ -18,63 +18,286 @@
  */
 
 import {render} from '@testing-library/react';
-import ko from 'knockout';
+import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event';
 
+import {randomInt} from 'crypto';
+
+import en from 'I18n/en-US.json';
 import {MemberMessage as MemberMessageEntity} from 'src/script/entity/message/MemberMessage';
 import {User} from 'src/script/entity/User';
+import {SystemMessageType} from 'src/script/message/SystemMessageType';
+import {generateUser} from 'test/helper/UserGenerator';
+import {setStrings} from 'Util/LocalizerUtil';
 
 import {MemberMessage} from './MemberMessage';
+import {CONFIG} from './MemberMessage/MessageContent';
+
+setStrings({en});
+
+function createMemberMessage({systemType, type}: {systemType?: SystemMessageType; type?: string}, users?: User[]) {
+  const message = new MemberMessageEntity();
+  if (systemType) {
+    message.memberMessageType = systemType;
+  }
+  if (type) {
+    message.type = type;
+  }
+  const actor = generateUser();
+  message.user(actor);
+  if (users) {
+    message.userIds(users.map(user => user.qualifiedId));
+    message.userEntities(users);
+  } else {
+    message.userIds([actor.qualifiedId]);
+    message.userEntities([actor]);
+  }
+  message.name('message');
 
-const createMemberMessage = (partialMemberMessage: Partial<MemberMessageEntity>) => {
-  const memberMessage: Partial<MemberMessageEntity> = {
-    hasUsers: ko.pureComputed(() => false),
-    isGroupCreation: () => false,
-    isMemberChange: () => false,
-    isMemberJoin: () => false,
-    isMemberLeave: () => false,
-    isMemberRemoval: () => false,
-    showLargeAvatar: () => false,
-    showNamedCreation: ko.pureComputed(() => true),
-    timestamp: ko.observable(Date.now()),
-    ...partialMemberMessage,
-  };
-  return memberMessage as MemberMessageEntity;
+  return message;
+}
+
+const baseProps = {
+  hasReadReceiptsTurnedOn: false,
+  isSelfTemporaryGuest: false,
+  onClickCancelRequest: jest.fn(),
+  onClickInvitePeople: jest.fn(),
+  onClickParticipants: jest.fn(),
+  shouldShowInvitePeople: false,
+  conversationName: 'group 1',
 };
 
 describe('MemberMessage', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('shows connected message', async () => {
     const props = {
-      hasReadReceiptsTurnedOn: false,
-      isSelfTemporaryGuest: false,
-      message: createMemberMessage({
-        otherUser: ko.pureComputed(() => new User('id')),
-        showLargeAvatar: () => true,
-      }),
-      onClickCancelRequest: () => {},
-      onClickInvitePeople: () => {},
-      onClickParticipants: () => {},
-      shouldShowInvitePeople: false,
-      conversationName: 'group 1',
+      ...baseProps,
+      message: createMemberMessage({systemType: SystemMessageType.CONNECTION_ACCEPTED}, [new User('id')]),
     };
 
-    const {queryByTestId} = render(<MemberMessage {...props} />);
-    expect(queryByTestId('element-connected-message')).not.toBeNull();
+    const {getByTestId} = render(<MemberMessage {...props} />);
+    expect(getByTestId('element-connected-message')).not.toBeNull();
   });
-  it('shows conversation title', async () => {
-    const props = {
-      hasReadReceiptsTurnedOn: false,
-      isSelfTemporaryGuest: false,
-      message: createMemberMessage({
-        otherUser: ko.pureComputed(() => new User('id')),
-      }),
-      onClickCancelRequest: () => {},
-      onClickInvitePeople: () => {},
-      onClickParticipants: () => {},
-      shouldShowInvitePeople: false,
-      conversationName: 'group 1',
-    };
 
-    const {getByTestId} = render(<MemberMessage {...props} />);
-    expect(getByTestId('conversation-name').textContent).toBe(props.conversationName);
+  describe('CONVERSATION_CREATE', () => {
+    it('displays participants of a newly created conversation', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, users);
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {getByText} = render(<MemberMessage {...props} />);
+      users.forEach(user => {
+        expect(getByText(user.name())).not.toBeNull();
+      });
+    });
+
+    it('displays a showMore when there are more than MAX_USERS_VISIBLE users', () => {
+      const nbExtraUsers = randomInt(1, 10);
+      const nbUsers = CONFIG.MAX_USERS_VISIBLE + nbExtraUsers;
+
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, users);
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {getByText, container} = render(<MemberMessage {...props} />);
+
+      // We expect to see the first 15 users + the user that created the conversation
+      expect(container.querySelectorAll('strong')).toHaveLength(CONFIG.REDUCED_USERS_COUNT + 1);
+      const showMoreButton = getByText(`${nbUsers - CONFIG.REDUCED_USERS_COUNT} more`);
+      showMoreButton.click();
+
+      expect(props.onClickParticipants).toHaveBeenCalledTimes(1);
+    });
+
+    it('displays all team members', () => {
+      const nbExtraUsers = randomInt(1, 10);
+      const nbTeamUsers = CONFIG.MAX_WHOLE_TEAM_USERS_VISIBLE + nbExtraUsers;
+
+      const teamUsers = Array.from({length: nbTeamUsers}, () => generateUser());
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, teamUsers);
+      message.allTeamMembers = teamUsers;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {getByText} = render(<MemberMessage {...props} />);
+      const showMoreButton = getByText(`all team members`);
+      showMoreButton.click();
+
+      expect(props.onClickParticipants).toHaveBeenCalledTimes(1);
+    });
+
+    it('displays all team members and one guest message', () => {
+      const nbExtraUsers = randomInt(1, 10);
+      const nbTeamUsers = CONFIG.MAX_WHOLE_TEAM_USERS_VISIBLE + nbExtraUsers;
+
+      const teamUsers = Array.from({length: nbTeamUsers}, () => generateUser());
+      const guest = generateUser();
+      guest.isGuest(true);
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, [...teamUsers, guest]);
+      message.allTeamMembers = teamUsers;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {getByText} = render(<MemberMessage {...props} />);
+      expect(getByText(`all team members and one guest`)).not.toBeNull();
+    });
+
+    it('displays all team members and multiple guests message', () => {
+      const nbGuests = randomInt(2, 10);
+      const nbTeamUsers = CONFIG.MAX_WHOLE_TEAM_USERS_VISIBLE;
+
+      const teamUsers = Array.from({length: nbTeamUsers}, () => generateUser());
+      const guests = Array.from({length: nbGuests}, () => {
+        const guest = generateUser();
+        guest.isGuest(true);
+        return guest;
+      });
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, [
+        ...teamUsers,
+        ...guests,
+      ]);
+      message.allTeamMembers = teamUsers;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {getByText} = render(<MemberMessage {...props} />);
+      expect(getByText(`all team members and ${nbGuests} guests`)).not.toBeNull();
+    });
+
+    it('displays that another user created a conversation', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, users);
+      message.name('');
+      message.user().name('Creator');
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`Creator started a conversation with`);
+    });
+
+    it('displays that self user created a conversation', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({systemType: SystemMessageType.CONVERSATION_CREATE}, users);
+      message.name('');
+      message.user().isMe = true;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`You started a conversation with`);
+    });
+  });
+
+  describe('MEMBER_JOIN', () => {
+    it('displays that self user added new members', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_JOIN}, users);
+      message.user().isMe = true;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`You added `);
+    });
+
+    it('displays that a new members were added by someone', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_JOIN}, users);
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`${message.user().name()} added `);
+    });
+
+    it('displays that a new members joined the conversation', () => {
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_JOIN});
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`${message.user().name()} joined`);
+    });
+  });
+
+  describe('MEMBER_LEAVE', () => {
+    it('displays that self user left the conversation', () => {
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_LEAVE});
+      message.user().isMe = true;
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`You left`);
+    });
+
+    it('displays that a member left the conversation', () => {
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_LEAVE});
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`${message.user().name()} left`);
+    });
+
+    it('displays that a member was removed by someone', () => {
+      const removedUser = generateUser();
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_LEAVE}, [removedUser]);
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`${message.user().name()} removed ${removedUser.name()}`);
+    });
+
+    it('displays that many users were removed', () => {
+      const nbUsers = randomInt(1, 10);
+      const users = Array.from({length: nbUsers}, () => generateUser());
+      const message = createMemberMessage({type: CONVERSATION_EVENT.MEMBER_LEAVE}, users);
+      message.user().id = '';
+      const props = {
+        ...baseProps,
+        message,
+      };
+
+      const {container} = render(<MemberMessage {...props} />);
+      expect(container.textContent).toContain(`were removed`);
+    });
   });
 });
diff --git a/src/script/components/MessagesList/Message/MemberMessage.tsx b/src/script/components/MessagesList/Message/MemberMessage.tsx
index 1d877cba96d..813e82da9d7 100644
--- a/src/script/components/MessagesList/Message/MemberMessage.tsx
+++ b/src/script/components/MessagesList/Message/MemberMessage.tsx
@@ -22,16 +22,17 @@ import React from 'react';
 import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
 
 import {Icon} from 'Components/Icon';
+import {MemberMessage as MemberMessageEntity} from 'src/script/entity/message/MemberMessage';
 import {User} from 'src/script/entity/User';
+import {SystemMessageType} from 'src/script/message/SystemMessageType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
-import {ConnectedMessage} from './memberMessage/ConnectedMessage';
+import {ConnectedMessage} from './MemberMessage/ConnectedMessage';
+import {MessageContent} from './MemberMessage/MessageContent';
 import {MessageTime} from './MessageTime';
 
-import {MemberMessage as MemberMessageEntity} from '../../../entity/message/MemberMessage';
-
-export interface MemberMessageProps {
+interface MemberMessageProps {
   classifiedDomains?: string[];
   hasReadReceiptsTurnedOn: boolean;
   isSelfTemporaryGuest: boolean;
@@ -43,7 +44,7 @@ export interface MemberMessageProps {
   conversationName: string;
 }
 
-const MemberMessage: React.FC<MemberMessageProps> = ({
+export const MemberMessage: React.FC<MemberMessageProps> = ({
   message,
   shouldShowInvitePeople,
   isSelfTemporaryGuest,
@@ -54,147 +55,128 @@ const MemberMessage: React.FC<MemberMessageProps> = ({
   classifiedDomains,
   conversationName,
 }) => {
-  const {
-    otherUser,
-    timestamp,
-    user,
-    htmlGroupCreationHeader,
-    htmlCaption,
-    highlightedUsers,
-    showNamedCreation,
-    hasUsers,
-  } = useKoSubscribableChildren(message, [
-    'otherUser',
-    'timestamp',
-    'user',
-    'name',
-    'htmlGroupCreationHeader',
-    'htmlCaption',
-    'highlightedUsers',
-    'showNamedCreation',
-    'hasUsers',
-  ]);
-
-  const showConnectedMessage = message.showLargeAvatar();
+  const {otherUser, timestamp, user, htmlGroupCreationHeader, showNamedCreation, hasUsers} = useKoSubscribableChildren(
+    message,
+    ['otherUser', 'timestamp', 'user', 'htmlGroupCreationHeader', 'showNamedCreation', 'hasUsers'],
+  );
+
   const isGroupCreation = message.isGroupCreation();
   const isMemberRemoval = message.isMemberRemoval();
   const isMemberJoin = message.isMemberJoin();
   const isMemberLeave = message.isMemberLeave();
   const isMemberChange = message.isMemberChange();
 
-  const handleShowMoreClick = (event: React.MouseEvent<HTMLElement, MouseEvent>) => {
-    const clickedOnShowMore = (event.target as HTMLElement).closest('.message-header-show-more');
-    if (clickedOnShowMore) {
-      onClickParticipants(highlightedUsers);
-    }
-  };
+  const isConnectedMessage = [SystemMessageType.CONNECTION_ACCEPTED, SystemMessageType.CONNECTION_REQUEST].includes(
+    message.memberMessageType,
+  );
+
+  if (isConnectedMessage) {
+    return (
+      <ConnectedMessage
+        user={otherUser}
+        showServicesWarning={message.showServicesWarning}
+        onClickCancelRequest={() => onClickCancelRequest(message)}
+        classifiedDomains={classifiedDomains}
+      />
+    );
+  }
 
   return (
     <>
-      {showConnectedMessage ? (
-        <ConnectedMessage
-          user={otherUser}
-          showServicesWarning={message.showServicesWarning}
-          onClickCancelRequest={() => onClickCancelRequest(message)}
-          classifiedDomains={classifiedDomains}
-        />
-      ) : (
-        <>
-          {showNamedCreation && (
-            <div className="message-group-creation-header">
-              <p
-                className="message-group-creation-header-text"
-                dangerouslySetInnerHTML={{__html: htmlGroupCreationHeader}}
+      {showNamedCreation && (
+        <div className="message-group-creation-header">
+          <p
+            className="message-group-creation-header-text"
+            dangerouslySetInnerHTML={{__html: htmlGroupCreationHeader}}
+          />
+          <h2 className="message-group-creation-header-name" data-uie-name="conversation-name">
+            {conversationName}
+          </h2>
+        </div>
+      )}
+
+      {hasUsers && (
+        <div className="message-header">
+          <div className="message-header-icon message-header-icon--svg text-foreground">
+            {isGroupCreation && <Icon.Message />}
+            {isMemberRemoval && <span className="icon-minus" />}
+            {isMemberJoin && <span className="icon-plus" />}
+          </div>
+          <div className="message-header-label">
+            <MessageContent onClickParticipants={onClickParticipants} message={message} />
+          </div>
+          {isMemberChange && (
+            <div className="message-body-actions">
+              <MessageTime
+                timestamp={timestamp}
+                data-uie-uid={message.id}
+                data-uie-name="item-message-member-timestamp"
               />
-              <h2 className="message-group-creation-header-name" data-uie-name="conversation-name">
-                {conversationName}
-              </h2>
             </div>
           )}
-          {hasUsers && (
-            <div className="message-header">
-              <div className="message-header-icon message-header-icon--svg text-foreground">
-                {isGroupCreation && <Icon.Message />}
-                {isMemberRemoval && <span className="icon-minus" />}
-                {isMemberJoin && <span className="icon-plus" />}
-              </div>
-              {/* event is being triggered only when clicked on <a> tag with specified class (keyboard accessible by default) */}
-              {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
-              <div onClick={handleShowMoreClick} className="message-header-label">
-                <p className="message-header-caption" dangerouslySetInnerHTML={{__html: htmlCaption}} />
-              </div>
-              {isMemberChange && (
-                <div className="message-body-actions">
-                  <MessageTime
-                    timestamp={timestamp}
-                    data-uie-uid={message.id}
-                    data-uie-name="item-message-member-timestamp"
-                  />
-                </div>
-              )}
-            </div>
-          )}
-          {hasUsers && message.showServicesWarning && (
-            <p className="message-services-warning" data-uie-name="label-services-warning">
-              {t('conversationServicesWarning')}
-            </p>
-          )}
+        </div>
+      )}
 
-          {isGroupCreation && shouldShowInvitePeople && (
-            <div className="message-member-footer">
-              <p>{t('guestRoomConversationHead')}</p>
-
-              <Button
-                variant={ButtonVariant.TERTIARY}
-                type="button"
-                onClick={onClickInvitePeople}
-                data-uie-name="do-invite-people"
-                style={{marginTop: '1em'}}
-              >
-                {t('guestRoomConversationButton')}
-              </Button>
-            </div>
-          )}
+      {hasUsers && message.showServicesWarning && (
+        <p className="message-services-warning" data-uie-name="label-services-warning">
+          {t('conversationServicesWarning')}
+        </p>
+      )}
 
-          {isGroupCreation && isSelfTemporaryGuest && (
-            <div className="message-member-footer">
-              <p className="message-member-footer-message">{t('temporaryGuestJoinMessage')}</p>
-              <p className="message-member-footer-description">{t('temporaryGuestJoinDescription')}</p>
-            </div>
-          )}
-          {isGroupCreation && hasReadReceiptsTurnedOn && (
-            <div className="message-header" data-uie-name="label-group-creation-receipts">
-              <div className="message-header-icon message-header-icon--svg text-foreground">
-                <Icon.Read />
-              </div>
-              <p className="message-header-label">
-                <span className="ellipsis">{t('conversationCreateReceiptsEnabled')}</span>
-              </p>
-            </div>
-          )}
-          {isMemberLeave && user.isMe && isSelfTemporaryGuest && (
-            <div className="message-member-footer">
-              <p className="message-member-footer-description">{t('temporaryGuestLeaveDescription')}</p>
+      {isGroupCreation && shouldShowInvitePeople && (
+        <div className="message-member-footer">
+          <p>{t('guestRoomConversationHead')}</p>
+
+          <Button
+            variant={ButtonVariant.TERTIARY}
+            type="button"
+            onClick={onClickInvitePeople}
+            data-uie-name="do-invite-people"
+            style={{marginTop: '1em'}}
+          >
+            {t('guestRoomConversationButton')}
+          </Button>
+        </div>
+      )}
+
+      {isGroupCreation && isSelfTemporaryGuest && (
+        <div className="message-member-footer">
+          <p className="message-member-footer-message">{t('temporaryGuestJoinMessage')}</p>
+          <p className="message-member-footer-description">{t('temporaryGuestJoinDescription')}</p>
+        </div>
+      )}
+
+      {isGroupCreation && hasReadReceiptsTurnedOn && (
+        <div className="message-header" data-uie-name="label-group-creation-receipts">
+          <div className="message-header-icon message-header-icon--svg text-foreground">
+            <Icon.Read />
+          </div>
+          <p className="message-header-label">
+            <span className="ellipsis">{t('conversationCreateReceiptsEnabled')}</span>
+          </p>
+        </div>
+      )}
+
+      {isMemberLeave && user.isMe && isSelfTemporaryGuest && (
+        <div className="message-member-footer">
+          <p className="message-member-footer-description">{t('temporaryGuestLeaveDescription')}</p>
+        </div>
+      )}
+
+      {isGroupCreation && (
+        <>
+          <div className="message-header">
+            <div className="message-header-icon" />
+            <p className="message-header-label">{t('conversationNewConversation')}</p>
+          </div>
+          <div className="message-header">
+            <div className="message-header-icon message-header-icon--svg text-foreground">
+              <Icon.Info />
             </div>
-          )}
-          {isGroupCreation && (
-            <>
-              <div className="message-header">
-                <div className="message-header-icon" />
-                <p className="message-header-label">{t('conversationNewConversation')}</p>
-              </div>
-              <div className="message-header">
-                <div className="message-header-icon message-header-icon--svg text-foreground">
-                  <Icon.Info />
-                </div>
-                <p className="message-header-label">{t('conversationUnverifiedUserWarning')}</p>
-              </div>
-            </>
-          )}
+            <p className="message-header-label">{t('conversationUnverifiedUserWarning')}</p>
+          </div>
         </>
       )}
     </>
   );
 };
-
-export {MemberMessage};
diff --git a/src/script/components/MessagesList/Message/memberMessage/ConnectedMessage.tsx b/src/script/components/MessagesList/Message/MemberMessage/ConnectedMessage.tsx
similarity index 91%
rename from src/script/components/MessagesList/Message/memberMessage/ConnectedMessage.tsx
rename to src/script/components/MessagesList/Message/MemberMessage/ConnectedMessage.tsx
index d2170cf263f..a60b1f1d094 100644
--- a/src/script/components/MessagesList/Message/memberMessage/ConnectedMessage.tsx
+++ b/src/script/components/MessagesList/Message/MemberMessage/ConnectedMessage.tsx
@@ -23,20 +23,20 @@ import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
 
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
 import {Icon} from 'Components/Icon';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {UserClassifiedBar} from 'Components/input/ClassifiedBar';
 import {UnverifiedUserWarning} from 'Components/Modals/UserModal';
 import {User} from 'src/script/entity/User';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
-export interface ConnectedMessageProps {
+interface ConnectedMessageProps {
   classifiedDomains?: string[];
   onClickCancelRequest: () => void;
   showServicesWarning?: boolean;
   user: User;
 }
 
-const ConnectedMessage: React.FC<ConnectedMessageProps> = ({
+export const ConnectedMessage: React.FC<ConnectedMessageProps> = ({
   user,
   onClickCancelRequest,
   showServicesWarning = false,
@@ -59,7 +59,9 @@ const ConnectedMessage: React.FC<ConnectedMessageProps> = ({
         <p className="message-connected-username label-username">{handle}</p>
       )}
 
-      {isOutgoingRequest && classifiedDomains && <ClassifiedBar users={[user]} classifiedDomains={classifiedDomains} />}
+      {isOutgoingRequest && classifiedDomains && (
+        <UserClassifiedBar users={[user]} classifiedDomains={classifiedDomains} />
+      )}
 
       <Avatar
         avatarSize={AVATAR_SIZE.X_LARGE}
@@ -103,5 +105,3 @@ const ConnectedMessage: React.FC<ConnectedMessageProps> = ({
     </div>
   );
 };
-
-export {ConnectedMessage};
diff --git a/src/script/components/MessagesList/Message/MemberMessage/MessageContent.tsx b/src/script/components/MessagesList/Message/MemberMessage/MessageContent.tsx
new file mode 100644
index 00000000000..78dac9639ea
--- /dev/null
+++ b/src/script/components/MessagesList/Message/MemberMessage/MessageContent.tsx
@@ -0,0 +1,215 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/';
+import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
+
+import {Config} from 'src/script/Config';
+import {MemberMessage as MemberMessageEntity} from 'src/script/entity/message/MemberMessage';
+import {User} from 'src/script/entity/User';
+import {ClientEvent} from 'src/script/event/Client';
+import {SystemMessageType} from 'src/script/message/SystemMessageType';
+import {Declension, joinNames, replaceLink, t} from 'Util/LocalizerUtil';
+import {replaceReactComponents} from 'Util/LocalizerUtil/ReactLocalizerUtil';
+import {matchQualifiedIds} from 'Util/QualifiedId';
+
+export const CONFIG = {
+  MAX_USERS_VISIBLE: 17,
+  MAX_WHOLE_TEAM_USERS_VISIBLE: 10,
+  REDUCED_USERS_COUNT: 15,
+} as const;
+
+function generateNames(users: User[], declension = Declension.ACCUSATIVE, hasExtra = false) {
+  const visibleUsers = hasExtra ? getVisibleUsers(users) : users;
+  return joinNames(visibleUsers, declension, hasExtra, true);
+}
+
+function getVisibleUsers(users: User[]) {
+  return users.slice(0, CONFIG.REDUCED_USERS_COUNT);
+}
+
+function ShowMoreButton({children, onClick}: {children: React.ReactNode; onClick: () => void}) {
+  return (
+    <button
+      className="message-header-show-more button-reset-default accent-text"
+      onClick={event => {
+        event.preventDefault();
+        onClick();
+      }}
+      data-uie-name="do-show-more"
+    >
+      {children}
+    </button>
+  );
+}
+
+function getContent(message: MemberMessageEntity) {
+  if (!message.hasUsers()) {
+    return '';
+  }
+
+  /** the users that are impacted by the member event */
+  const targetedUsers = message.targetedUsers();
+  /** the user that triggered the action */
+  const actor = message.user();
+
+  const exceedsMaxVisibleUsers = targetedUsers.length > CONFIG.MAX_USERS_VISIBLE;
+
+  /** the number of users that will not be displayed on screen */
+  const hiddenUsersCount = exceedsMaxVisibleUsers ? targetedUsers.length - CONFIG.REDUCED_USERS_COUNT : 0;
+
+  const dativeUsers = generateNames(targetedUsers, Declension.DATIVE, exceedsMaxVisibleUsers);
+  const accusativeUsers = generateNames(targetedUsers, Declension.ACCUSATIVE, exceedsMaxVisibleUsers);
+  const name = message.senderName();
+
+  switch (message.memberMessageType) {
+    case SystemMessageType.CONVERSATION_CREATE: {
+      if (message.name().length) {
+        const exceedsMaxTeam = targetedUsers.length > CONFIG.MAX_WHOLE_TEAM_USERS_VISIBLE;
+        if (message.allTeamMembers && exceedsMaxTeam) {
+          const guestCount = targetedUsers.filter(userEntity => userEntity.isGuest()).length;
+          if (!guestCount) {
+            return t('conversationCreateTeam', {});
+          }
+
+          const hasSingleGuest = guestCount === 1;
+          return hasSingleGuest ? t('conversationCreateTeamGuest', {}) : t('conversationCreateTeamGuests', guestCount);
+        }
+
+        return exceedsMaxVisibleUsers
+          ? t('conversationCreateWithMore', {count: hiddenUsersCount.toString(), users: dativeUsers})
+          : t('conversationCreateWith', dativeUsers);
+      }
+
+      if (actor.isMe) {
+        return exceedsMaxVisibleUsers
+          ? t('conversationCreatedYouMore', {count: hiddenUsersCount.toString(), users: dativeUsers})
+          : t('conversationCreatedYou', dativeUsers);
+      }
+
+      return exceedsMaxVisibleUsers
+        ? t('conversationCreatedMore', {count: hiddenUsersCount.toString(), name, users: dativeUsers})
+        : t('conversationCreated', {name, users: dativeUsers});
+    }
+
+    case SystemMessageType.CONVERSATION_RESUME: {
+      return t('conversationResume', generateNames(targetedUsers, Declension.DATIVE, false));
+    }
+
+    default:
+      break;
+  }
+
+  switch (message.type) {
+    case CONVERSATION_EVENT.MEMBER_JOIN: {
+      const senderJoined = matchQualifiedIds(message.otherUser(), actor);
+      if (senderJoined) {
+        return message.user().isMe
+          ? t('conversationMemberJoinedSelfYou')
+          : t('conversationMemberJoinedSelf', message.senderName());
+      }
+
+      if (message.user().isMe) {
+        return exceedsMaxVisibleUsers
+          ? t('conversationMemberJoinedYouMore', {count: hiddenUsersCount.toString(), users: accusativeUsers})
+          : t('conversationMemberJoinedYou', accusativeUsers);
+      }
+      return exceedsMaxVisibleUsers
+        ? t('conversationMemberJoinedMore', {count: hiddenUsersCount.toString(), name, users: accusativeUsers})
+        : t('conversationMemberJoined', {name, users: accusativeUsers});
+    }
+
+    case CONVERSATION_EVENT.MEMBER_LEAVE: {
+      if (message.reason === MemberLeaveReason.LEGAL_HOLD_POLICY_CONFLICT) {
+        const replaceLinkLegalHold = replaceLink(
+          Config.getConfig().URL.SUPPORT.LEGAL_HOLD_BLOCK,
+          '',
+          'read-more-legal-hold',
+        );
+        if (message.userEntities().some(user => user.isMe)) {
+          return t('conversationYouRemovedMissingLegalHoldConsent', {}, replaceLinkLegalHold);
+        }
+        const users = generateNames(targetedUsers);
+
+        if (message.userEntities().length === 1) {
+          return t('conversationMemberRemovedMissingLegalHoldConsent', users, replaceLinkLegalHold);
+        }
+        if (exceedsMaxVisibleUsers) {
+          return t(
+            'conversationMultipleMembersRemovedMissingLegalHoldConsentMore',
+            {
+              count: hiddenUsersCount.toString(10),
+              users,
+            },
+            replaceLinkLegalHold,
+          );
+        }
+        return t('conversationMultipleMembersRemovedMissingLegalHoldConsent', users, replaceLinkLegalHold);
+      }
+      const temporaryGuestRemoval = message.otherUser().isMe && message.otherUser().isTemporaryGuest();
+      if (temporaryGuestRemoval) {
+        return t('temporaryGuestLeaveMessage');
+      }
+
+      const senderLeft = matchQualifiedIds(message.otherUser(), actor);
+      if (senderLeft) {
+        return message.user().isMe ? t('conversationMemberLeftYou') : t('conversationMemberLeft', name);
+      }
+
+      const allUsers = generateNames(targetedUsers);
+      if (!actor.id) {
+        return t('conversationMemberWereRemoved', allUsers);
+      }
+      return actor.isMe
+        ? t('conversationMemberRemovedYou', allUsers)
+        : t('conversationMemberRemoved', {name, users: allUsers});
+    }
+
+    case ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE: {
+      return t('conversationTeamLeft', name);
+    }
+
+    default:
+      break;
+  }
+  return '';
+}
+
+export function MessageContent({
+  message,
+  onClickParticipants,
+}: {
+  message: MemberMessageEntity;
+  onClickParticipants: (participants: User[]) => void;
+}) {
+  const htmlCaption = getContent(message);
+  const content = replaceReactComponents(htmlCaption, [
+    {start: '<strong>', end: '</strong>', render: text => <strong key={text}>{text}</strong>},
+    {
+      start: '[showmore]',
+      end: '[/showmore]',
+      render: text => (
+        <ShowMoreButton key={text} onClick={() => onClickParticipants(message.targetedUsers())}>
+          {text}
+        </ShowMoreButton>
+      ),
+    },
+  ]);
+  return <p className="message-header-caption">{content}</p>;
+}
diff --git a/src/script/components/MessagesList/Message/MessageWrapper.tsx b/src/script/components/MessagesList/Message/MessageWrapper.tsx
index e589941d60c..d2bfee2d92c 100644
--- a/src/script/components/MessagesList/Message/MessageWrapper.tsx
+++ b/src/script/components/MessagesList/Message/MessageWrapper.tsx
@@ -19,6 +19,7 @@
 
 import React from 'react';
 
+import {ReactionType} from '@wireapp/core/lib/conversation';
 import {amplify} from 'amplify';
 import ko from 'knockout';
 import {container} from 'tsyringe';
@@ -38,6 +39,7 @@ import {ContentMessageComponent} from './ContentMessage';
 import {DecryptErrorMessage} from './DecryptErrorMessage';
 import {DeleteMessage} from './DeleteMessage';
 import {FailedToAddUsersMessage} from './FailedToAddUsersMessage';
+import {FederationStopMessage} from './FederationStopMessage';
 import {FileTypeRestrictedMessage} from './FileTypeRestrictedMessage';
 import {LegalHoldMessage} from './LegalHoldMessage';
 import {MemberMessage} from './MemberMessage';
@@ -72,19 +74,16 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
   onClickAvatar,
   onClickImage,
   onClickInvitePeople,
-  onClickLikes,
+  onClickReactionDetails,
   onClickMessage,
   onClickTimestamp,
   onClickParticipants,
-  onClickReceipts,
+  onClickDetails,
   onClickResetSession,
   onClickCancelRequest,
-  onLike,
   messageRepository,
   messageActions,
   teamState = container.resolve(TeamState),
-  handleFocus,
-  totalMessage,
   isMsgElementsFocusable,
 }) => {
   const findMessage = async (conversation: Conversation, messageId: string) => {
@@ -137,15 +136,6 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
       });
     }
 
-    if (message.isReactable() && !conversation.removed_from_conversation()) {
-      const label = message.is_liked() ? t('conversationContextMenuUnlike') : t('conversationContextMenuLike');
-
-      entries.push({
-        click: () => onLike(message, false),
-        label,
-      });
-    }
-
     if (canEdit) {
       entries.push({
         click: () => amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.EDIT, message),
@@ -153,13 +143,6 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
       });
     }
 
-    if (message.isReplyable() && !conversation.removed_from_conversation()) {
-      entries.push({
-        click: () => amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.REPLY, message),
-        label: t('conversationContextMenuReply'),
-      });
-    }
-
     if (message.isCopyable() && !isRestrictedFileShare) {
       entries.push({
         click: () => message.copy(),
@@ -169,7 +152,7 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
 
     if (hasDetails) {
       entries.push({
-        click: () => onClickReceipts(message),
+        click: () => onClickDetails(message),
         label: t('conversationContextMenuDetails'),
       });
     }
@@ -191,6 +174,12 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
     return entries;
   });
 
+  const handleReactionClick = (reaction: ReactionType): void => {
+    if (!message.isContent()) {
+      return;
+    }
+    return void messageRepository.toggleReaction(conversation, message, reaction, selfId.id);
+  };
   if (message.isContent()) {
     return (
       <ContentMessageComponent
@@ -201,10 +190,9 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
         hasMarker={hasMarker}
         selfId={selfId}
         isLastDeliveredMessage={isLastDeliveredMessage}
-        onLike={onLike}
         onClickMessage={onClickMessage}
         onClickTimestamp={onClickTimestamp}
-        onClickLikes={onClickLikes}
+        onClickReactionDetails={onClickReactionDetails}
         onClickButton={clickButton}
         onClickAvatar={onClickAvatar}
         contextMenu={{entries: contextMenuEntries}}
@@ -212,10 +200,11 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
         onClickImage={onClickImage}
         onClickInvitePeople={onClickInvitePeople}
         onClickParticipants={onClickParticipants}
-        onClickReceipts={onClickReceipts}
+        onClickDetails={onClickDetails}
         onRetry={onRetry}
         isMessageFocused={isMessageFocused}
         isMsgElementsFocusable={isMsgElementsFocusable}
+        onClickReaction={handleReactionClick}
       />
     );
   }
@@ -225,6 +214,9 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
   if (message.isLegalHold()) {
     return <LegalHoldMessage message={message} />;
   }
+  if (message.isFederationStop()) {
+    return <FederationStopMessage isMessageFocused={isMessageFocused} message={message} />;
+  }
   if (message.isVerification()) {
     return <VerificationMessage message={message} />;
   }
@@ -264,8 +256,6 @@ export const MessageWrapper: React.FC<MessageParams & {hasMarker: boolean; isMes
         message={message}
         is1to1Conversation={conversation.is1to1()}
         isLastDeliveredMessage={isLastDeliveredMessage}
-        onClickReceipts={onClickReceipts}
-        isMessageFocused={isMessageFocused}
       />
     );
   }
diff --git a/src/script/components/MessagesList/Message/PingMessage.tsx b/src/script/components/MessagesList/Message/PingMessage.tsx
index 196dcd26e2b..8457af27e93 100644
--- a/src/script/components/MessagesList/Message/PingMessage.tsx
+++ b/src/script/components/MessagesList/Message/PingMessage.tsx
@@ -21,38 +21,23 @@ import React from 'react';
 
 import cx from 'classnames';
 
-import {Message} from 'src/script/entity/message/Message';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 
-import {MessageTime} from './MessageTime';
 import {ReadReceiptStatus} from './ReadReceiptStatus';
 
 import {PingMessage as PingMessageEntity} from '../../../entity/message/PingMessage';
 
 export interface PingMessageProps {
+  message: PingMessageEntity;
   is1to1Conversation: boolean;
   isLastDeliveredMessage: boolean;
-  message: PingMessageEntity;
-  onClickReceipts?: (message: Message) => void;
-  isMessageFocused: boolean;
 }
 
-const PingMessage: React.FC<PingMessageProps> = ({
-  message,
-  is1to1Conversation,
-  isLastDeliveredMessage,
-  onClickReceipts,
-  isMessageFocused,
-}) => {
-  const {unsafeSenderName, caption, timestamp, ephemeral_caption, isObfuscated, get_icon_classes} =
-    useKoSubscribableChildren(message, [
-      'unsafeSenderName',
-      'caption',
-      'timestamp',
-      'ephemeral_caption',
-      'isObfuscated',
-      'get_icon_classes',
-    ]);
+const PingMessage: React.FC<PingMessageProps> = ({message, is1to1Conversation, isLastDeliveredMessage}) => {
+  const {unsafeSenderName, caption, ephemeral_caption, isObfuscated, get_icon_classes} = useKoSubscribableChildren(
+    message,
+    ['unsafeSenderName', 'caption', 'ephemeral_caption', 'isObfuscated', 'get_icon_classes'],
+  );
 
   return (
     <div className="message-header" data-uie-name="element-message-ping">
@@ -60,7 +45,7 @@ const PingMessage: React.FC<PingMessageProps> = ({
         <div className={`icon-ping ${get_icon_classes}`} />
       </div>
       <div
-        className={cx('message-header-label', {
+        className={cx('message-body-content', 'message-header-label', {
           'ephemeral-message-obfuscated': isObfuscated,
         })}
         title={ephemeral_caption}
@@ -72,13 +57,11 @@ const PingMessage: React.FC<PingMessageProps> = ({
         </p>
       </div>
       <div className="message-body-actions">
-        <MessageTime timestamp={timestamp} data-uie-uid={message.id} data-uie-name="item-message-call-timestamp" />
         <ReadReceiptStatus
+          showOnHover
           message={message}
           is1to1Conversation={is1to1Conversation}
           isLastDeliveredMessage={isLastDeliveredMessage}
-          onClickReceipts={onClickReceipts}
-          isMessageFocused={isMessageFocused}
         />
       </div>
     </div>
diff --git a/src/script/components/MessagesList/Message/ReadReceiptStatus.test.tsx b/src/script/components/MessagesList/Message/ReadReceiptStatus.test.tsx
index a0cc20814df..eb3ce2fae76 100644
--- a/src/script/components/MessagesList/Message/ReadReceiptStatus.test.tsx
+++ b/src/script/components/MessagesList/Message/ReadReceiptStatus.test.tsx
@@ -44,7 +44,6 @@ describe('ReadReceiptStatus', () => {
       message: createReadReceiptMessage({
         readReceipts: ko.observableArray([] as ReadReceipt[]),
       }),
-      onClickReceipts: jest.fn(),
     };
 
     const {queryByTestId} = render(<ReadReceiptStatus {...props} />);
@@ -60,7 +59,6 @@ describe('ReadReceiptStatus', () => {
       message: createReadReceiptMessage({
         readReceipts: ko.observableArray([] as ReadReceipt[]),
       }),
-      onClickReceipts: jest.fn(),
     };
 
     const {queryByTestId} = render(<ReadReceiptStatus {...props} />);
@@ -77,7 +75,6 @@ describe('ReadReceiptStatus', () => {
       message: createReadReceiptMessage({
         readReceipts: ko.observableArray([{} as ReadReceipt]),
       }),
-      onClickReceipts: jest.fn(),
     };
 
     const {queryByTestId} = render(<ReadReceiptStatus {...props} />);
@@ -88,7 +85,7 @@ describe('ReadReceiptStatus', () => {
 
   describe('1to1 conversation', () => {
     it('has no click handler', () => {
-      const onClickReceiptsSpy = jest.fn();
+      const onClickDetailsSpy = jest.fn();
       const readReceiptTime = new Date().toISOString();
       const props = {
         isMessageFocused: true,
@@ -97,14 +94,14 @@ describe('ReadReceiptStatus', () => {
         message: createReadReceiptMessage({
           readReceipts: ko.observableArray([{time: readReceiptTime} as ReadReceipt]),
         }),
-        onClickReceipts: onClickReceiptsSpy,
+        onClickDetails: onClickDetailsSpy,
       };
 
       const {getByTestId} = render(<ReadReceiptStatus {...props} />);
 
       const readReceiptStatus = getByTestId('status-message-read-receipts');
       fireEvent.click(readReceiptStatus);
-      expect(onClickReceiptsSpy).toHaveBeenCalledTimes(0);
+      expect(onClickDetailsSpy).toHaveBeenCalledTimes(0);
     });
 
     it('shows timestamp instead of read count', () => {
@@ -126,27 +123,6 @@ describe('ReadReceiptStatus', () => {
   });
 
   describe('group conversation', () => {
-    it('has a click handler', () => {
-      const onClickReceiptsSpy = jest.fn();
-      const readReceiptTime = new Date().toISOString();
-      const props = {
-        isMessageFocused: true,
-        is1to1Conversation: false,
-        isLastDeliveredMessage: true,
-        message: createReadReceiptMessage({
-          readReceipts: ko.observableArray([{time: readReceiptTime} as ReadReceipt]),
-        }),
-        onClickReceipts: onClickReceiptsSpy,
-      };
-
-      const {getByTestId} = render(<ReadReceiptStatus {...props} />);
-
-      const readReceiptStatus = getByTestId('status-message-read-receipts');
-
-      fireEvent.click(readReceiptStatus);
-      expect(onClickReceiptsSpy).toHaveBeenCalledTimes(1);
-    });
-
     it('shows read count', async () => {
       const props = {
         isMessageFocused: true,
@@ -155,7 +131,6 @@ describe('ReadReceiptStatus', () => {
         message: createReadReceiptMessage({
           readReceipts: ko.observableArray([{} as ReadReceipt, {} as ReadReceipt]),
         }),
-        onClickReceipts: jest.fn(),
       };
 
       const {getByText, queryByTestId} = render(<ReadReceiptStatus {...props} />);
diff --git a/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx b/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
index aa51926b024..c2bc75bc92d 100644
--- a/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
+++ b/src/script/components/MessagesList/Message/ReadReceiptStatus.tsx
@@ -25,28 +25,22 @@ import {Icon} from 'Components/Icon';
 import {Message} from 'src/script/entity/message/Message';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
-import {formatDateNumeral, formatTimeShort} from 'Util/TimeUtil';
-
-import {useMessageFocusedTabIndex} from './util';
+import {formatTimeShort} from 'Util/TimeUtil';
 
 export interface ReadReceiptStatusProps {
   is1to1Conversation: boolean;
   isLastDeliveredMessage: boolean;
   message: Message;
-  onClickReceipts?: (message: Message) => void;
-  isMessageFocused: boolean;
+  showOnHover?: boolean;
 }
 
 const ReadReceiptStatus: React.FC<ReadReceiptStatusProps> = ({
   message,
-  onClickReceipts,
   is1to1Conversation,
   isLastDeliveredMessage,
-  isMessageFocused,
+  showOnHover = false,
 }) => {
-  const messageFocusedTabIndex = useMessageFocusedTabIndex(isMessageFocused);
   const [readReceiptText, setReadReceiptText] = useState('');
-  const [readReceiptTooltip, setReadReceiptTooltip] = useState('');
   const {readReceipts} = useKoSubscribableChildren(message, ['readReceipts']);
 
   useEffect(() => {
@@ -56,12 +50,6 @@ const ReadReceiptStatus: React.FC<ReadReceiptStatusProps> = ({
     }
   }, [is1to1Conversation, readReceipts]);
 
-  useEffect(() => {
-    if (readReceipts.length && is1to1Conversation) {
-      setReadReceiptTooltip(formatDateNumeral(readReceipts[0].time));
-    }
-  }, [is1to1Conversation, readReceipts]);
-
   const showDeliveredMessage = isLastDeliveredMessage && readReceiptText === '';
   const showEyeIndicator = !!readReceiptText;
 
@@ -73,18 +61,12 @@ const ReadReceiptStatus: React.FC<ReadReceiptStatusProps> = ({
         </span>
       )}
       {showEyeIndicator && (
-        <button
-          type="button"
-          tabIndex={messageFocusedTabIndex}
-          className={cx('button-reset-default', 'message-status-read', {
-            'message-status-read--clickable': !is1to1Conversation,
-            'message-status-read--visible': isLastDeliveredMessage,
-            'with-tooltip with-tooltip--receipt': readReceiptTooltip,
-          })}
-          data-tooltip={readReceiptTooltip}
-          {...(!is1to1Conversation && {
-            onClick: () => onClickReceipts?.(message),
-          })}
+        <div
+          className={cx(
+            'message-status-read',
+            is1to1Conversation && 'message-status-read__one-on-one',
+            showOnHover && 'message-status-read__show-on-hover',
+          )}
           data-uie-name="status-message-read-receipts"
           aria-label={t('accessibility.messageDetailsReadReceipts', readReceiptText)}
         >
@@ -92,7 +74,7 @@ const ReadReceiptStatus: React.FC<ReadReceiptStatusProps> = ({
           <span className="message-status-read__count" data-uie-name="status-message-read-receipt-count">
             {readReceiptText}
           </span>
-        </button>
+        </div>
       )}
     </>
   );
diff --git a/src/script/components/MessagesList/Message/SystemMessage.tsx b/src/script/components/MessagesList/Message/SystemMessage.tsx
deleted file mode 100644
index 3d2f476f784..00000000000
--- a/src/script/components/MessagesList/Message/SystemMessage.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import React from 'react';
-
-import {Icon} from 'Components/Icon';
-import {SystemMessage as SystemMessageEntity} from 'src/script/entity/message/SystemMessage';
-import {useKoSubscribableChildren} from 'Util/ComponentUtil';
-
-import {MessageTime} from './MessageTime';
-
-import {RenameMessage} from '../../../entity/message/RenameMessage';
-import {SystemMessageType} from '../../../message/SystemMessageType';
-export interface SystemMessageProps {
-  message: SystemMessageEntity;
-}
-
-const SystemMessage: React.FC<SystemMessageProps> = ({message}) => {
-  const {unsafeSenderName, timestamp, caption} = useKoSubscribableChildren(message, [
-    'unsafeSenderName',
-    'timestamp',
-    'caption',
-  ]);
-
-  // Only set for RenameMessage, MemberMessage has a different super_type
-  const messageName = (message as RenameMessage).name;
-
-  return (
-    <>
-      <div className="message-header" data-uie-name="element-message-system">
-        <div className="message-header-icon message-header-icon--svg text-foreground">
-          {message.system_message_type === SystemMessageType.CONVERSATION_RENAME && <Icon.Edit />}
-          {message.system_message_type === SystemMessageType.CONVERSATION_MESSAGE_TIMER_UPDATE && <Icon.Timer />}
-          {message.system_message_type === SystemMessageType.CONVERSATION_RECEIPT_MODE_UPDATE && <Icon.Read />}
-        </div>
-        <p className="message-header-label">
-          <span className="message-header-label__multiline">
-            <span className="message-header-sender-name">{unsafeSenderName}</span>
-            <span className="ellipsis">{caption}</span>
-          </span>
-        </p>
-        <div className="message-body-actions">
-          <MessageTime timestamp={timestamp} data-uie-uid={message.id} data-uie-name="item-message-call-timestamp" />
-        </div>
-      </div>
-      <div className="message-body font-weight-bold">{messageName}</div>
-    </>
-  );
-};
-
-export {SystemMessage};
diff --git a/src/script/components/MessagesList/Message/SystemMessage.test.tsx b/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
similarity index 67%
rename from src/script/components/MessagesList/Message/SystemMessage.test.tsx
rename to src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
index 36a3485a8c4..d6df2f23c15 100644
--- a/src/script/components/MessagesList/Message/SystemMessage.test.tsx
+++ b/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.test.tsx
@@ -18,13 +18,10 @@
  */
 
 import {render, screen} from '@testing-library/react';
-import ko from 'knockout';
 
-import {DeleteConversationMessage} from 'src/script/entity/message/DeleteConversationMessage';
 import {MessageTimerUpdateMessage} from 'src/script/entity/message/MessageTimerUpdateMessage';
 import {ReceiptModeUpdateMessage} from 'src/script/entity/message/ReceiptModeUpdateMessage';
 import {RenameMessage} from 'src/script/entity/message/RenameMessage';
-import {SystemMessageType} from 'src/script/message/SystemMessageType';
 
 import {SystemMessage} from './SystemMessage';
 
@@ -43,27 +40,9 @@ jest.mock('Components/Icon', () => ({
   __esModule: true,
 }));
 
-type SystemMessageUnion =
-  | DeleteConversationMessage
-  | MessageTimerUpdateMessage
-  | ReceiptModeUpdateMessage
-  | RenameMessage;
-
-const createSystemMessage = (partialSystemMessage: Partial<SystemMessageUnion>) => {
-  const systemMessage: Partial<SystemMessageUnion> = {
-    caption: ko.pureComputed(() => '') as any,
-    timestamp: ko.observable(Date.now()),
-    unsafeSenderName: ko.pureComputed(() => ''),
-    ...partialSystemMessage,
-  };
-  return systemMessage as SystemMessageUnion;
-};
-
 describe('SystemMessage', () => {
   it('shows edit icon for RenameMessage', async () => {
-    const message = createSystemMessage({
-      system_message_type: SystemMessageType.CONVERSATION_RENAME,
-    });
+    const message = new RenameMessage('new name');
 
     render(<SystemMessage message={message} />);
 
@@ -72,9 +51,7 @@ describe('SystemMessage', () => {
   });
 
   it('shows timer icon for MessageTimerUpdateMessage', async () => {
-    const message = createSystemMessage({
-      system_message_type: SystemMessageType.CONVERSATION_MESSAGE_TIMER_UPDATE,
-    });
+    const message = new MessageTimerUpdateMessage(0);
 
     render(<SystemMessage message={message} />);
 
@@ -83,9 +60,7 @@ describe('SystemMessage', () => {
   });
 
   it('shows read icon for ReceiptModeUpdateMessage', async () => {
-    const message = createSystemMessage({
-      system_message_type: SystemMessageType.CONVERSATION_RECEIPT_MODE_UPDATE,
-    });
+    const message = new ReceiptModeUpdateMessage(true);
 
     render(<SystemMessage message={message} />);
 
diff --git a/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx b/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx
new file mode 100644
index 00000000000..e7afe1fabb3
--- /dev/null
+++ b/src/script/components/MessagesList/Message/SystemMessage/SystemMessage.tsx
@@ -0,0 +1,58 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React from 'react';
+
+import {Icon} from 'Components/Icon';
+import {MessageTimerUpdateMessage} from 'src/script/entity/message/MessageTimerUpdateMessage';
+import {MLSConversationRecoveredMessage} from 'src/script/entity/message/MLSConversationRecoveredMessage';
+import {ReceiptModeUpdateMessage} from 'src/script/entity/message/ReceiptModeUpdateMessage';
+import {RenameMessage} from 'src/script/entity/message/RenameMessage';
+import {SystemMessage as SystemMessageEntity} from 'src/script/entity/message/SystemMessage';
+
+import {SystemMessageBase} from './SystemMessageBase';
+
+export interface SystemMessageProps {
+  message: SystemMessageEntity;
+}
+
+export const SystemMessage: React.FC<SystemMessageProps> = ({message}) => {
+  if (message instanceof RenameMessage) {
+    return (
+      <>
+        <SystemMessageBase message={message} isSenderNameVisible icon={<Icon.Edit />} />
+        <div className="message-body font-weight-bold">{message.name}</div>
+      </>
+    );
+  }
+
+  if (message instanceof MessageTimerUpdateMessage) {
+    return <SystemMessageBase message={message} isSenderNameVisible icon={<Icon.Timer />} />;
+  }
+
+  if (message instanceof ReceiptModeUpdateMessage) {
+    return <SystemMessageBase message={message} isSenderNameVisible icon={<Icon.Read />} />;
+  }
+
+  if (message instanceof MLSConversationRecoveredMessage) {
+    return <SystemMessageBase message={message} icon={<Icon.Info />} />;
+  }
+
+  return <SystemMessageBase message={message} />;
+};
diff --git a/src/script/components/MessagesList/Message/SystemMessage/SystemMessageBase.tsx b/src/script/components/MessagesList/Message/SystemMessage/SystemMessageBase.tsx
new file mode 100644
index 00000000000..486642d0b99
--- /dev/null
+++ b/src/script/components/MessagesList/Message/SystemMessage/SystemMessageBase.tsx
@@ -0,0 +1,50 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React, {ReactNode} from 'react';
+
+import {SystemMessage} from 'src/script/entity/message/SystemMessage';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+
+import {MessageTime} from '../MessageTime';
+
+export interface SystemMessageProps {
+  message: SystemMessage;
+  isSenderNameVisible?: boolean;
+  icon?: ReactNode;
+}
+
+export const SystemMessageBase: React.FC<SystemMessageProps> = ({message, isSenderNameVisible = false, icon}) => {
+  const {unsafeSenderName, timestamp} = useKoSubscribableChildren(message, ['unsafeSenderName', 'timestamp']);
+
+  return (
+    <div className="message-header" data-uie-name="element-message-system">
+      {icon && <div className="message-header-icon message-header-icon--svg text-foreground">{icon}</div>}
+      <p className="message-header-label">
+        <span className="message-header-label__multiline">
+          {isSenderNameVisible && <span className="message-header-sender-name">{unsafeSenderName}</span>}
+          {message.caption && <span className="ellipsis">{message.caption}</span>}
+        </span>
+      </p>
+      <div className="message-body-actions">
+        <MessageTime timestamp={timestamp} data-uie-uid={message.id} data-uie-name="item-message-call-timestamp" />
+      </div>
+    </div>
+  );
+};
diff --git a/src/script/components/MessagesList/Message/SystemMessage/index.ts b/src/script/components/MessagesList/Message/SystemMessage/index.ts
new file mode 100644
index 00000000000..d02bfa45053
--- /dev/null
+++ b/src/script/components/MessagesList/Message/SystemMessage/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './SystemMessage';
diff --git a/src/script/components/MessagesList/Message/VerificationMessage.tsx b/src/script/components/MessagesList/Message/VerificationMessage.tsx
index 120700ed1b9..7a0c21d9f74 100644
--- a/src/script/components/MessagesList/Message/VerificationMessage.tsx
+++ b/src/script/components/MessagesList/Message/VerificationMessage.tsx
@@ -88,7 +88,11 @@ const VerificationMessage: React.FC<VerificationMessageProps> = ({message}) => {
           <>
             <span className="message-header-plain-sender-name">{nameList}</span>
             <span>
-              {hasMultipleUsers ? t('conversationDeviceStartedUsingMany') : t('conversationDeviceStartedUsingOne')}
+              {hasMultipleUsers
+                ? t('conversationDeviceStartedUsingMany')
+                : isSelfClient
+                ? t('conversationDeviceStartedUsingYou')
+                : t('conversationDeviceStartedUsingOne')}
             </span>
             <button
               type="button"
diff --git a/src/script/components/MessagesList/Message/index.tsx b/src/script/components/MessagesList/Message/index.tsx
index 5b111d32063..d9cc2d75bb6 100644
--- a/src/script/components/MessagesList/Message/index.tsx
+++ b/src/script/components/MessagesList/Message/index.tsx
@@ -49,13 +49,12 @@ export interface MessageActions {
   onClickCancelRequest: (message: MemberMessageEntity) => void;
   onClickImage: (message: ContentMessage, event: React.UIEvent) => void;
   onClickInvitePeople: () => void;
-  onClickLikes: (message: BaseMessage) => void;
+  onClickReactionDetails: (message: BaseMessage) => void;
   onClickMessage: (event: MouseEvent | KeyboardEvent, elementType: ElementType, messageDetails: MessageDetails) => void;
   onClickParticipants: (participants: User[]) => void;
-  onClickReceipts: (message: BaseMessage) => void;
+  onClickDetails: (message: BaseMessage) => void;
   onClickResetSession: (messageError: DecryptErrorMessage) => void;
   onClickTimestamp: (messageId: string) => void;
-  onLike: (message: ContentMessage, button?: boolean) => void;
 }
 
 export interface MessageParams extends MessageActions {
@@ -140,6 +139,7 @@ const Message: React.FC<
     }
     if (isTabKey(event)) {
       // don't call arrow key down for tab key
+      // on tab key from message element reset the floating action menu selection
       return;
     }
     handleArrowKeyDown(event);
@@ -152,6 +152,11 @@ const Message: React.FC<
     }
     if (history.state?.eventKey === 'Enter') {
       handleFocus(totalMessage - 1);
+
+      // reset the eventKey to stop focusing on every new message user send/receive afterwards
+      // last message should be focused only when user enters a new conversation using keyboard(press enter)
+      history.state.eventKey = '';
+      window.history.replaceState(history.state, '', window.location.hash);
     }
   }, [totalMessage]);
 
@@ -160,17 +165,7 @@ const Message: React.FC<
     if (isMessageFocused) {
       messageRef.current?.focus();
     }
-  }, [isMessageFocused, message]);
-
-  // set message elements focus for non content type mesages
-  // some non content type message has interactive element like invite people for member message
-  useEffect(() => {
-    if (!messageRef.current || message.isContent()) {
-      return;
-    }
-    const interactiveMsgElements = getAllFocusableElements(messageRef.current);
-    setElementsTabIndex(interactiveMsgElements, isMsgElementsFocusable && isMessageFocused);
-  }, [isMessageFocused, isMsgElementsFocusable, message]);
+  }, [isMessageFocused]);
 
   // set message elements focus for non content type mesages
   // some non content type message has interactive element like invite people for member message
@@ -220,21 +215,23 @@ const Message: React.FC<
       data-uie-name="item-message"
       role="list"
     >
-      <div className={cx('message-header message-timestamp', getTimestampClass())}>
-        <div className="message-header-icon">
-          <span className="message-unread-dot" />
+      {markerType !== MessageMarkerType.NONE ? (
+        <div className={cx('message-header message-timestamp', getTimestampClass())}>
+          <div className="message-header-icon">
+            <span className="message-unread-dot" />
+          </div>
+
+          <h3 className="message-header-label">
+            <MessageTime timestamp={timestamp} className="label-xs" data-timestamp-type="normal">
+              {timeAgo}
+            </MessageTime>
+
+            <MessageTime timestamp={timestamp} data-timestamp-type="day" className="label-bold-xs">
+              {timeAgoDay}
+            </MessageTime>
+          </h3>
         </div>
-
-        <h3 className="message-header-label">
-          <MessageTime timestamp={timestamp} className="label-xs" data-timestamp-type="normal">
-            {timeAgo}
-          </MessageTime>
-
-          <MessageTime timestamp={timestamp} data-timestamp-type="day" className="label-bold-xs">
-            {timeAgoDay}
-          </MessageTime>
-        </h3>
-      </div>
+      ) : null}
 
       {/*eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions*/}
       <div
@@ -242,6 +239,9 @@ const Message: React.FC<
         ref={messageRef}
         role="listitem"
         onKeyDown={handleDivKeyDown}
+        onClick={event => {
+          handleFocus(index);
+        }}
         className="message-wrapper"
       >
         {wrappedContent}
diff --git a/src/script/components/MessagesList/MessageList.test.tsx b/src/script/components/MessagesList/MessageList.test.tsx
index 6bddc43f7a0..793e9948399 100644
--- a/src/script/components/MessagesList/MessageList.test.tsx
+++ b/src/script/components/MessagesList/MessageList.test.tsx
@@ -54,7 +54,6 @@ const getDefaultParams = (): React.ComponentProps<typeof MessagesList> => {
     messageRepository: {
       getMessageInConversationById: jest.fn(),
       sendButtonAction: jest.fn(),
-      toggleLike: jest.fn(),
     } as any,
     onClickMessage: jest.fn(),
     onLoading: jest.fn(),
@@ -66,6 +65,7 @@ const getDefaultParams = (): React.ComponentProps<typeof MessagesList> => {
     showUserDetails: jest.fn(),
     isMsgElementsFocusable: true,
     setMsgElementsFocusable: jest.fn(),
+    showMessageReactions: jest.fn(),
   };
 };
 
diff --git a/src/script/components/MessagesList/MessageList.tsx b/src/script/components/MessagesList/MessageList.tsx
index 472ed7248e3..9a46bec668c 100644
--- a/src/script/components/MessagesList/MessageList.tsx
+++ b/src/script/components/MessagesList/MessageList.tsx
@@ -19,7 +19,6 @@
 
 import React, {FC, useEffect, useLayoutEffect, useRef, useState} from 'react';
 
-import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
 import cx from 'classnames';
 
@@ -30,19 +29,18 @@ import {ContentMessage} from 'src/script/entity/message/ContentMessage';
 import {DecryptErrorMessage} from 'src/script/entity/message/DecryptErrorMessage';
 import {MemberMessage} from 'src/script/entity/message/MemberMessage';
 import {Message as MessageEntity} from 'src/script/entity/message/Message';
-import {SystemMessage} from 'src/script/entity/message/SystemMessage';
 import {User} from 'src/script/entity/User';
-import {ClientEvent} from 'src/script/event/Client';
 import {useRoveFocus} from 'src/script/hooks/useRoveFocus';
 import {ServiceEntity} from 'src/script/integration/ServiceEntity';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {onHitTopOrBottom} from 'Util/DOM/onHitTopOrBottom';
 import {useResizeObserver} from 'Util/DOM/resizeObserver';
+import {filterMessages} from 'Util/messagesFilterUtil';
 
 import {Message, MessageActions} from './Message';
 
 import {Conversation as ConversationEntity, Conversation} from '../../entity/Conversation';
-import {isMemberMessage, isContentMessage} from '../../guards/Message';
+import {isContentMessage} from '../../guards/Message';
 import {StatusType} from '../../message/StatusType';
 
 type FocusedElement = {center?: boolean; element: Element};
@@ -64,7 +62,8 @@ interface MessagesListParams {
   resetSession: (messageError: DecryptErrorMessage) => void;
   selfUser: User;
   showImageDetails: (message: ContentMessage, event: React.UIEvent) => void;
-  showMessageDetails: (message: MessageEntity, showLikes?: boolean) => void;
+  showMessageDetails: (message: MessageEntity, showReactions?: boolean) => void;
+  showMessageReactions: (message: MessageEntity, showReactions?: boolean) => void;
   showParticipants: (users: User[]) => void;
   showUserDetails: (user: User | ServiceEntity) => void;
   isLastReceivedMessage: (messageEntity: MessageEntity, conversationEntity: ConversationEntity) => boolean;
@@ -72,68 +71,6 @@ interface MessagesListParams {
   setMsgElementsFocusable: (isMsgElementsFocusable: boolean) => void;
 }
 
-const filterDuplicatedSystemMessages = (messages: MessageEntity[]) => {
-  return messages.reduce<MessageEntity[]>((uniqMessages, currentMessage) => {
-    if (isMemberMessage(currentMessage)) {
-      const typesToFilter = [
-        CONVERSATION_EVENT.MEMBER_JOIN,
-        CONVERSATION_EVENT.MEMBER_LEAVE,
-        ClientEvent.CONVERSATION.GROUP_CREATION,
-      ] as string[];
-
-      const uniqMemberMessages = uniqMessages.filter(isMemberMessage);
-
-      if (!!uniqMemberMessages.length && typesToFilter.includes(currentMessage.type)) {
-        switch (currentMessage.type) {
-          case ClientEvent.CONVERSATION.GROUP_CREATION:
-            // Dont show duplicated group creation messages
-            if (uniqMemberMessages.some(m => m.type === currentMessage.type)) {
-              return uniqMessages;
-            }
-          case CONVERSATION_EVENT.MEMBER_JOIN:
-          case CONVERSATION_EVENT.MEMBER_LEAVE:
-            // Dont show duplicated member join/leave messages that follow each other
-            if (uniqMemberMessages?.[uniqMemberMessages.length - 1]?.htmlCaption() === currentMessage.htmlCaption()) {
-              return uniqMessages;
-            }
-        }
-      }
-    }
-
-    if (currentMessage.isSystem()) {
-      const systemMessagesToFilter = [CONVERSATION_EVENT.RENAME] as string[];
-      if (systemMessagesToFilter.includes(currentMessage.type)) {
-        const uniqUpdateMessages = uniqMessages.filter(
-          (message): message is SystemMessage => message.isSystem() && systemMessagesToFilter.includes(message.type),
-        );
-
-        if (uniqUpdateMessages.length > 0) {
-          const prevMessage = uniqUpdateMessages?.[uniqUpdateMessages.length - 1];
-          if (!prevMessage) {
-            return [...uniqMessages, currentMessage];
-          }
-
-          if (prevMessage.isConversationRename() && currentMessage.isConversationRename()) {
-            // for rename messages, only name changes are relevant, caption stays the same
-            if (prevMessage.name === currentMessage.name) {
-              return uniqMessages;
-            }
-            return [...uniqMessages, currentMessage];
-          }
-          // Dont show duplicated system messages that follow each other
-          if (prevMessage.caption() === currentMessage.caption()) {
-            return uniqMessages;
-          }
-        }
-      }
-    }
-
-    return [...uniqMessages, currentMessage];
-  }, []);
-};
-
-const filterHiddenMessages = (messages: MessageEntity[]) => messages.filter(message => message.visible());
-
 const MessagesList: FC<MessagesListParams> = ({
   conversation,
   initialMessage,
@@ -144,6 +81,7 @@ const MessagesList: FC<MessagesListParams> = ({
   onClickMessage,
   showUserDetails,
   showMessageDetails,
+  showMessageReactions,
   showImageDetails,
   showParticipants,
   cancelConnectionRequest,
@@ -179,7 +117,7 @@ const MessagesList: FC<MessagesListParams> = ({
   const [loaded, setLoaded] = useState(false);
   const [focusedMessage, setFocusedMessage] = useState<string | undefined>(initialMessage?.id);
 
-  const filteredMessages = filterDuplicatedSystemMessages(filterHiddenMessages(allMessages));
+  const filteredMessages = filterMessages(allMessages);
   const filteredMessagesLength = filteredMessages.length;
 
   const [messagesContainer, setMessageContainer] = useState<HTMLDivElement | null>(null);
@@ -343,10 +281,10 @@ const MessagesList: FC<MessagesListParams> = ({
               onClickCancelRequest={cancelConnectionRequest}
               onClickImage={showImageDetails}
               onClickInvitePeople={() => invitePeople(conversation)}
-              onClickLikes={message => showMessageDetails(message, true)}
+              onClickReactionDetails={message => showMessageReactions(message, true)}
               onClickMessage={onClickMessage}
               onClickParticipants={showParticipants}
-              onClickReceipts={message => showMessageDetails(message)}
+              onClickDetails={message => showMessageDetails(message)}
               onClickResetSession={resetSession}
               onClickTimestamp={async function (messageId: string) {
                 setFocusedMessage(messageId);
@@ -359,7 +297,6 @@ const MessagesList: FC<MessagesListParams> = ({
                   conversationRepository.getMessagesWithOffset(conversation, messageEntity);
                 }
               }}
-              onLike={message => messageRepository.toggleLike(conversation, message)}
               selfId={selfUser.qualifiedId}
               shouldShowInvitePeople={shouldShowInvitePeople}
               totalMessage={filteredMessagesLength}
diff --git a/src/script/components/Modals/DetailViewModal/DetailViewModalFooter.tsx b/src/script/components/Modals/DetailViewModal/DetailViewModalFooter.tsx
index 4917f55ddc5..4665b1d1219 100644
--- a/src/script/components/Modals/DetailViewModal/DetailViewModalFooter.tsx
+++ b/src/script/components/Modals/DetailViewModal/DetailViewModalFooter.tsx
@@ -17,72 +17,155 @@
  *
  */
 
-import {FC} from 'react';
+import {FC, useCallback, useRef, useState} from 'react';
 
-import {Icon} from 'Components/Icon';
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {ReactionType} from '@wireapp/core/lib/conversation';
+import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
+
+import {DownloadButton} from 'Components/MessagesList/Message/ContentMessage/MessageActions/DownloadButton';
+import {useMessageActionsState} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state';
+import {
+  getActionsMenuCSS,
+  getIconCSS,
+  messageActionsMenuButton,
+} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.styles';
+import {MessageReactions} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions';
+import {ReplyButton} from 'Components/MessagesList/Message/ContentMessage/MessageActions/ReplyButton';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {isTabKey} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 
+import {MessageRepository} from '../../../conversation/MessageRepository';
 import {Conversation} from '../../../entity/Conversation';
 import {ContentMessage} from '../../../entity/message/ContentMessage';
 
 interface DetailViewModalFooterProps {
   messageEntity: ContentMessage;
   conversationEntity: Conversation;
-  onLikeClick: (conversation: Conversation, message: ContentMessage) => void;
   onReplyClick: (conversation: Conversation, message: ContentMessage) => void;
   onDownloadClick: (message: ContentMessage) => void;
+  messageRepository: MessageRepository;
+  selfId: QualifiedId;
 }
 
+const MESSAGE_REPLY_ID = 'do-reply-fullscreen-picture';
+const MESSAGE_DOWNLOAD_ID = 'do-download-fullscreen-picture';
+
 const DetailViewModalFooter: FC<DetailViewModalFooterProps> = ({
   messageEntity,
   conversationEntity,
-  onLikeClick,
   onReplyClick,
   onDownloadClick,
+  messageRepository,
+  selfId,
 }) => {
-  const {is_liked: isLiked} = useKoSubscribableChildren(messageEntity, ['is_liked']);
   const {removed_from_conversation: isRemovedFromConversation} = useKoSubscribableChildren(conversationEntity, [
     'removed_from_conversation',
   ]);
+  const [currentMsgActionName, setCurrentMsgAction] = useState('');
+  const wrapperRef = useRef<HTMLDivElement>(null);
+  const isMsgReactable = messageEntity.isReactable();
+  const handleReactionClick = (reaction: ReactionType): void => {
+    if (!messageEntity.isContent()) {
+      return;
+    }
+    return void messageRepository.toggleReaction(conversationEntity, messageEntity, reaction, selfId.id);
+  };
+  const {handleMenuOpen} = useMessageActionsState();
+  const resetActionMenuStates = useCallback(() => {
+    setCurrentMsgAction('');
+    handleMenuOpen(false);
+  }, [handleMenuOpen]);
 
-  return (
-    <footer className="detail-view-footer">
-      {messageEntity.isReactable() && !isRemovedFromConversation && (
-        <button
-          type="button"
-          className="detail-view-action-button"
-          onClick={() => onLikeClick(conversationEntity, messageEntity)}
-          data-uie-name="do-like-fullscreen-picture"
-        >
-          <span className={isLiked ? 'icon-liked text-red' : 'icon-like'}></span>
-          <span>{t('conversationContextMenuLike')}</span>
-        </button>
-      )}
+  const handleKeyDown = useCallback((event: React.KeyboardEvent<HTMLButtonElement>) => {
+    if (isTabKey(event)) {
+      setCurrentMsgAction('');
+    }
+  }, []);
 
-      {messageEntity.isReplyable() && !isRemovedFromConversation && (
-        <button
-          type="button"
-          className="detail-view-action-button"
-          onClick={() => onReplyClick(conversationEntity, messageEntity)}
-          data-uie-name="do-reply-fullscreen-picture"
-        >
-          <Icon.Reply />
+  const toggleActiveMenu = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement> | React.KeyboardEvent<HTMLButtonElement>) => {
+      const selectedMsgActionName = event.currentTarget.dataset.uieName;
+      handleMenuOpen(false);
+      if (currentMsgActionName === selectedMsgActionName) {
+        // reset on double click
+        setCurrentMsgAction('');
+      } else if (selectedMsgActionName) {
+        setCurrentMsgAction(selectedMsgActionName);
+      }
+    },
+    [currentMsgActionName, handleMenuOpen],
+  );
 
-          <span>{t('conversationContextMenuReply')}</span>
-        </button>
-      )}
+  const handleMessageReply = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      toggleActiveMenu(event);
+      onReplyClick(conversationEntity, messageEntity);
+    },
+    [conversationEntity, messageEntity, onReplyClick, toggleActiveMenu],
+  );
+
+  const handleAssetDownload = useCallback(
+    (event: React.MouseEvent<HTMLButtonElement>) => {
+      toggleActiveMenu(event);
+      onDownloadClick(messageEntity);
+    },
+    [messageEntity, onDownloadClick, toggleActiveMenu],
+  );
 
-      {messageEntity.isDownloadable() && (
-        <button
-          type="button"
+  return (
+    <footer className="detail-view-footer">
+      {isMsgReactable && !isRemovedFromConversation && (
+        <div ref={wrapperRef} style={{display: 'flex'}}>
+          <MessageReactions
+            messageFocusedTabIndex={TabIndex.FOCUSABLE}
+            currentMsgActionName={currentMsgActionName}
+            handleCurrentMsgAction={setCurrentMsgAction}
+            resetActionMenuStates={resetActionMenuStates}
+            wrapperRef={wrapperRef}
+            message={messageEntity}
+            handleReactionClick={handleReactionClick}
+            toggleActiveMenu={toggleActiveMenu}
+            handleKeyDown={handleKeyDown}
+          />
+          {messageEntity.isReplyable() && !isRemovedFromConversation && (
+            <ReplyButton
+              actionId={MESSAGE_REPLY_ID}
+              currentMsgActionName={currentMsgActionName}
+              messageFocusedTabIndex={TabIndex.FOCUSABLE}
+              onReplyClick={handleMessageReply}
+              onKeyPress={handleKeyDown}
+            />
+          )}
+          {messageEntity.isDownloadable() && (
+            <DownloadButton
+              actionId={MESSAGE_DOWNLOAD_ID}
+              messageFocusedTabIndex={TabIndex.FOCUSABLE}
+              onDownloadClick={handleAssetDownload}
+              onKeyPress={handleKeyDown}
+              css={{
+                ...messageActionsMenuButton(),
+                ...getIconCSS,
+                ...getActionsMenuCSS(currentMsgActionName === MESSAGE_DOWNLOAD_ID),
+              }}
+            >
+              <span className="icon-download" />
+            </DownloadButton>
+          )}
+        </div>
+      )}
+      {messageEntity.isDownloadable() && !isMsgReactable && (
+        <DownloadButton
+          actionId={MESSAGE_DOWNLOAD_ID}
+          messageFocusedTabIndex={TabIndex.FOCUSABLE}
+          onDownloadClick={handleAssetDownload}
+          onKeyPress={handleKeyDown}
           className="detail-view-action-button"
-          onClick={() => onDownloadClick(messageEntity)}
-          data-uie-name="do-download-fullscreen-picture"
         >
           <span className="icon-download" />
           <span>{t('conversationContextMenuDownload')}</span>
-        </button>
+        </DownloadButton>
       )}
     </footer>
   );
diff --git a/src/script/components/Modals/DetailViewModal/index.tsx b/src/script/components/Modals/DetailViewModal/index.tsx
index bd595cbcc4a..37dad797ec6 100644
--- a/src/script/components/Modals/DetailViewModal/index.tsx
+++ b/src/script/components/Modals/DetailViewModal/index.tsx
@@ -24,9 +24,11 @@ import cx from 'classnames';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import {User} from 'src/script/entity/User';
 import {handleKeyDown, KEY} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 import {renderElement} from 'Util/renderElement';
+import {preventFocusOutside} from 'Util/util';
 
 import {DetailViewModalFooter} from './DetailViewModalFooter';
 import {DetailViewModalHeader} from './DetailViewModalHeader';
@@ -47,6 +49,7 @@ interface DetailViewModalProps {
   readonly messageRepository: MessageRepository;
   currentMessageEntity: ContentMessage;
   onClose?: () => void;
+  selfUser: User;
 }
 
 const DetailViewModal: FC<DetailViewModalProps> = ({
@@ -55,6 +58,7 @@ const DetailViewModal: FC<DetailViewModalProps> = ({
   messageRepository,
   currentMessageEntity,
   onClose,
+  selfUser,
 }) => {
   const currentMessageEntityId = useRef<string>(currentMessageEntity.id);
 
@@ -82,13 +86,6 @@ const DetailViewModal: FC<DetailViewModalProps> = ({
     handleKeyDown(event, onCloseClick);
   };
 
-  const onLikeClick = async (conversation: Conversation, message: ContentMessage) => {
-    messageRepository.toggleLike(conversation, message);
-
-    const updatedMessage = await messageRepository.getMessageInConversationById(conversation, message.id);
-    setItems(prevState => prevState.map(item => (item.id === message.id ? updatedMessage : item)));
-  };
-
   const onReplyClick = (conversation: Conversation, message: ContentMessage) => {
     amplify.publish(WebAppEvents.CONVERSATION.SHOW, conversation, {});
     amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.REPLY, message);
@@ -236,8 +233,19 @@ const DetailViewModal: FC<DetailViewModalProps> = ({
     }
   }, []);
 
+  const modalId = 'detail-view';
+  useEffect(() => {
+    const onKeyDown = (event: KeyboardEvent): void => {
+      preventFocusOutside(event, modalId);
+    };
+    document.addEventListener('keydown', onKeyDown);
+    return () => {
+      document.removeEventListener('keydown', onKeyDown);
+    };
+  }, []);
+
   return (
-    <div id="detail-view" className={cx('modal detail-view modal-show', {'modal-fadein': isImageVisible})}>
+    <div id={modalId} className={cx('modal detail-view modal-show', {'modal-fadein': isImageVisible})}>
       {messageEntity && conversationEntity && (
         <div
           className={cx('detail-view-content modal-content-anim-close', {
@@ -258,9 +266,10 @@ const DetailViewModal: FC<DetailViewModalProps> = ({
           <DetailViewModalFooter
             messageEntity={messageEntity}
             conversationEntity={conversationEntity}
-            onLikeClick={onLikeClick}
+            messageRepository={messageRepository}
             onReplyClick={onReplyClick}
             onDownloadClick={onDownloadClick}
+            selfId={selfUser.qualifiedId}
           />
         </div>
       )}
diff --git a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
index a14c7ea227d..7bd731e9f93 100644
--- a/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
+++ b/src/script/components/Modals/GroupCreation/GroupCreationModal.tsx
@@ -21,6 +21,7 @@ import React, {useContext, useEffect, useMemo, useState} from 'react';
 
 import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data/ConversationReceiptModeUpdateData';
 import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
+import {isNonFederatingBackendsError} from '@wireapp/core/lib/errors';
 import {amplify} from 'amplify';
 import cx from 'classnames';
 import {container} from 'tsyringe';
@@ -40,7 +41,7 @@ import {generateConversationUrl} from 'src/script/router/routeGenerator';
 import {createNavigate, createNavigateKeyboard} from 'src/script/router/routerBindings';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {handleEnterDown, isKeyboardEvent, offEscKey, onEscKey} from 'Util/KeyboardUtil';
-import {t} from 'Util/LocalizerUtil';
+import {replaceLink, t} from 'Util/LocalizerUtil';
 import {sortUsersByPriority} from 'Util/StringUtil';
 
 import {Config} from '../../../Config';
@@ -56,12 +57,12 @@ import {isProtocolOption, ProtocolOption} from '../../../guards/Protocol';
 import {RootContext} from '../../../page/RootProvider';
 import {TeamState} from '../../../team/TeamState';
 import {UserState} from '../../../user/UserState';
+import {PrimaryModal} from '../PrimaryModal';
 
 interface GroupCreationModalProps {
   userState?: UserState;
   teamState?: TeamState;
 }
-
 enum GroupCreationModalState {
   DEFAULT = 'GroupCreationModal.STATE.DEFAULT',
   PARTICIPANTS = 'GroupCreationModal.STATE.PARTICIPANTS',
@@ -77,6 +78,7 @@ const GroupCreationModal: React.FC<GroupCreationModalProps> = ({
     isMLSEnabled: isMLSEnabledForTeam,
     isProtocolToggleEnabledForUser,
   } = useKoSubscribableChildren(teamState, ['isTeam', 'isMLSEnabled', 'isProtocolToggleEnabledForUser']);
+  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
 
   const isMLSFeatureEnabled = Config.getConfig().FEATURE.ENABLE_MLS;
 
@@ -85,7 +87,7 @@ const GroupCreationModal: React.FC<GroupCreationModalProps> = ({
   //if feature flag is set to false or mls is disabled for current team use proteus as default
   const defaultProtocol =
     isMLSFeatureEnabled && isMLSEnabledForTeam
-      ? teamState.teamFeatures().mls?.config.defaultProtocol
+      ? teamState.teamFeatures()?.mls?.config.defaultProtocol
       : ConversationProtocol.PROTEUS;
 
   const protocolOptions: ProtocolOption[] = ([ConversationProtocol.PROTEUS, ConversationProtocol.MLS] as const).map(
@@ -227,6 +229,43 @@ const GroupCreationModal: React.FC<GroupCreationModalProps> = ({
           createNavigate(generateConversationUrl(conversation.qualifiedId))(event);
         }
       } catch (error) {
+        if (isNonFederatingBackendsError(error)) {
+          const tempName = groupName;
+          setIsShown(false);
+
+          const backendString = error.backends.join(', and ');
+          const replaceBackends = replaceLink(
+            Config.getConfig().URL.SUPPORT.NON_FEDERATING_INFO,
+            'modal__text__read-more',
+            'read-more-backends',
+          );
+          return PrimaryModal.show(PrimaryModal.type.MULTI_ACTIONS, {
+            preventClose: true,
+            primaryAction: {
+              text: t('groupCreationPreferencesNonFederatingEditList'),
+              action: () => {
+                setGroupName(tempName);
+                setIsShown(true);
+                setIsCreatingConversation(false);
+                setGroupCreationState(GroupCreationModalState.PARTICIPANTS);
+              },
+            },
+            secondaryAction: {
+              text: t('groupCreationPreferencesNonFederatingLeave'),
+              action: () => {
+                setIsCreatingConversation(false);
+              },
+            },
+            text: {
+              htmlMessage: t(
+                'groupCreationPreferencesNonFederatingMessage',
+                {backends: backendString},
+                replaceBackends,
+              ),
+              title: t('groupCreationPreferencesNonFederatingHeadline'),
+            },
+          });
+        }
         amplify.publish(WebAppEvents.CONVERSATION.SHOW, undefined, {});
         setIsCreatingConversation(false);
       }
@@ -364,10 +403,11 @@ const GroupCreationModal: React.FC<GroupCreationModalProps> = ({
           />
         )}
 
-        {stateIsParticipants && (
+        {stateIsParticipants && selfUser && (
           <FadingScrollbar className="group-creation__list">
             {filteredContacts.length > 0 && (
               <UserSearchableList
+                selfUser={selfUser}
                 users={filteredContacts}
                 filter={participantsInput}
                 selected={selectedContacts}
diff --git a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
index db361e10a08..f00cf901387 100644
--- a/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
+++ b/src/script/components/Modals/LegalHoldModal/LegalHoldModal.tsx
@@ -415,6 +415,7 @@ const LegalHoldModal: FC<LegalHoldModalProps> = ({
                   searchRepository={searchRepository}
                   teamRepository={teamRepository}
                   onClick={setUserDevices}
+                  selfUser={selfUser}
                   noUnderline
                 />
               </>
diff --git a/src/script/components/Modals/PrimaryModal/PrimaryModal.tsx b/src/script/components/Modals/PrimaryModal/PrimaryModal.tsx
index 30eab9de510..6c0a125939d 100644
--- a/src/script/components/Modals/PrimaryModal/PrimaryModal.tsx
+++ b/src/script/components/Modals/PrimaryModal/PrimaryModal.tsx
@@ -21,7 +21,8 @@ import {FC, FormEvent, MouseEvent, useState, useRef, ChangeEvent, useEffect} fro
 
 import cx from 'classnames';
 
-import {Checkbox, CheckboxLabel, COLOR, Form, Input, Link, Text} from '@wireapp/react-ui-kit';
+import {ValidationUtil} from '@wireapp/commons';
+import {Checkbox, CheckboxLabel, COLOR, Form, Link, Text, Input, Loading} from '@wireapp/react-ui-kit';
 
 import {CopyToClipboardButton} from 'Components/CopyToClipboardButton';
 import {FadingScrollbar} from 'Components/FadingScrollbar';
@@ -40,6 +41,7 @@ import {Action, PrimaryModalType} from './PrimaryModalTypes';
 export const PrimaryModalComponent: FC = () => {
   const [inputValue, updateInputValue] = useState<string>('');
   const [passwordValue, setPasswordValue] = useState<string>('');
+  const [passwordInput, updatePasswordWithRules] = useState<string>('');
   const [passwordConfirmationValue, setPasswordConfirmationValue] = useState<string>('');
   const [didCopyPassword, setDidCopyPassword] = useState<boolean>(false);
   const [optionChecked, updateOptionChecked] = useState<boolean>(false);
@@ -66,26 +68,42 @@ export const PrimaryModalComponent: FC = () => {
     passwordGenerator,
     copyPassword,
     hideCloseBtn = false,
+    passwordOptional = false,
   } = content;
 
   const isPassword = currentType === PrimaryModalType.PASSWORD;
+  const showLoadingIndicator = currentType === PrimaryModalType.LOADING;
+  const hasPasswordWithRules = currentType === PrimaryModalType.PASSWORD_ADVANCED_SECURITY;
   const isInput = currentType === PrimaryModalType.INPUT;
   const isOption = currentType === PrimaryModalType.OPTION;
-  const isMultipleSecondary = currentType === PrimaryModalType.MULTI_ACTIONS;
+  const hasMultipleSecondary = currentType === PrimaryModalType.MULTI_ACTIONS;
   const isGuestLinkPassword = currentType === PrimaryModalType.GUEST_LINK_PASSWORD;
   const isJoinGuestLinkPassword = currentType === PrimaryModalType.JOIN_GUEST_LINK_PASSWORD;
-  const isConfirm = currentType === PrimaryModalType.CONFIRM;
 
   const onModalHidden = () => {
     updateCurrentModalContent(defaultContent);
     updateInputValue('');
     setPasswordValue('');
+    updatePasswordWithRules('');
     updateErrorMessage('');
     updateOptionChecked(false);
     showNextModalInQueue();
     setPasswordConfirmationValue('');
     setDidCopyPassword(false);
   };
+  const isPasswordOptional = () => {
+    const skipValidation = passwordOptional && !passwordInput.trim().length;
+    if (skipValidation) {
+      return true;
+    }
+    return passwordRegex.test(passwordInput);
+  };
+
+  const passwordRegex = new RegExp(
+    ValidationUtil.getNewPasswordPattern(Config.getConfig().NEW_PASSWORD_MINIMUM_LENGTH),
+  );
+  const actionEnabled =
+    (!isInput || !!inputValue.trim().length) && (hasPasswordWithRules ? isPasswordOptional() : true);
 
   const checkPassword = (password: string, passwordConfirm: string): boolean => {
     if (password !== passwordConfirm) {
@@ -117,7 +135,7 @@ export const PrimaryModalComponent: FC = () => {
 
   const confirm = () => {
     const action = content?.primaryAction?.action;
-    if (typeof action !== 'function') {
+    if (!action) {
       return;
     }
     if (isGuestLinkPassword) {
@@ -158,6 +176,7 @@ export const PrimaryModalComponent: FC = () => {
     const handleEscape = (event: KeyboardEvent) => {
       if (isEscapeKey(event) && isModalVisible) {
         removeCurrentModal();
+        closeAction();
       }
     };
 
@@ -165,11 +184,11 @@ export const PrimaryModalComponent: FC = () => {
     return () => document.removeEventListener('keydown', handleEscape);
   }, [isModalVisible]);
 
-  const isPrimaryActionDisabled = () => {
-    if (isConfirm) {
-      return false;
+  const closeAction = () => {
+    if (hasPasswordWithRules) {
+      const [closeAction] = secondaryActions;
+      closeAction?.action?.();
     }
-    return !inputActionEnabled || !passwordActionEnabled;
   };
 
   return (
@@ -195,7 +214,10 @@ export const PrimaryModalComponent: FC = () => {
                 <button
                   type="button"
                   className="modal__header__button"
-                  onClick={removeCurrentModal}
+                  onClick={() => {
+                    removeCurrentModal();
+                    closeAction();
+                  }}
                   aria-label={closeBtnTitle}
                   data-uie-name="do-close"
                 >
@@ -334,6 +356,27 @@ export const PrimaryModalComponent: FC = () => {
                 </Form>
               )}
 
+              {hasPasswordWithRules && (
+                <form onSubmit={doAction(confirm, !!closeOnConfirm)}>
+                  <Input
+                    id="modal_pswd_with_rules"
+                    type="password"
+                    value={passwordInput}
+                    placeholder={inputPlaceholder}
+                    required
+                    data-uie-name="backup-password"
+                    onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
+                      updatePasswordWithRules(event.target.value)
+                    }
+                    autoComplete="password"
+                    pattern=".{2,64}"
+                    helperText={t('backupPasswordHint', {
+                      minPasswordLength: Config.getConfig().NEW_PASSWORD_MINIMUM_LENGTH.toString(),
+                    })}
+                  />
+                </form>
+              )}
+
               {isInput && (
                 <form onSubmit={doAction(confirm, !!closeOnConfirm)}>
                   <label htmlFor="modal-input" className="visually-hidden">
@@ -368,37 +411,50 @@ export const PrimaryModalComponent: FC = () => {
                 </div>
               )}
 
-              <div className={cx('modal__buttons', {'modal__buttons--column': isMultipleSecondary})}>
-                {secondaryActions
-                  .filter((action): action is Action => action !== null && !!action.text)
-                  .map(action => (
+              {showLoadingIndicator ? (
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    margin: '1.5rem 0 2rem 0',
+                  }}
+                >
+                  <Loading />
+                </div>
+              ) : (
+                <div className={cx('modal__buttons', {'modal__buttons--column': hasMultipleSecondary})}>
+                  {secondaryActions
+                    .filter((action): action is Action => action !== null && !!action.text)
+                    .map(action => (
+                      <button
+                        key={`${action.text}-${action.uieName}`}
+                        type="button"
+                        onClick={doAction(action.action, true, true)}
+                        data-uie-name={action.uieName}
+                        className={cx('modal__button modal__button--secondary', {
+                          'modal__button--full': hasMultipleSecondary,
+                        })}
+                      >
+                        {action.text}
+                      </button>
+                    ))}
+                  {primaryAction?.text && (
                     <button
-                      key={`${action.text}-${action.uieName}`}
+                      ref={primaryActionButtonRef}
                       type="button"
-                      onClick={doAction(action.action, true, true)}
-                      data-uie-name={action?.uieName}
-                      className={cx('modal__button modal__button--secondary', {
-                        'modal__button--full': isMultipleSecondary,
+                      onClick={doAction(confirm, !!closeOnConfirm)}
+                      disabled={!actionEnabled}
+                      className={cx('modal__button modal__button--primary', {
+                        'modal__button--full': hasMultipleSecondary,
                       })}
+                      data-uie-name="do-action"
                     >
-                      {action.text}
+                      {primaryAction.text}
                     </button>
-                  ))}
-                {primaryAction?.text && (
-                  <button
-                    ref={primaryActionButtonRef}
-                    type="button"
-                    onClick={doAction(confirm, !!closeOnConfirm)}
-                    disabled={isPrimaryActionDisabled()}
-                    className={cx('modal__button modal__button--primary', {
-                      'modal__button--full': isMultipleSecondary,
-                    })}
-                    data-uie-name="do-action"
-                  >
-                    {primaryAction.text}
-                  </button>
-                )}
-              </div>
+                  )}
+                </div>
+              )}
             </FadingScrollbar>
           </>
         )}
diff --git a/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts b/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts
index d136cbe7507..73705fc701b 100644
--- a/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts
+++ b/src/script/components/Modals/PrimaryModal/PrimaryModalState.ts
@@ -134,6 +134,7 @@ const updateCurrentModalContent = (type: PrimaryModalType, options: ModalOptions
     secondaryAction,
     hideSecondary,
     hideCloseBtn = false,
+    passwordOptional = false,
     text = {} as Text,
   } = options;
 
@@ -154,6 +155,7 @@ const updateCurrentModalContent = (type: PrimaryModalType, options: ModalOptions
     secondaryAction: secondaryAction ?? null,
     hideCloseBtn,
     titleText: text.title ?? '',
+    passwordOptional,
   };
 
   switch (type) {
diff --git a/src/script/components/Modals/PrimaryModal/PrimaryModalTypes.ts b/src/script/components/Modals/PrimaryModal/PrimaryModalTypes.ts
index fb05c0fd331..4b3d18b3a2a 100644
--- a/src/script/components/Modals/PrimaryModal/PrimaryModalTypes.ts
+++ b/src/script/components/Modals/PrimaryModal/PrimaryModalTypes.ts
@@ -52,6 +52,7 @@ export interface ModalOptions {
   secondaryAction?: Action[] | Action;
   hideCloseBtn?: boolean;
   text?: Text;
+  passwordOptional?: boolean;
 }
 
 export enum PrimaryModalType {
@@ -65,8 +66,10 @@ export enum PrimaryModalType {
   PASSWORD = 'modal-template-password',
   GUEST_LINK_PASSWORD = 'modal-template-guest-link-password',
   JOIN_GUEST_LINK_PASSWORD = 'modal-template-join-guest-link-password',
+  PASSWORD_ADVANCED_SECURITY = 'modal-template-password-advance',
   SESSION_RESET = 'modal-session-reset',
   WITHOUT_TITLE = 'modal-without-title',
+  LOADING = 'modal-loading',
 }
 
 export interface ModalContent {
@@ -86,6 +89,7 @@ export interface ModalContent {
   secondaryAction: Action[] | Action | null;
   titleText: string;
   hideCloseBtn?: boolean;
+  passwordOptional?: boolean;
 }
 
 export type ModalItem = {id: string; options: ModalOptions; type: PrimaryModalType};
diff --git a/src/script/components/Modals/UserModal/UserModal.styles.ts b/src/script/components/Modals/UserModal/UserModal.styles.ts
index b9605f4bc85..5eb141b00e4 100644
--- a/src/script/components/Modals/UserModal/UserModal.styles.ts
+++ b/src/script/components/Modals/UserModal/UserModal.styles.ts
@@ -17,7 +17,7 @@
  *
  */
 
-import {css} from '@emotion/react';
+import {CSSObject, css} from '@emotion/react';
 
 export const userModalStyle = css`
   .enriched-fields {
@@ -50,7 +50,7 @@ export const userModalStyle = css`
   }
 
   .modal__body {
-    padding: 16px;
+    padding: 0 16px;
 
     .classified-bar {
       margin-top: 12px;
@@ -58,3 +58,8 @@ export const userModalStyle = css`
     }
   }
 `;
+
+export const userModalWrapperStyle: CSSObject = {
+  maxHeight: '90vh',
+  padding: 0,
+};
diff --git a/src/script/components/Modals/UserModal/UserModal.test.tsx b/src/script/components/Modals/UserModal/UserModal.test.tsx
index 2839a61d3d0..3fe5c10320d 100644
--- a/src/script/components/Modals/UserModal/UserModal.test.tsx
+++ b/src/script/components/Modals/UserModal/UserModal.test.tsx
@@ -24,7 +24,6 @@ import {User} from 'src/script/entity/User';
 import {Core} from 'src/script/service/CoreSingleton';
 import {TeamState} from 'src/script/team/TeamState';
 import {UserRepository} from 'src/script/user/UserRepository';
-import {UserState} from 'src/script/user/UserState';
 
 import {UserModal, UserModalProps} from './UserModal';
 import {showUserModal} from './UserModal.state';
@@ -32,7 +31,7 @@ import {showUserModal} from './UserModal.state';
 describe('UserModal', () => {
   it('correctly fetches user from user repository', async () => {
     jest.useFakeTimers();
-    const getUserById = jest.fn(async (id: QualifiedId) => {
+    const refreshUser = jest.fn(async (id: QualifiedId) => {
       return new User('mock-id', 'test-domain.mock');
     });
 
@@ -40,20 +39,20 @@ describe('UserModal', () => {
       core: {} as Core,
       teamState: {} as TeamState,
       userRepository: {
-        getUserById,
+        refreshUser,
       } as unknown as UserRepository,
-      userState: {} as UserState,
+      selfUser: new User(),
     };
     showUserModal({domain: 'test-domain.mock', id: 'mock-id'});
     const {getByTestId} = render(<UserModal {...props} />);
     await waitFor(() => getByTestId('do-close'));
 
-    expect(getUserById).toHaveBeenCalledTimes(1);
+    expect(refreshUser).toHaveBeenCalledTimes(1);
   });
 
   it('shows user not found when user is deleted', async () => {
     jest.useFakeTimers();
-    const getUserById = jest.fn(async (id: QualifiedId) => {
+    const refreshUser = jest.fn(async (id: QualifiedId) => {
       const user = new User('mock-id', 'test-domain.mock');
       user.isDeleted = true;
       return user;
@@ -63,16 +62,16 @@ describe('UserModal', () => {
       core: {} as Core,
       teamState: {} as TeamState,
       userRepository: {
-        getUserById,
+        refreshUser,
       } as unknown as UserRepository,
-      userState: {} as UserState,
+      selfUser: new User(),
     };
 
     showUserModal({domain: 'test-domain.mock', id: 'mock-id'});
 
     const {getByTestId} = render(<UserModal {...props} />);
 
-    expect(getUserById).toHaveBeenCalledTimes(1);
+    expect(refreshUser).toHaveBeenCalledTimes(1);
 
     await waitFor(() => {
       expect(getByTestId('status-modal-text')).toBeInstanceOf(HTMLDivElement);
diff --git a/src/script/components/Modals/UserModal/UserModal.tsx b/src/script/components/Modals/UserModal/UserModal.tsx
index 180354812c6..231ce8a1e51 100644
--- a/src/script/components/Modals/UserModal/UserModal.tsx
+++ b/src/script/components/Modals/UserModal/UserModal.tsx
@@ -36,7 +36,7 @@ import {handleKeyDown} from 'Util/KeyboardUtil';
 import {replaceLink, t} from 'Util/LocalizerUtil';
 
 import {useUserModalState} from './UserModal.state';
-import {userModalStyle} from './UserModal.styles';
+import {userModalStyle, userModalWrapperStyle} from './UserModal.styles';
 
 import {Config} from '../../../Config';
 import {User} from '../../../entity/User';
@@ -44,11 +44,10 @@ import {RootContext} from '../../../page/RootProvider';
 import {Core} from '../../../service/CoreSingleton';
 import {TeamState} from '../../../team/TeamState';
 import {UserRepository} from '../../../user/UserRepository';
-import {UserState} from '../../../user/UserState';
 
 export interface UserModalProps {
   userRepository: UserRepository;
-  userState?: UserState;
+  selfUser: User;
   teamState?: TeamState;
   core?: Core;
 }
@@ -127,8 +126,8 @@ export const UnverifiedUserWarning: React.FC<UnverifiedUserWarningProps> = ({use
 
 const UserModal: React.FC<UserModalProps> = ({
   userRepository,
+  selfUser,
   core = container.resolve(Core),
-  userState = container.resolve(UserState),
   teamState = container.resolve(TeamState),
 }) => {
   const onClose = useUserModalState(state => state.onClose);
@@ -146,17 +145,20 @@ const UserModal: React.FC<UserModalProps> = ({
     resetState();
   };
   const {classifiedDomains} = useKoSubscribableChildren(teamState, ['classifiedDomains']);
-  const {self, isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']);
-  const {is_trusted: isTrusted} = useKoSubscribableChildren(self, ['is_trusted']);
-  const {is_verified: isSelfVerified} = useKoSubscribableChildren(self, ['is_verified']);
+  const {
+    is_trusted: isTrusted,
+    is_verified: isSelfVerified,
+    isActivatedAccount,
+  } = useKoSubscribableChildren(selfUser, ['is_trusted', 'is_verified', 'isActivatedAccount']);
   const isFederated = core.backendFeatures?.isFederated;
 
   useEffect(() => {
     if (userId) {
       userRepository
-        .getUserById(userId)
+        // We want to get the fresh version of the user from backend (in case the user was deleted)
+        .refreshUser(userId)
         .then(user => {
-          if (user.isDeleted) {
+          if (user.isDeleted || !user.isAvailable()) {
             setUserNotFound(true);
             return;
           }
@@ -179,9 +181,7 @@ const UserModal: React.FC<UserModalProps> = ({
         onBgClick={hide}
         onClosed={onModalClosed}
         data-uie-name={user ? 'modal-user-profile' : userNotFound ? 'modal-cannot-open-profile' : ''}
-        wrapperCSS={{
-          padding: 0,
-        }}
+        wrapperCSS={userModalWrapperStyle}
       >
         <div className="modal__header">
           {userNotFound && (
@@ -219,7 +219,7 @@ const UserModal: React.FC<UserModalProps> = ({
                 user={user}
                 onAction={hide}
                 isSelfActivated={isActivatedAccount}
-                selfUser={self}
+                selfUser={selfUser}
               />
             </>
           )}
diff --git a/src/script/components/ParticipantItemContent/ParticipantItem.styles.ts b/src/script/components/ParticipantItemContent/ParticipantItem.styles.ts
index e8a28baa71e..97f0cb4e94e 100644
--- a/src/script/components/ParticipantItemContent/ParticipantItem.styles.ts
+++ b/src/script/components/ParticipantItemContent/ParticipantItem.styles.ts
@@ -111,7 +111,7 @@ export const ellipsis: CSSObject = {
 
 export const wrapper: CSSObject = {
   display: 'flex',
-  minWidth: 0,
+  width: 0,
   height: 'var(--avatar-diameter-m)',
   flex: '1 1',
   alignItems: 'center',
diff --git a/src/script/components/RichTextEditor/RichTextEditor.tsx b/src/script/components/RichTextEditor/RichTextEditor.tsx
new file mode 100644
index 00000000000..5cfdca12035
--- /dev/null
+++ b/src/script/components/RichTextEditor/RichTextEditor.tsx
@@ -0,0 +1,202 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ReactElement, useRef} from 'react';
+
+import {ClearEditorPlugin} from '@lexical/react/LexicalClearEditorPlugin';
+import {InitialConfigType, LexicalComposer} from '@lexical/react/LexicalComposer';
+import {ContentEditable} from '@lexical/react/LexicalContentEditable';
+import {EditorRefPlugin} from '@lexical/react/LexicalEditorRefPlugin';
+import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary';
+import {OnChangePlugin} from '@lexical/react/LexicalOnChangePlugin';
+import {PlainTextPlugin} from '@lexical/react/LexicalPlainTextPlugin';
+import cx from 'classnames';
+import {LexicalEditor, EditorState, $nodesOfType} from 'lexical';
+
+import {DraftState} from 'Components/InputBar/util/DraftStateUtil';
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+import {User} from 'src/script/entity/User';
+import {getLogger} from 'Util/Logger';
+
+import {EmojiNode} from './nodes/EmojiNode';
+import {MentionNode} from './nodes/MentionNode';
+import {AutoFocusPlugin} from './plugins/AutoFocusPlugin';
+import {DraftStatePlugin} from './plugins/DraftStatePlugin';
+import {EditedMessagePlugin} from './plugins/EditedMessagePlugin';
+import {EmojiPickerPlugin} from './plugins/EmojiPickerPlugin';
+import {GlobalEventsPlugin} from './plugins/GlobalEventsPlugin';
+import {HistoryPlugin} from './plugins/HistoryPlugin';
+import {findAndTransformEmoji, ReplaceEmojiPlugin} from './plugins/InlineEmojiReplacementPlugin';
+import {MentionsPlugin} from './plugins/MentionsPlugin';
+import {SendPlugin} from './plugins/SendPlugin';
+import {TextChangePlugin} from './plugins/TextChangePlugin';
+
+import {MentionEntity} from '../../message/MentionEntity';
+
+const theme = {
+  ltr: 'ltr',
+  rtl: 'rtl',
+  placeholder: 'editor-placeholder',
+  paragraph: 'editor-paragraph',
+  mentions: {
+    '@': `at-mentions`, // use the trigger name as the key
+    '@Focused': 'focused-mentions', // add the "Focused" suffix to style the focused mention
+  },
+};
+
+export type RichTextContent = {
+  text: string;
+  mentions?: MentionEntity[];
+};
+
+const logger = getLogger('LexicalInput');
+
+interface RichTextEditorProps {
+  placeholder: string;
+  replaceEmojis?: boolean;
+  editedMessage?: ContentMessage;
+  children: ReactElement;
+  hasLocalEphemeralTimer: boolean;
+  getMentionCandidates: (search?: string | null) => User[];
+  saveDraftState: (editor: string) => void;
+  loadDraftState: () => Promise<DraftState>;
+  onUpdate: (content: RichTextContent) => void;
+  onArrowUp: () => void;
+  onEscape: () => void;
+  onShiftTab: () => void;
+  onSend: () => void;
+  onBlur: () => void;
+  onSetup?: (editor: LexicalEditor) => void;
+}
+
+const createMentionEntity = (user: Pick<User, 'id' | 'name' | 'domain'>, mentionPosition: number): MentionEntity => {
+  const userName = user.name();
+  const mentionLength = userName.length + 1;
+
+  return new MentionEntity(mentionPosition, mentionLength, user.id, user.domain);
+};
+
+const parseMentions = (editor: LexicalEditor, textValue: string, mentions: User[]) => {
+  const editorMentions = editor.getEditorState().read(() => $nodesOfType(MentionNode).map(node => node.__value));
+  let position = -1;
+
+  return editorMentions.flatMap(mention => {
+    const mentionPosition = textValue.indexOf(`@${mention}`, position + 1);
+    const mentionOption = mentions.find(user => user.name() === mention);
+
+    position = mentionPosition;
+    return mentionOption ? [createMentionEntity(mentionOption, mentionPosition)] : [];
+  });
+};
+
+export const RichTextEditor = ({
+  placeholder,
+  children,
+  hasLocalEphemeralTimer,
+  replaceEmojis,
+  editedMessage,
+  onUpdate,
+  saveDraftState,
+  loadDraftState,
+  onEscape,
+  onArrowUp,
+  getMentionCandidates,
+  onShiftTab,
+  onBlur,
+  onSend,
+  onSetup = () => {},
+}: RichTextEditorProps) => {
+  // Emojis
+  const emojiPickerOpen = useRef<boolean>(true);
+  const mentionsOpen = useRef<boolean>(true);
+
+  const editorConfig: InitialConfigType = {
+    namespace: 'WireLexicalEditor',
+    theme,
+    onError(error: unknown) {
+      logger.error(error);
+    },
+    nodes: [MentionNode, EmojiNode],
+  };
+
+  const saveDraft = (editorState: EditorState) => {
+    saveDraftState(JSON.stringify(editorState.toJSON()));
+  };
+
+  const parseUpdatedText = (editor: LexicalEditor, textValue: string) => {
+    onUpdate({
+      text: replaceEmojis ? findAndTransformEmoji(textValue) : textValue,
+      mentions: parseMentions(editor, textValue, getMentionCandidates()),
+    });
+  };
+
+  return (
+    <LexicalComposer initialConfig={editorConfig}>
+      <div className="controls-center">
+        <div className="input-bar--wrapper">
+          <AutoFocusPlugin />
+          <GlobalEventsPlugin onShiftTab={onShiftTab} onEscape={onEscape} onArrowUp={onArrowUp} onBlur={onBlur} />
+          <EditorRefPlugin editorRef={onSetup} />
+          <DraftStatePlugin loadDraftState={loadDraftState} />
+          <EditedMessagePlugin message={editedMessage} />
+
+          <EmojiPickerPlugin openStateRef={emojiPickerOpen} />
+          <HistoryPlugin />
+
+          {replaceEmojis && <ReplaceEmojiPlugin />}
+
+          <PlainTextPlugin
+            contentEditable={<ContentEditable className="conversation-input-bar-text" data-uie-name="input-message" />}
+            placeholder={<Placeholder text={placeholder} hasLocalEphemeralTimer={hasLocalEphemeralTimer} />}
+            ErrorBoundary={LexicalErrorBoundary}
+          />
+
+          <ClearEditorPlugin />
+          <MentionsPlugin
+            onSearch={search => (typeof search === 'string' ? getMentionCandidates(search) : [])}
+            openStateRef={mentionsOpen}
+          />
+
+          <OnChangePlugin onChange={saveDraft} ignoreSelectionChange />
+          <TextChangePlugin onUpdate={parseUpdatedText} />
+          <SendPlugin
+            onSend={() => {
+              if (!mentionsOpen.current && !emojiPickerOpen.current) {
+                onSend();
+              }
+            }}
+          />
+        </div>
+      </div>
+
+      {children}
+    </LexicalComposer>
+  );
+};
+
+function Placeholder({text, hasLocalEphemeralTimer}: {text: string; hasLocalEphemeralTimer: boolean}) {
+  return (
+    <div
+      className={cx('editor-placeholder', {'conversation-input-bar-text--accent': hasLocalEphemeralTimer})}
+      data-uie-name="input-placeholder"
+    >
+      {text}
+    </div>
+  );
+}
diff --git a/src/script/components/RichTextEditor/components/SendMessageButton/SendMessageButton.tsx b/src/script/components/RichTextEditor/components/SendMessageButton/SendMessageButton.tsx
new file mode 100644
index 00000000000..efe23c0ad9c
--- /dev/null
+++ b/src/script/components/RichTextEditor/components/SendMessageButton/SendMessageButton.tsx
@@ -0,0 +1,44 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import cx from 'classnames';
+
+import {Icon} from 'Components/Icon';
+import {t} from 'Util/LocalizerUtil';
+
+interface SendMessageButtonProps {
+  disabled?: boolean;
+  onSend: () => void;
+}
+
+export const SendMessageButton = ({disabled, onSend}: SendMessageButtonProps) => {
+  return (
+    <button
+      type="button"
+      className={cx('controls-right-button controls-right-button--send')}
+      disabled={disabled}
+      title={t('tooltipConversationSendMessage')}
+      aria-label={t('tooltipConversationSendMessage')}
+      data-uie-name="do-send-message"
+      onClick={onSend}
+    >
+      <Icon.Send />
+    </button>
+  );
+};
diff --git a/src/script/components/RichTextEditor/components/SendMessageButton/index.ts b/src/script/components/RichTextEditor/components/SendMessageButton/index.ts
new file mode 100644
index 00000000000..131603eb4ff
--- /dev/null
+++ b/src/script/components/RichTextEditor/components/SendMessageButton/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './SendMessageButton';
diff --git a/src/script/components/RichTextEditor/index.ts b/src/script/components/RichTextEditor/index.ts
new file mode 100644
index 00000000000..de19b3784fa
--- /dev/null
+++ b/src/script/components/RichTextEditor/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './RichTextEditor';
diff --git a/src/script/components/RichTextEditor/nodes/EmojiNode.ts b/src/script/components/RichTextEditor/nodes/EmojiNode.ts
new file mode 100644
index 00000000000..06d79aa45ba
--- /dev/null
+++ b/src/script/components/RichTextEditor/nodes/EmojiNode.ts
@@ -0,0 +1,71 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import type {EditorConfig, SerializedTextNode} from 'lexical';
+import {$applyNodeReplacement, TextNode} from 'lexical';
+
+export type SerializedEmojiNode = SerializedTextNode;
+
+export class EmojiNode extends TextNode {
+  static getType(): string {
+    return 'emoji';
+  }
+
+  static clone(node: EmojiNode): EmojiNode {
+    return new EmojiNode(node.__text, node.__key);
+  }
+
+  createDOM(config: EditorConfig): HTMLElement {
+    const dom = document.createElement('span');
+    const inner = super.createDOM(config);
+    inner.className = 'emoji-inner';
+    dom.appendChild(inner);
+    return dom;
+  }
+
+  updateDOM(prevNode: TextNode, dom: HTMLElement, config: EditorConfig): boolean {
+    const inner = dom.firstChild;
+    if (inner === null) {
+      return true;
+    }
+    super.updateDOM(prevNode, inner as HTMLElement, config);
+    return false;
+  }
+
+  static importJSON(serializedNode: SerializedEmojiNode): EmojiNode {
+    const node = $createEmojiNode(serializedNode.text);
+    node.setFormat(serializedNode.format);
+    node.setDetail(serializedNode.detail);
+    node.setMode(serializedNode.mode);
+    node.setStyle(serializedNode.style);
+    return node;
+  }
+
+  exportJSON(): SerializedEmojiNode {
+    return {
+      ...super.exportJSON(),
+      type: 'emoji',
+    };
+  }
+}
+
+function $createEmojiNode(emojiText: string): EmojiNode {
+  const node = new EmojiNode(emojiText).setMode('token');
+  return $applyNodeReplacement(node);
+}
diff --git a/src/script/components/RichTextEditor/nodes/Mention.tsx b/src/script/components/RichTextEditor/nodes/Mention.tsx
new file mode 100644
index 00000000000..3b679dce3ba
--- /dev/null
+++ b/src/script/components/RichTextEditor/nodes/Mention.tsx
@@ -0,0 +1,210 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {useLexicalNodeSelection} from '@lexical/react/useLexicalNodeSelection';
+import {mergeRegister} from '@lexical/utils';
+import {
+  $getNodeByKey,
+  $getSelection,
+  $isDecoratorNode,
+  $isElementNode,
+  $isNodeSelection,
+  $isTextNode,
+  $setSelection,
+  CLICK_COMMAND,
+  COMMAND_PRIORITY_LOW,
+  GridSelection,
+  KEY_ARROW_LEFT_COMMAND,
+  KEY_ARROW_RIGHT_COMMAND,
+  KEY_BACKSPACE_COMMAND,
+  KEY_DELETE_COMMAND,
+  BLUR_COMMAND,
+  NodeKey,
+  NodeSelection,
+  RangeSelection,
+} from 'lexical';
+
+import {KEY} from 'Util/KeyboardUtil';
+
+import {$isMentionNode} from './MentionNode';
+
+import {getNextSibling, getPreviousSibling} from '../utils/getSelectionInfo';
+
+interface MentionComponentProps {
+  mention: string;
+  nodeKey: NodeKey;
+  className?: string;
+  classNameFocused?: string;
+}
+
+export const Mention = (props: MentionComponentProps) => {
+  const {mention, className = '', classNameFocused = '', nodeKey} = props;
+  const [editor] = useLexicalComposerContext();
+  const [isSelected, setSelected, clearSelection] = useLexicalNodeSelection(nodeKey);
+  const [selection, setSelection] = useState<RangeSelection | NodeSelection | GridSelection | null>(null);
+  const isFocused = $isNodeSelection(selection) && isSelected;
+  const ref = useRef<HTMLSpanElement>(null);
+
+  const classNameFinal = useMemo(() => {
+    const classes = [className];
+
+    if (isFocused) {
+      classes.push(classNameFocused);
+    }
+
+    return classes.join(' ').trim() || undefined;
+  }, [className, classNameFocused, isFocused]);
+
+  const deleteMention = useCallback(
+    (payload: KeyboardEvent) => {
+      if (isSelected && $isNodeSelection($getSelection())) {
+        payload.preventDefault();
+
+        const node = $getNodeByKey(nodeKey);
+
+        if ($isMentionNode(node)) {
+          node.remove();
+        }
+
+        setSelected(false);
+      }
+
+      return false;
+    },
+    [isSelected, nodeKey, setSelected],
+  );
+
+  const moveCursor = useCallback(
+    (event: KeyboardEvent) => {
+      const node = $getNodeByKey(nodeKey);
+      if (!node || !node.isSelected()) {
+        return false;
+      }
+
+      const isLeftDirection = event.key === KEY.ARROW_LEFT;
+
+      let handled = false;
+      const nodeToSelect = isLeftDirection ? getPreviousSibling(node) : getNextSibling(node);
+
+      // Checking if is a element node, list of specified Element Nodes You can find here:
+      // https://lexical.dev/docs/api/classes/lexical.ElementNode
+      if ($isElementNode(nodeToSelect)) {
+        if (isLeftDirection) {
+          nodeToSelect.selectEnd();
+        } else {
+          nodeToSelect.selectStart();
+        }
+
+        handled = true;
+      }
+
+      // Handling node
+      if ($isTextNode(nodeToSelect)) {
+        if (isLeftDirection) {
+          nodeToSelect.select();
+        } else {
+          nodeToSelect.select(0, 0);
+        }
+
+        handled = true;
+      }
+
+      if ($isDecoratorNode(nodeToSelect)) {
+        if (isLeftDirection) {
+          nodeToSelect.selectNext();
+        } else {
+          nodeToSelect.selectPrevious();
+        }
+
+        handled = true;
+      }
+
+      if (nodeToSelect === null) {
+        if (isLeftDirection) {
+          node.selectPrevious();
+        } else {
+          node.selectNext();
+        }
+
+        handled = true;
+      }
+
+      if (handled) {
+        event.preventDefault();
+      }
+
+      return handled;
+    },
+    [nodeKey],
+  );
+
+  const selectMention = useCallback(
+    (event: MouseEvent) => {
+      if (event.target === ref.current) {
+        if (!event.shiftKey) {
+          clearSelection();
+        }
+        setSelected(!isSelected);
+        return true;
+      }
+      return false;
+    },
+    [isSelected, clearSelection, setSelected],
+  );
+
+  const unselectMention = useCallback(() => {
+    if (isFocused) {
+      $setSelection(null);
+      return true;
+    }
+    return false;
+  }, [isFocused]);
+
+  useEffect(() => {
+    let isMounted = true;
+    const unregister = mergeRegister(
+      editor.registerUpdateListener(({editorState}) => {
+        if (isMounted) {
+          setSelection(editorState.read(() => $getSelection()));
+        }
+      }),
+
+      editor.registerCommand<MouseEvent>(CLICK_COMMAND, selectMention, COMMAND_PRIORITY_LOW),
+      editor.registerCommand(KEY_DELETE_COMMAND, deleteMention, COMMAND_PRIORITY_LOW),
+      editor.registerCommand(KEY_BACKSPACE_COMMAND, deleteMention, COMMAND_PRIORITY_LOW),
+      editor.registerCommand(KEY_ARROW_LEFT_COMMAND, moveCursor, COMMAND_PRIORITY_LOW),
+      editor.registerCommand(KEY_ARROW_RIGHT_COMMAND, moveCursor, COMMAND_PRIORITY_LOW),
+      editor.registerCommand(BLUR_COMMAND, unselectMention, COMMAND_PRIORITY_LOW),
+    );
+
+    return () => {
+      isMounted = false;
+      unregister();
+    };
+  }, [editor, moveCursor, selectMention, unselectMention, deleteMention]);
+
+  return (
+    <span ref={ref} className={classNameFinal} data-mention={mention} data-uie-name="item-input-mention">
+      {mention}
+    </span>
+  );
+};
diff --git a/src/script/components/RichTextEditor/nodes/MentionNode.tsx b/src/script/components/RichTextEditor/nodes/MentionNode.tsx
new file mode 100644
index 00000000000..6b5d54d7df2
--- /dev/null
+++ b/src/script/components/RichTextEditor/nodes/MentionNode.tsx
@@ -0,0 +1,161 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {
+  SerializedLexicalNode,
+  Spread,
+  $applyNodeReplacement,
+  DecoratorNode,
+  LexicalEditor,
+  type DOMConversionOutput,
+  type EditorConfig,
+  type LexicalNode,
+  type NodeKey,
+} from 'lexical';
+
+import {Mention} from './Mention';
+
+type SerializedMentionNode = Spread<
+  {
+    value: string;
+    trigger: string;
+  },
+  SerializedLexicalNode
+>;
+
+function convertElement(domNode: HTMLElement): DOMConversionOutput | null {
+  const value = domNode.getAttribute('data-lexical-mention-value');
+  const trigger = domNode.getAttribute('data-lexical-mention-trigger');
+
+  if (value !== null && trigger != null) {
+    const node = $createMentionNode(trigger, value);
+    return {node};
+  }
+
+  return null;
+}
+
+/**
+ * This node is used to represent a mention used in the MentionPlugin.
+ */
+export class MentionNode extends DecoratorNode<JSX.Element> {
+  __value: string;
+  __trigger: string;
+
+  static getType() {
+    return 'Mention';
+  }
+
+  static clone(node: MentionNode) {
+    return new MentionNode(node.__trigger, node.__value, node.__key);
+  }
+
+  static importJSON(serializedNode: SerializedMentionNode) {
+    return $createMentionNode(serializedNode.trigger, serializedNode.value);
+  }
+
+  exportDOM() {
+    const element = document.createElement('span');
+    element.setAttribute('data-lexical-mention', 'true');
+    element.setAttribute('data-lexical-mention-trigger', this.__trigger);
+    element.setAttribute('data-lexical-mention-value', this.__value);
+    element.textContent = this.getTextContent();
+    return {element};
+  }
+
+  static importDOM() {
+    return {
+      span: (domNode: HTMLElement) => {
+        if (!domNode.hasAttribute('data-lexical-mention')) {
+          return null;
+        }
+        return {
+          conversion: convertElement,
+          priority: 0,
+        };
+      },
+    };
+  }
+
+  constructor(trigger: string, value: string, key?: NodeKey) {
+    super(key);
+    this.__trigger = trigger;
+    this.__value = value;
+  }
+
+  exportJSON(): SerializedMentionNode {
+    return {
+      trigger: this.__trigger,
+      value: this.__value,
+      type: 'Mention',
+      version: 1,
+    };
+  }
+
+  createDOM() {
+    return document.createElement('span');
+  }
+
+  getTextContent() {
+    return this.__trigger + this.__value;
+  }
+
+  updateDOM() {
+    return false;
+  }
+
+  getTrigger(): string {
+    const self = this.getLatest();
+    return self.__trigger;
+  }
+
+  getValue(): string {
+    const self = this.getLatest();
+    return self.__value;
+  }
+
+  setValue(value: string) {
+    const self = this.getWritable();
+    self.__value = value;
+  }
+
+  decorate(_editor: LexicalEditor, config: EditorConfig) {
+    const theme: Record<string, string> = config.theme.mentions || {};
+    const entry = Object.entries(theme).find(([trigger]) => new RegExp(trigger).test(this.__trigger));
+    const className = entry && entry[1];
+    const classNameFocused = entry && theme[`${entry[0]}Focused`];
+    return (
+      <Mention
+        nodeKey={this.getKey()}
+        mention={this.getTextContent()}
+        className={className}
+        classNameFocused={classNameFocused}
+      />
+    );
+  }
+}
+
+export function $createMentionNode(trigger: string, value: string): MentionNode {
+  const mentionNode = new MentionNode(trigger, value);
+  return $applyNodeReplacement(mentionNode);
+}
+
+export function $isMentionNode(node: LexicalNode | null | undefined): node is MentionNode {
+  return node instanceof MentionNode;
+}
diff --git a/src/script/components/InputBar/hooks/useTextAreaFocus.ts b/src/script/components/RichTextEditor/plugins/AutoFocusPlugin.tsx
similarity index 71%
rename from src/script/components/InputBar/hooks/useTextAreaFocus.ts
rename to src/script/components/RichTextEditor/plugins/AutoFocusPlugin.tsx
index c9dc29eed03..0f27e1fb2eb 100644
--- a/src/script/components/InputBar/hooks/useTextAreaFocus.ts
+++ b/src/script/components/RichTextEditor/plugins/AutoFocusPlugin.tsx
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,6 +19,8 @@
 
 import {useEffect} from 'react';
 
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+
 import {
   isArrowKey,
   isEnterKey,
@@ -30,6 +32,10 @@ import {
   isTabKey,
 } from 'Util/KeyboardUtil';
 
+const hasInputAlreadyFocused = () => {
+  return document.activeElement && ['INPUT', 'TEXTAREA'].includes(document.activeElement.tagName);
+};
+
 const useTextAreaFocus = (callback: () => void) => {
   const handleFocusTextarea = (event: KeyboardEvent) => {
     const detailViewModal = document.querySelector('#detail-view');
@@ -38,14 +44,12 @@ const useTextAreaFocus = (callback: () => void) => {
       return;
     }
 
-    const isActiveInputElement =
-      document.activeElement && ['INPUT', 'TEXTAREA'].includes(document.activeElement.tagName);
     const isPageupDownKeyPressed = isPageUpDownKey(event);
 
     if (isPageupDownKeyPressed) {
       (document.activeElement as HTMLElement).blur();
     } else if (
-      !isActiveInputElement &&
+      !hasInputAlreadyFocused() &&
       !isArrowKey(event) &&
       !isTabKey(event) &&
       !isEnterKey(event) &&
@@ -61,10 +65,23 @@ const useTextAreaFocus = (callback: () => void) => {
   useEffect(() => {
     window.addEventListener('keydown', handleFocusTextarea);
 
+    if (!hasInputAlreadyFocused()) {
+      // Focus on the first render if no other input is focused
+      setTimeout(callback);
+    }
     return () => {
       window.removeEventListener('keydown', handleFocusTextarea);
     };
   }, []);
 };
 
-export {useTextAreaFocus};
+/**
+ * Will automatically focus the input field when the user types anywhere in the document
+ */
+export function AutoFocusPlugin(): null {
+  const [editor] = useLexicalComposerContext();
+
+  useTextAreaFocus(() => editor.focus());
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/DraftStatePlugin.tsx b/src/script/components/RichTextEditor/plugins/DraftStatePlugin.tsx
new file mode 100644
index 00000000000..6ddbcf056ad
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/DraftStatePlugin.tsx
@@ -0,0 +1,50 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useCallback, useEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+
+import {DraftState} from 'Components/InputBar/util/DraftStateUtil';
+
+interface DraftStatePluginProps {
+  loadDraftState: () => Promise<any>;
+}
+
+export function DraftStatePlugin({loadDraftState}: DraftStatePluginProps): null {
+  const [editor] = useLexicalComposerContext();
+
+  const getDraftState = useCallback(async () => {
+    const draftState: DraftState = await loadDraftState();
+
+    if (draftState.editorState) {
+      const initialEditorState = editor.parseEditorState(draftState.editorState);
+
+      if (!initialEditorState.isEmpty()) {
+        editor.setEditorState(initialEditorState);
+      }
+    }
+  }, [editor, loadDraftState]);
+
+  useEffect(() => {
+    void getDraftState();
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/EditedMessagePlugin.tsx b/src/script/components/RichTextEditor/plugins/EditedMessagePlugin.tsx
new file mode 100644
index 00000000000..ac79ece37c8
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/EditedMessagePlugin.tsx
@@ -0,0 +1,53 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {$getRoot, $setSelection} from 'lexical';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+
+import {toEditorNodes} from '../utils/messageToEditorNodes';
+
+type Props = {
+  message?: ContentMessage;
+};
+export function EditedMessagePlugin({message}: Props): null {
+  const [editor] = useLexicalComposerContext();
+
+  useEffect(() => {
+    if (message) {
+      // Need to timeout to be sure the editor is in a state to receive the new message (could cause problems with cursor position)
+      setTimeout(() => {
+        editor.update(() => {
+          const root = $getRoot();
+          root.clear();
+          // This behaviour is needed to clear selection, if we not clear selection will be on beginning.
+          $setSelection(null);
+          // Replace the current root with the content of the message being edited
+          root.append(toEditorNodes(message));
+          editor.focus();
+        });
+      });
+    }
+  }, [editor, message]);
+
+  return null;
+}
diff --git a/src/script/components/Emoji/EmojiItem.styles.ts b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiItem.styles.ts
similarity index 100%
rename from src/script/components/Emoji/EmojiItem.styles.ts
rename to src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiItem.styles.ts
diff --git a/src/script/components/Emoji/EmojiItem.tsx b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiItem.tsx
similarity index 68%
rename from src/script/components/Emoji/EmojiItem.tsx
rename to src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiItem.tsx
index e6dcf5d99a1..e1ea0cc763d 100644
--- a/src/script/components/Emoji/EmojiItem.tsx
+++ b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiItem.tsx
@@ -17,32 +17,39 @@
  *
  */
 
-import {FC} from 'react';
+import {forwardRef, ForwardRefRenderFunction} from 'react';
 
 import cx from 'classnames';
 
+import {EmojiOption} from 'Components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiPickerPlugin';
+
 import {itemStyle, symbolStyle, nameStyle} from './EmojiItem.styles';
-import {EmojiListItem} from './useEmoji';
 
 interface EmojiItemProps {
-  emoji: EmojiListItem;
+  emoji: EmojiOption;
   onClick: () => void;
   onMouseEnter: () => void;
   selectedEmoji?: boolean;
 }
 
-const EmojiItem: FC<EmojiItemProps> = ({emoji, onClick, onMouseEnter, selectedEmoji = false}) => (
+const EmojiItemComponent: ForwardRefRenderFunction<HTMLButtonElement, EmojiItemProps> = (
+  {emoji, onClick, onMouseEnter, selectedEmoji = false},
+  ref,
+) => (
   <button
     type="button"
     className={cx('button-reset-default', 'emoji', {selected: selectedEmoji})}
     css={itemStyle}
     onMouseEnter={onMouseEnter}
     onClick={onClick}
-    aria-label={emoji.name}
+    aria-label={emoji.title}
+    ref={ref}
   >
-    <span css={symbolStyle}>{emoji.icon}</span>
-    <span css={nameStyle}>{emoji.name}</span>
+    <span css={symbolStyle}>{emoji.emoji}</span>
+    <span css={nameStyle}>{emoji.title}</span>
   </button>
 );
 
+const EmojiItem = forwardRef(EmojiItemComponent);
+
 export {EmojiItem};
diff --git a/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiPickerPlugin.tsx b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiPickerPlugin.tsx
new file mode 100644
index 00000000000..3786662956b
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/EmojiPickerPlugin.tsx
@@ -0,0 +1,248 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MutableRefObject, useCallback, useMemo, useState} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {
+  MenuOption,
+  MenuRenderFn,
+  MenuTextMatch,
+  useBasicTypeaheadTriggerMatch,
+} from '@lexical/react/LexicalTypeaheadMenuPlugin';
+// The emoji list comes from the emoji-picker-react package that we also use for reactions. It's a little hacky how we import it but since it's typechecked, we will be warned if this file doesn't exist in the repo with further updates
+import emojiList from 'emoji-picker-react/src/data/emojis.json';
+import {$createTextNode, $getSelection, $isRangeSelection, TextNode} from 'lexical';
+import * as ReactDOM from 'react-dom';
+
+import {TypeaheadMenuPlugin} from 'Components/RichTextEditor/plugins/TypeaheadMenuPlugin';
+import {loadValue, storeValue} from 'Util/StorageUtil';
+import {sortByPriority} from 'Util/StringUtil';
+
+import {EmojiItem} from './EmojiItem';
+
+import {StorageKey} from '../../../../storage';
+import {getDOMRangeRect} from '../../utils/getDomRangeRect';
+import {getSelectionInfo} from '../../utils/getSelectionInfo';
+
+const TRIGGER = ':';
+
+/**
+ * Will detect emoji triggers in a text
+ * @param text the text in which to look for emoji triggers
+ */
+function checkForEmojis(text: string): MenuTextMatch | null {
+  const match = new RegExp(`(^| )(${TRIGGER}([\\w +\\-][\\w \\-]*))$`).exec(text);
+
+  if (match === null) {
+    return null;
+  }
+  const search = match[2];
+  const term = match[3];
+
+  if (term.length === 0) {
+    return null;
+  }
+
+  return {
+    leadOffset: match.index,
+    matchingString: term,
+    replaceableString: search,
+  };
+}
+
+export class EmojiOption extends MenuOption {
+  title: string;
+  emoji: string;
+  keywords: string[];
+
+  constructor(
+    title: string,
+    emoji: string,
+    options: {
+      keywords?: string[];
+    },
+  ) {
+    super(title + options.keywords?.join('_'));
+    this.title = title.replace(/_/g, ' ');
+    this.emoji = emoji;
+    this.keywords = options.keywords || [];
+  }
+}
+
+const emojiUsageCount: Record<string, number> = loadValue(StorageKey.CONVERSATION.EMOJI_USAGE_COUNT) || {};
+
+const getUsageCount = (emojiName: string): number => emojiUsageCount[emojiName] || 0;
+
+const MAX_EMOJI_SUGGESTION_COUNT = 5;
+
+type Props = {
+  openStateRef: MutableRefObject<boolean>;
+};
+
+const emojies: {n: string[]; u: string}[] = Object.values(emojiList).flat();
+
+const emojiOptions = emojies.map(({n: aliases, u: codepoint}) => {
+  const codepoints = codepoint.split('-').map(code => parseInt(code, 16));
+  return new EmojiOption(aliases[0], String.fromCodePoint(...codepoints), {
+    keywords: aliases,
+  });
+});
+
+export function EmojiPickerPlugin({openStateRef}: Props) {
+  const [lexicalEditor] = useLexicalComposerContext();
+
+  const [queryString, setQueryString] = useState<string | null>(null);
+
+  const increaseUsageCount = (emojiName: string | null): void => {
+    if (emojiName) {
+      emojiUsageCount[emojiName] = getUsageCount(emojiName) + 1;
+      storeValue(StorageKey.CONVERSATION.EMOJI_USAGE_COUNT, emojiUsageCount);
+    }
+  };
+
+  const checkForTriggerMatch = useBasicTypeaheadTriggerMatch('/', {
+    minLength: 0,
+  });
+
+  const checkForEmojiPickerMatch = useCallback(
+    (text: string) => {
+      // Don't show the menu if the next character is a word character
+      const info = getSelectionInfo([':']);
+
+      if (info?.isTextNode && info.wordCharAfterCursor) {
+        return null;
+      }
+
+      const slashMatch = checkForTriggerMatch(text, lexicalEditor);
+
+      if (slashMatch !== null) {
+        return null;
+      }
+
+      const queryMatch = checkForEmojis(text);
+
+      return queryMatch?.replaceableString ? queryMatch : null;
+    },
+    [checkForTriggerMatch, lexicalEditor],
+  );
+
+  const options: Array<EmojiOption> = useMemo(() => {
+    const filteredEmojis = emojiOptions.filter((emoji: EmojiOption) => {
+      if (queryString === null) {
+        return false;
+      }
+
+      return emoji.keywords.some(emojiNameWord => emojiNameWord.includes(queryString));
+    });
+
+    return filteredEmojis
+      .sort((emojiA, emojiB) => {
+        const usageCountA = getUsageCount(emojiA.title);
+        const usageCountB = getUsageCount(emojiB.title);
+
+        const sameUsageCount = usageCountA === usageCountB;
+        return sameUsageCount
+          ? sortByPriority(emojiA.title, emojiB.title, queryString || '')
+          : usageCountB - usageCountA;
+      })
+      .slice(0, MAX_EMOJI_SUGGESTION_COUNT);
+  }, [queryString]);
+
+  const onSelectOption = (selectedOption: EmojiOption, nodeToRemove: TextNode | null, closeMenu: () => void) => {
+    lexicalEditor.update(() => {
+      const selection = $getSelection();
+
+      if (!$isRangeSelection(selection) || selectedOption == null) {
+        return;
+      }
+
+      if (nodeToRemove) {
+        nodeToRemove.remove();
+      }
+
+      selection.insertNodes([$createTextNode(selectedOption.emoji)]);
+      increaseUsageCount(selectedOption.title);
+
+      closeMenu();
+    });
+  };
+
+  const rootElement = lexicalEditor.getRootElement();
+
+  const getPosition = () => {
+    const nativeSelection = window.getSelection();
+
+    if (!rootElement || !nativeSelection) {
+      return {bottom: 0, left: 0};
+    }
+
+    const rangeRect = getDOMRangeRect(nativeSelection, rootElement);
+
+    return {
+      bottom: window.innerHeight - rangeRect.top,
+      left: rangeRect.x,
+    };
+  };
+
+  const menuRender: MenuRenderFn<EmojiOption> = (
+    anchorElementRef,
+    {selectedIndex, selectOptionAndCleanUp, setHighlightedIndex},
+  ) => {
+    if (!anchorElementRef.current || !options.length) {
+      return null;
+    }
+
+    const {bottom, left} = getPosition();
+
+    return ReactDOM.createPortal(
+      <div className="typeahead-popover emoji-menu">
+        <div className="conversation-input-bar-emoji-list" style={{bottom, left}}>
+          {options.map((option: EmojiOption, index) => (
+            <EmojiItem
+              ref={option.setRefElement}
+              key={option.key}
+              selectedEmoji={selectedIndex === index}
+              emoji={option}
+              onMouseEnter={() => setHighlightedIndex(index)}
+              onClick={() => {
+                setHighlightedIndex(index);
+                selectOptionAndCleanUp(option);
+              }}
+            />
+          ))}
+        </div>
+      </div>,
+      anchorElementRef.current,
+    );
+  };
+
+  openStateRef.current = options.length > 0;
+
+  return (
+    <TypeaheadMenuPlugin
+      onQueryChange={setQueryString}
+      onSelectOption={onSelectOption}
+      triggerFn={checkForEmojiPickerMatch}
+      options={options}
+      menuRenderFn={menuRender}
+      containerId="emoji-typeahead-menu"
+    />
+  );
+}
diff --git a/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/index.ts b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/index.ts
new file mode 100644
index 00000000000..b965422cc8a
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/EmojiPickerPlugin/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './EmojiPickerPlugin';
diff --git a/src/script/components/RichTextEditor/plugins/GlobalEventsPlugin.tsx b/src/script/components/RichTextEditor/plugins/GlobalEventsPlugin.tsx
new file mode 100644
index 00000000000..e25375ef766
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/GlobalEventsPlugin.tsx
@@ -0,0 +1,110 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect, useLayoutEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {mergeRegister} from '@lexical/utils';
+import {
+  LexicalCommand,
+  createCommand,
+  COMMAND_PRIORITY_HIGH,
+  KEY_ESCAPE_COMMAND,
+  COMMAND_PRIORITY_LOW,
+  KEY_ARROW_UP_COMMAND,
+  BLUR_COMMAND,
+  COMMAND_PRIORITY_EDITOR,
+} from 'lexical';
+
+import {isTabKey} from 'Util/KeyboardUtil';
+
+export const ON_SHIFT_TAB: LexicalCommand<KeyboardEvent> = createCommand('ON_SHIFT_TAB');
+interface GlobalEventsPluginProps {
+  onShiftTab: () => void;
+  onEscape: () => void;
+  onArrowUp: () => void;
+  onBlur: () => void;
+}
+
+export function GlobalEventsPlugin({onShiftTab, onArrowUp, onEscape, onBlur}: GlobalEventsPluginProps): null {
+  const [editor] = useLexicalComposerContext();
+
+  useLayoutEffect(() => {
+    const onKeyDown = (event: KeyboardEvent) => {
+      // "Shift" + "Tab"
+      if (event.shiftKey && isTabKey(event)) {
+        editor.dispatchCommand(ON_SHIFT_TAB, event);
+      }
+    };
+    const unregister = editor.registerRootListener(
+      (rootElement: HTMLElement | null, prevRootElement: HTMLElement | null) => {
+        if (prevRootElement !== null) {
+          prevRootElement.removeEventListener('keydown', onKeyDown);
+        }
+        if (rootElement !== null) {
+          rootElement.addEventListener('keydown', onKeyDown);
+        }
+      },
+    );
+
+    return () => {
+      unregister();
+    };
+  }, [editor]);
+
+  useEffect(() => {
+    const unregister = mergeRegister(
+      editor.registerCommand(
+        ON_SHIFT_TAB,
+        () => {
+          onShiftTab();
+          return true;
+        },
+        COMMAND_PRIORITY_HIGH,
+      ),
+      editor.registerCommand(
+        KEY_ESCAPE_COMMAND,
+        () => {
+          onEscape();
+          return false;
+        },
+        COMMAND_PRIORITY_EDITOR,
+      ),
+      editor.registerCommand(
+        KEY_ARROW_UP_COMMAND,
+        () => {
+          onArrowUp();
+          return false;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+      editor.registerCommand(
+        BLUR_COMMAND,
+        event => {
+          onBlur();
+          return false;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+    );
+    return unregister;
+  }, [editor, onArrowUp, onEscape, onShiftTab]);
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/HistoryPlugin.tsx b/src/script/components/RichTextEditor/plugins/HistoryPlugin.tsx
new file mode 100644
index 00000000000..e3a17c4a986
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/HistoryPlugin.tsx
@@ -0,0 +1,35 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {registerHistory, createEmptyHistoryState} from '@lexical/history';
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+
+/**
+ * Will automatically focus the input field when the user types anywhere in the document
+ */
+export function HistoryPlugin(): null {
+  const [editor] = useLexicalComposerContext();
+
+  const historySavingDelay = 300;
+  useEffect(() => registerHistory(editor, createEmptyHistoryState(), historySavingDelay), [editor]);
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/InlineEmojiReplacementPlugin.tsx b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/InlineEmojiReplacementPlugin.tsx
new file mode 100644
index 00000000000..a0816f8d684
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/InlineEmojiReplacementPlugin.tsx
@@ -0,0 +1,80 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {mergeRegister} from '@lexical/utils';
+import {COMMAND_PRIORITY_LOW, KEY_SPACE_COMMAND, TextNode} from 'lexical';
+
+import {inlineReplacements} from './inlineReplacements';
+
+const escapeRegexp = (string: string): string => string.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+
+const emojiList = inlineReplacements.map(emoji => {
+  const emoticons = emoji.emoticons || [];
+
+  return {
+    ...emoji,
+    regexes: emoticons.map(emojiIcon => new RegExp(`(^|\\s)${escapeRegexp(emojiIcon)}(?=\\s|$)`)),
+  };
+});
+
+export function findAndTransformEmoji(text: string): string {
+  for (const emoji of emojiList) {
+    for (const regex of emoji.regexes) {
+      if (!regex.test(text)) {
+        continue;
+      }
+
+      return text.replace(regex, `$1${emoji.emoji}`);
+    }
+  }
+
+  return text;
+}
+
+function transformEmojiNodes(textNode: TextNode): void {
+  const text = textNode.getTextContent();
+  textNode.setTextContent(findAndTransformEmoji(text));
+}
+
+export function ReplaceEmojiPlugin(): null {
+  const [editor] = useLexicalComposerContext();
+
+  useEffect(() => {
+    const unregister = mergeRegister(
+      editor.registerCommand(
+        KEY_SPACE_COMMAND,
+        () => {
+          const unregister = editor.registerNodeTransform(TextNode, newNode => {
+            transformEmojiNodes(newNode);
+            // We register a text transform listener for a single round when the space key is pressed (then the listener is released)
+            unregister();
+          });
+          return false;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+    );
+
+    return unregister;
+  }, [editor]);
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/index.ts b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/index.ts
new file mode 100644
index 00000000000..d8cee655e9c
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './InlineEmojiReplacementPlugin';
diff --git a/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/inlineReplacements.ts b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/inlineReplacements.ts
new file mode 100644
index 00000000000..117e196352a
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/InlineEmojiReplacementPlugin/inlineReplacements.ts
@@ -0,0 +1,402 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export type Emoticon = {
+  name: string;
+  emoji: string;
+  tags: string[];
+  description: string;
+  emoticons: string[];
+};
+
+/**
+ * List of all the emojis we live replace while typing
+ */
+export const inlineReplacements: Emoticon[] = [
+  {
+    name: 'angry',
+    emoji: '😠',
+    tags: ['mad', 'annoyed'],
+    description: 'angry face',
+    emoticons: ['>:(', '>:[', '>:-(', '>:-[', '>=(', '>=[', '>=-(', '>=-['],
+  },
+  {
+    name: 'blush',
+    emoji: '😊',
+    tags: ['proud'],
+    description: 'smiling face with smiling eyes',
+    emoticons: [':")', ':"]', ':"D', ':-")', ':-"]', ':-"D', '=")', '="]', '="D', '=-")', '=-"]', '=-"D'],
+  },
+  {
+    name: 'broken_heart',
+    emoji: '💔',
+    tags: [],
+    description: 'broken heart',
+    emoticons: ['<\\3', '</3'],
+  },
+  {
+    name: 'confused',
+    emoji: '😕',
+    tags: [],
+    description: 'confused face',
+    emoticons: [':/', ':\\', ':-/', ':-\\', '=/', '=\\', '=-/', '=-\\'],
+  },
+  {
+    name: 'cry',
+    emoji: '😢',
+    tags: ['sad', 'tear'],
+    description: 'crying face',
+    emoticons: [
+      ':,(',
+      ':,[',
+      ':,|',
+      ':,-(',
+      ':,-[',
+      ':,-|',
+      ":'(",
+      ":'[",
+      ":'|",
+      ":'-(",
+      ":'-[",
+      ":'-|",
+      '=,(',
+      '=,[',
+      '=,|',
+      '=,-(',
+      '=,-[',
+      '=,-|',
+      "='(",
+      "='[",
+      "='|",
+      "='-(",
+      "='-[",
+      "='-|",
+    ],
+  },
+  {
+    name: 'frowning',
+    emoji: '😦',
+    tags: [],
+    description: 'frowning face with open mouth',
+    emoticons: [':(', ':[', ':-(', ':-[', '=(', '=[', '=-(', '=-['],
+  },
+  {
+    name: 'heart',
+    emoji: '❤️',
+    tags: ['love'],
+    description: 'red heart',
+    emoticons: ['<3'],
+  },
+  {
+    name: 'imp',
+    emoji: '👿',
+    tags: ['angry', 'devil', 'evil', 'horns'],
+    description: 'angry face with horns',
+    emoticons: [']:(', ']:[', ']:-(', ']:-[', ']=(', ']=[', ']=-(', ']=-['],
+  },
+  {
+    name: 'innocent',
+    emoji: '😇',
+    tags: ['angel'],
+    description: 'smiling face with halo',
+    emoticons: [
+      'o:)',
+      'o:]',
+      'o:D',
+      'o:-)',
+      'o:-]',
+      'o:-D',
+      'o=)',
+      'o=]',
+      'o=D',
+      'o=-)',
+      'o=-]',
+      'o=-D',
+      'O:)',
+      'O:]',
+      'O:D',
+      'O:-)',
+      'O:-]',
+      'O:-D',
+      'O=)',
+      'O=]',
+      'O=D',
+      'O=-)',
+      'O=-]',
+      'O=-D',
+      '0:)',
+      '0:]',
+      '0:D',
+      '0:-)',
+      '0:-]',
+      '0:-D',
+      '0=)',
+      '0=]',
+      '0=D',
+      '0=-)',
+      '0=-]',
+      '0=-D',
+    ],
+  },
+  {
+    name: 'joy',
+    emoji: '😂',
+    tags: ['tears'],
+    description: 'face with tears of joy',
+    emoticons: [
+      ':,)',
+      ':,]',
+      ':,D',
+      ':,-)',
+      ':,-]',
+      ':,-D',
+      ":')",
+      ":']",
+      ":'D",
+      ":'-)",
+      ":'-]",
+      ":'-D",
+      '=,)',
+      '=,]',
+      '=,D',
+      '=,-)',
+      '=,-]',
+      '=,-D',
+      "=')",
+      "=']",
+      "='D",
+      "='-)",
+      "='-]",
+      "='-D",
+    ],
+  },
+  {
+    name: 'kissing',
+    emoji: '😗',
+    tags: [],
+    description: 'kissing face',
+    emoticons: [':*', ':-*', '=*', '=-*'],
+  },
+  {
+    name: 'laughing',
+    emoji: '😆',
+    tags: ['happy', 'haha'],
+    description: 'grinning squinting face',
+    emoticons: ['x)', 'x]', 'xD', 'x-)', 'x-]', 'x-D', 'X)', 'X]', 'X-)', 'X-]', 'X-D'],
+  },
+  {
+    name: 'man',
+    emoji: '👨',
+    tags: ['mustache', 'father', 'dad'],
+    description: 'man',
+    emoticons: [':3', ':-3', '=3', '=-3', ';3', ';-3', 'x3', 'x-3', 'X3', 'X-3'],
+  },
+  {
+    name: 'neutral_face',
+    emoji: '😐',
+    tags: ['meh'],
+    description: 'neutral face',
+    emoticons: [':|', ':-|', '=|', '=-|'],
+  },
+  {
+    name: 'no_mouth',
+    emoji: '😶',
+    tags: ['mute', 'silence'],
+    description: 'face without mouth',
+    emoticons: [':-'],
+  },
+  {
+    name: 'open_mouth',
+    emoji: '😮',
+    tags: ['surprise', 'impressed', 'wow'],
+    description: 'face with open mouth',
+    emoticons: [':o', ':O', ':0', ':-o', ':-O', ':-0', '=o', '=O', '=0', '=-o', '=-O', '=-0'],
+  },
+  {
+    name: 'rage',
+    emoji: '😡',
+    tags: ['angry'],
+    description: 'pouting face',
+    emoticons: [':@', ':-@', '=@', '=-@'],
+  },
+  {
+    name: 'smile',
+    emoji: '😄',
+    tags: ['happy', 'joy', 'laugh', 'pleased'],
+    description: 'grinning face with smiling eyes',
+    emoticons: [':D', ':-D', '=D', '=-D'],
+  },
+  {
+    name: 'slight smile',
+    emoji: '🙂',
+    tags: ['face', 'slightly smiling face', 'smile'],
+    description: 'slightly smiling face',
+    emoticons: [':)', ':]', ':-)', ':-]', '=)', '=]', '=-)', '=-]'],
+  },
+  {
+    name: 'smiling_imp',
+    emoji: '😈',
+    tags: ['devil', 'evil', 'horns'],
+    description: 'smiling face with horns',
+    emoticons: [']:)', ']:]', ']:D', ']:-)', ']:-]', ']:-D', ']=)', ']=]', ']=D', ']=-)', ']=-]', ']=-D'],
+  },
+  {
+    name: 'sob',
+    emoji: '😭',
+    tags: ['sad', 'cry', 'bawling'],
+    description: 'loudly crying face',
+    emoticons: [
+      ":,'(",
+      ":,'[",
+      ":,'-(",
+      ":,'-[",
+      ":',(",
+      ":',[",
+      ":',-(",
+      ":',-[",
+      "=,'(",
+      "=,'[",
+      "=,'-(",
+      "=,'-[",
+      "=',(",
+      "=',[",
+      "=',-(",
+      "=',-[",
+    ],
+  },
+  {
+    name: 'stuck_out_tongue',
+    emoji: '😛',
+    tags: [],
+    description: 'face with tongue',
+    emoticons: [':p', ':P', ':d', ':-p', ':-P', ':-d', '=p', '=P', '=d', '=-p', '=-P', '=-d'],
+  },
+  {
+    name: 'stuck_out_tongue_closed_eyes',
+    emoji: '😝',
+    tags: ['prank'],
+    description: 'squinting face with tongue',
+    emoticons: ['xP', 'x-p', 'x-P', 'x-d', 'Xp', 'Xd', 'X-p', 'X-P', 'X-d'],
+  },
+  {
+    name: 'stuck_out_tongue_winking_eye',
+    emoji: '😜',
+    tags: ['prank', 'silly'],
+    description: 'winking face with tongue',
+    emoticons: [';p', ';P', ';d', ';-p', ';-P', ';-d'],
+  },
+  {
+    name: 'sunglasses',
+    emoji: '😎',
+    tags: ['cool'],
+    description: 'smiling face with sunglasses',
+    emoticons: ['8)', '8]', '8D', '8-)', '8-]', '8-D', 'B)', 'B]', 'B-)', 'B-]', 'B-D'],
+  },
+  {
+    name: 'sweat',
+    emoji: '😓',
+    tags: [],
+    description: 'downcast face with sweat',
+    emoticons: [
+      ',:(',
+      ',:[',
+      ',:-(',
+      ',:-[',
+      ',=(',
+      ',=[',
+      ',=-(',
+      ',=-[',
+      "':(",
+      "':[",
+      "':-(",
+      "':-[",
+      "'=(",
+      "'=[",
+      "'=-(",
+      "'=-[",
+    ],
+  },
+  {
+    name: 'sweat_smile',
+    emoji: '😅',
+    tags: ['hot'],
+    description: 'grinning face with sweat',
+    emoticons: [
+      ',:)',
+      ',:]',
+      ',:D',
+      ',:-)',
+      ',:-]',
+      ',:-D',
+      ',=)',
+      ',=]',
+      ',=D',
+      ',=-)',
+      ',=-]',
+      ',=-D',
+      "':)",
+      "':]",
+      "':D",
+      "':-)",
+      "':-]",
+      "':-D",
+      "'=)",
+      "'=]",
+      "'=D",
+      "'=-)",
+      "'=-]",
+      "'=-D",
+    ],
+  },
+  {
+    name: 'unamused',
+    emoji: '😒',
+    tags: ['meh'],
+    description: 'unamused face',
+    emoticons: [
+      ':$',
+      ':s',
+      ':z',
+      ':S',
+      ':Z',
+      ':-$',
+      ':-s',
+      ':-z',
+      ':-S',
+      ':-Z',
+      '=$',
+      '=s',
+      '=z',
+      '=S',
+      '=Z',
+      '=-$',
+      '=-s',
+      '=-z',
+      '=-S',
+      '=-Z',
+    ],
+  },
+  {
+    name: 'wink',
+    emoji: '😉',
+    tags: ['flirt'],
+    description: 'winking face',
+    emoticons: [';)', ';]', ';D', ';-)', ';-]', ';-D'],
+  },
+];
diff --git a/src/script/components/InputBar/components/MentionSuggestions/MentionSuggestionsItem.tsx b/src/script/components/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx
similarity index 100%
rename from src/script/components/InputBar/components/MentionSuggestions/MentionSuggestionsItem.tsx
rename to src/script/components/RichTextEditor/plugins/MentionsPlugin/MentionSuggestionsItem.tsx
diff --git a/src/script/components/RichTextEditor/plugins/MentionsPlugin/MentionsPlugin.tsx b/src/script/components/RichTextEditor/plugins/MentionsPlugin/MentionsPlugin.tsx
new file mode 100644
index 00000000000..47060033a59
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/MentionsPlugin/MentionsPlugin.tsx
@@ -0,0 +1,173 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MutableRefObject, useCallback, useState} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {MenuOption as _MenuOption, MenuRenderFn, MenuTextMatch} from '@lexical/react/LexicalTypeaheadMenuPlugin';
+import {$createTextNode, TextNode} from 'lexical';
+import * as ReactDOM from 'react-dom';
+
+import {FadingScrollbar} from 'Components/FadingScrollbar';
+import {IgnoreOutsideClickWrapper} from 'Components/InputBar/util/clickHandlers';
+
+import {MentionSuggestionsItem} from './MentionSuggestionsItem';
+
+import {User} from '../../../../entity/User';
+import {$createMentionNode} from '../../nodes/MentionNode';
+import {getSelectionInfo} from '../../utils/getSelectionInfo';
+import {TypeaheadMenuPlugin} from '../TypeaheadMenuPlugin';
+
+const TRIGGER = '@';
+
+/**
+ * Will detect mentions triggers in a text
+ * @param text the text in which to look for mentions triggers
+ */
+function checkForMentions(text: string): MenuTextMatch | null {
+  const match = new RegExp(`(^| )(${TRIGGER}(\\S*))$`).exec(text);
+
+  if (match === null) {
+    return null;
+  }
+  const search = match[2];
+  const term = match[3];
+
+  return {
+    leadOffset: match.index,
+    matchingString: term,
+    replaceableString: search,
+  };
+}
+
+export class MenuOption extends _MenuOption {
+  user: User;
+  value: string;
+  label: string;
+  constructor(user: User, value: string, label?: string) {
+    super(value);
+    this.user = user;
+    this.value = value;
+    this.label = label ?? value;
+  }
+}
+
+interface MentionsPluginProps {
+  onSearch: (queryString?: string | null) => User[];
+  openStateRef: MutableRefObject<boolean>;
+}
+
+export function MentionsPlugin({onSearch, openStateRef}: MentionsPluginProps) {
+  const [editor] = useLexicalComposerContext();
+  const [queryString, setQueryString] = useState<string | null>();
+
+  const results = onSearch(queryString);
+
+  const options = results.map(result => new MenuOption(result, result.name())).reverse();
+
+  const handleSelectOption = useCallback(
+    (selectedOption: MenuOption, nodeToReplace: TextNode | null, closeMenu: () => void) => {
+      editor.update(() => {
+        const mentionNode = $createMentionNode(TRIGGER, selectedOption.value);
+        if (nodeToReplace) {
+          nodeToReplace.replace(mentionNode);
+          mentionNode.insertAfter($createTextNode(' '));
+        }
+        closeMenu();
+      });
+    },
+    [editor],
+  );
+
+  const checkForMentionMatch = useCallback((text: string) => {
+    // Don't show the menu if the next character is a word character
+    const info = getSelectionInfo([TRIGGER]);
+    if (info?.isTextNode && info.wordCharAfterCursor) {
+      return null;
+    }
+    return checkForMentions(text);
+  }, []);
+
+  const rootElement = editor.getRootElement();
+
+  const getPosition = () => {
+    if (!rootElement) {
+      return {bottom: 0, left: 0};
+    }
+
+    const boundingClientRect = rootElement.getBoundingClientRect();
+
+    return {bottom: window.innerHeight - boundingClientRect.top + 24, left: boundingClientRect.left};
+  };
+
+  const menuRenderFn: MenuRenderFn<MenuOption> = (
+    anchorElementRef,
+    {selectedIndex, selectOptionAndCleanUp, setHighlightedIndex},
+  ) => {
+    if (!anchorElementRef.current || !options.length) {
+      return null;
+    }
+
+    openStateRef.current = true;
+    const {bottom, left} = getPosition();
+
+    return ReactDOM.createPortal(
+      <IgnoreOutsideClickWrapper>
+        <FadingScrollbar
+          className="conversation-input-bar-mention-suggestion"
+          style={{bottom, left, overflowY: 'auto'}}
+          data-uie-name="list-mention-suggestions"
+        >
+          <div className="mention-suggestion-list">
+            {options.map((menuOption, index) => (
+              <MentionSuggestionsItem
+                ref={menuOption.setRefElement}
+                key={menuOption.user.id}
+                suggestion={menuOption.user}
+                isSelected={selectedIndex === index}
+                onSuggestionClick={() => {
+                  setHighlightedIndex(index);
+                  selectOptionAndCleanUp(menuOption);
+                }}
+                onMouseEnter={() => {
+                  setHighlightedIndex(index);
+                }}
+              />
+            ))}
+          </div>
+        </FadingScrollbar>
+      </IgnoreOutsideClickWrapper>,
+      anchorElementRef.current,
+    );
+  };
+
+  openStateRef.current = options.length > 0;
+
+  return (
+    <TypeaheadMenuPlugin
+      onQueryChange={setQueryString}
+      onSelectOption={handleSelectOption}
+      triggerFn={checkForMentionMatch}
+      options={options}
+      menuRenderFn={menuRenderFn}
+      containerId="mentions-typeahead-menu"
+      isReversed
+    />
+  );
+}
diff --git a/src/script/components/RichTextEditor/plugins/MentionsPlugin/index.ts b/src/script/components/RichTextEditor/plugins/MentionsPlugin/index.ts
new file mode 100644
index 00000000000..45427206b17
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/MentionsPlugin/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './MentionsPlugin';
diff --git a/src/script/components/RichTextEditor/plugins/SendPlugin.tsx b/src/script/components/RichTextEditor/plugins/SendPlugin.tsx
new file mode 100644
index 00000000000..2046de4af02
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/SendPlugin.tsx
@@ -0,0 +1,48 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {COMMAND_PRIORITY_LOW, KEY_ENTER_COMMAND} from 'lexical';
+
+type Props = {
+  onSend: () => void;
+};
+
+export function SendPlugin({onSend}: Props): null {
+  const [editor] = useLexicalComposerContext();
+
+  useEffect(() => {
+    return editor.registerCommand(
+      KEY_ENTER_COMMAND,
+      event => {
+        if (event?.shiftKey) {
+          return true;
+        }
+
+        onSend();
+        return false;
+      },
+      COMMAND_PRIORITY_LOW,
+    );
+  }, [editor, onSend]);
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/TextChangePlugin.tsx b/src/script/components/RichTextEditor/plugins/TextChangePlugin.tsx
new file mode 100644
index 00000000000..08851251bed
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/TextChangePlugin.tsx
@@ -0,0 +1,39 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {LexicalEditor} from 'lexical';
+
+type Props = {
+  onUpdate: (editor: LexicalEditor, text: string) => void;
+};
+
+export function TextChangePlugin({onUpdate}: Props): null {
+  const [editor] = useLexicalComposerContext();
+
+  useEffect(() => {
+    return editor.registerTextContentListener(textContent => {
+      onUpdate(editor, textContent);
+    });
+  }, [editor, onUpdate]);
+
+  return null;
+}
diff --git a/src/script/components/RichTextEditor/plugins/TypeaheadMenuPlugin.tsx b/src/script/components/RichTextEditor/plugins/TypeaheadMenuPlugin.tsx
new file mode 100644
index 00000000000..e08c845cdb1
--- /dev/null
+++ b/src/script/components/RichTextEditor/plugins/TypeaheadMenuPlugin.tsx
@@ -0,0 +1,758 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+/**
+ * This is a modified version of https://github.com/facebook/lexical/blob/main/packages/lexical-react/src/LexicalTypeaheadMenuPlugin.tsx
+ * It allows showing a list that is filled from the bottom up instead of the top down (the default selected item is at the bottom of the list).
+ * The only differences lie in:
+ * - the default index we select when the component is instanciated (the last one by default)
+ * - a protection to avoid re-rendering the entire component when the list updates (which makes the scroll flicker)
+ */
+import React, {
+  MutableRefObject,
+  ReactPortal,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+
+import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext';
+import {mergeRegister} from '@lexical/utils';
+import {
+  $getSelection,
+  $isRangeSelection,
+  $isTextNode,
+  COMMAND_PRIORITY_LOW,
+  COMMAND_PRIORITY_NORMAL,
+  createCommand,
+  KEY_ARROW_DOWN_COMMAND,
+  KEY_ARROW_UP_COMMAND,
+  KEY_ENTER_COMMAND,
+  KEY_ESCAPE_COMMAND,
+  KEY_TAB_COMMAND,
+  LexicalCommand,
+  LexicalEditor,
+  RangeSelection,
+  TextNode,
+} from 'lexical';
+
+export type QueryMatch = {
+  leadOffset: number;
+  matchingString: string;
+  replaceableString: string;
+};
+
+export type Resolution = {
+  match: QueryMatch;
+  getRect: () => DOMRect;
+};
+
+export class TypeaheadOption {
+  key: string;
+  ref?: MutableRefObject<HTMLElement | null>;
+
+  constructor(key: string) {
+    this.key = key;
+    this.ref = {current: null};
+    this.setRefElement = this.setRefElement.bind(this);
+  }
+
+  setRefElement(element: HTMLElement | null) {
+    this.ref = {current: element};
+  }
+}
+
+export type ItemProps<TOption extends TypeaheadOption> = {
+  selectedIndex: number | null;
+  selectOptionAndCleanUp: (option: TOption) => void;
+  setHighlightedIndex: (index: number) => void;
+  options: Array<TOption>;
+};
+
+export type MenuRenderFn<TOption extends TypeaheadOption> = (
+  anchorElementRef: MutableRefObject<HTMLElement | null>,
+  itemProps: ItemProps<TOption>,
+  matchingString: string,
+) => ReactPortal | JSX.Element | null;
+
+const scrollIntoViewIfNeeded = (target: HTMLElement, containerId: string) => {
+  const typeaheadContainerNode = document.getElementById(containerId);
+
+  if (!typeaheadContainerNode) {
+    return;
+  }
+
+  const typeaheadRect = typeaheadContainerNode.getBoundingClientRect();
+
+  if (typeaheadRect.top + typeaheadRect.height > window.innerHeight) {
+    typeaheadContainerNode.scrollIntoView({
+      block: 'center',
+    });
+  }
+
+  if (typeaheadRect.top < 0) {
+    typeaheadContainerNode.scrollIntoView({
+      block: 'center',
+    });
+  }
+
+  target.scrollIntoView({block: 'nearest'});
+};
+
+function getTextUpToAnchor(selection: RangeSelection): string | null {
+  const anchor = selection.anchor;
+  if (anchor.type !== 'text') {
+    return null;
+  }
+  const anchorNode = anchor.getNode();
+  if (!anchorNode.isSimpleText()) {
+    return null;
+  }
+  const anchorOffset = anchor.offset;
+  return anchorNode.getTextContent().slice(0, anchorOffset);
+}
+
+function tryToPositionRange(leadOffset: number, range: Range): boolean {
+  const domSelection = window.getSelection();
+  if (domSelection === null || !domSelection.isCollapsed) {
+    return false;
+  }
+  const anchorNode = domSelection.anchorNode;
+  const startOffset = leadOffset;
+  const endOffset = domSelection.anchorOffset;
+
+  if (anchorNode == null || endOffset == null) {
+    return false;
+  }
+
+  try {
+    range.setStart(anchorNode, startOffset);
+    range.setEnd(anchorNode, endOffset);
+  } catch (error) {
+    return false;
+  }
+
+  return true;
+}
+
+function getQueryTextForSearch(editor: LexicalEditor): string | null {
+  let text = null;
+  editor.getEditorState().read(() => {
+    const selection = $getSelection();
+    if (!$isRangeSelection(selection)) {
+      return;
+    }
+    text = getTextUpToAnchor(selection);
+  });
+  return text;
+}
+
+/**
+ * Walk backwards along user input and forward through entity title to try
+ * and replace more of the user's text with entity.
+ */
+function getFullMatchOffset(documentText: string, entryText: string, offset: number): number {
+  let triggerOffset = offset;
+  for (let i = triggerOffset; i <= entryText.length; i++) {
+    if (documentText.substr(-i) === entryText.substr(0, i)) {
+      triggerOffset = i;
+    }
+  }
+  return triggerOffset;
+}
+
+/**
+ * Split Lexical TextNode and return a new TextNode only containing matched text.
+ * Common use cases include: removing the node, replacing with a new node.
+ */
+function splitNodeContainingQuery(editor: LexicalEditor, match: QueryMatch): TextNode | null {
+  const selection = $getSelection();
+  if (!$isRangeSelection(selection) || !selection.isCollapsed()) {
+    return null;
+  }
+  const anchor = selection.anchor;
+  if (anchor.type !== 'text') {
+    return null;
+  }
+  const anchorNode = anchor.getNode();
+  if (!anchorNode.isSimpleText()) {
+    return null;
+  }
+  const selectionOffset = anchor.offset;
+  const textContent = anchorNode.getTextContent().slice(0, selectionOffset);
+  const characterOffset = match.replaceableString.length;
+  const queryOffset = getFullMatchOffset(textContent, match.matchingString, characterOffset);
+  const startOffset = selectionOffset - queryOffset;
+  if (startOffset < 0) {
+    return null;
+  }
+  let newNode;
+  if (startOffset === 0) {
+    [newNode] = anchorNode.splitText(selectionOffset);
+  } else {
+    [, newNode] = anchorNode.splitText(startOffset, selectionOffset);
+  }
+
+  return newNode;
+}
+
+function isSelectionOnEntityBoundary(editor: LexicalEditor, offset: number): boolean {
+  if (offset !== 0) {
+    return false;
+  }
+  return editor.getEditorState().read(() => {
+    const selection = $getSelection();
+    if ($isRangeSelection(selection)) {
+      const anchor = selection.anchor;
+      const anchorNode = anchor.getNode();
+      const prevSibling = anchorNode.getPreviousSibling();
+      return $isTextNode(prevSibling) && prevSibling.isTextEntity();
+    }
+    return false;
+  });
+}
+
+function startTransition(callback: () => void) {
+  if (React.startTransition) {
+    React.startTransition(callback);
+  } else {
+    callback();
+  }
+}
+
+// Got from https://stackoverflow.com/a/42543908/2013580
+export function getScrollParent(element: HTMLElement, includeHidden: boolean): HTMLElement | HTMLBodyElement {
+  let style = getComputedStyle(element);
+  const excludeStaticParent = style.position === 'absolute';
+  const overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/;
+  if (style.position === 'fixed') {
+    return document.body;
+  }
+  for (let parent: HTMLElement | null = element; (parent = parent.parentElement); ) {
+    style = getComputedStyle(parent);
+    if (excludeStaticParent && style.position === 'static') {
+      continue;
+    }
+    if (overflowRegex.test(style.overflow + style.overflowY + style.overflowX)) {
+      return parent;
+    }
+  }
+  return document.body;
+}
+
+function isTriggerVisibleInNearestScrollContainer(targetElement: HTMLElement, containerElement: HTMLElement): boolean {
+  const tRect = targetElement.getBoundingClientRect();
+  const cRect = containerElement.getBoundingClientRect();
+  return tRect.top > cRect.top && tRect.top < cRect.bottom;
+}
+
+// Reposition the menu on scroll, window resize, and element resize.
+function useDynamicPositioning(
+  resolution: Resolution | null,
+  targetElement: HTMLElement | null,
+  onReposition: () => void,
+  onVisibilityChange?: (isInView: boolean) => void,
+) {
+  const [editor] = useLexicalComposerContext();
+  useEffect(() => {
+    if (targetElement != null && resolution != null) {
+      const rootElement = editor.getRootElement();
+      const rootScrollParent = rootElement != null ? getScrollParent(rootElement, false) : document.body;
+      let ticking = false;
+      let previousIsInView = isTriggerVisibleInNearestScrollContainer(targetElement, rootScrollParent);
+      const handleScroll = function () {
+        if (!ticking) {
+          window.requestAnimationFrame(() => {
+            onReposition();
+            ticking = false;
+          });
+          ticking = true;
+        }
+        const isInView = isTriggerVisibleInNearestScrollContainer(targetElement, rootScrollParent);
+        if (isInView !== previousIsInView) {
+          previousIsInView = isInView;
+          if (onVisibilityChange != null) {
+            onVisibilityChange(isInView);
+          }
+        }
+      };
+      const resizeObserver = new ResizeObserver(onReposition);
+      window.addEventListener('resize', onReposition);
+      document.addEventListener('scroll', handleScroll, {
+        capture: true,
+        passive: true,
+      });
+      resizeObserver.observe(targetElement);
+      return () => {
+        resizeObserver.unobserve(targetElement);
+        window.removeEventListener('resize', onReposition);
+        document.removeEventListener('scroll', handleScroll);
+      };
+    }
+
+    return () => null;
+  }, [targetElement, editor, onVisibilityChange, onReposition, resolution]);
+}
+
+export const SCROLL_TYPEAHEAD_OPTION_INTO_VIEW_COMMAND: LexicalCommand<{
+  index: number;
+  option: TypeaheadOption;
+}> = createCommand('SCROLL_TYPEAHEAD_OPTION_INTO_VIEW_COMMAND');
+
+function LexicalPopoverMenu<TOption extends TypeaheadOption>({
+  close,
+  editor,
+  anchorElementRef,
+  resolution,
+  options,
+  menuRenderFn,
+  containerId,
+  onSelectOption,
+  onMenuVisibilityChange,
+  isReversed = false,
+}: {
+  close: () => void;
+  editor: LexicalEditor;
+  anchorElementRef: MutableRefObject<HTMLElement>;
+  resolution: Resolution;
+  containerId: string;
+  options: Array<TOption>;
+  menuRenderFn: MenuRenderFn<TOption>;
+  onSelectOption: (
+    option: TOption,
+    textNodeContainingQuery: TextNode | null,
+    closeMenu: () => void,
+    matchingString: string,
+  ) => void;
+  onMenuVisibilityChange?: (visible: boolean) => void;
+  isReversed?: boolean;
+}): JSX.Element | null {
+  const [menuVisible, setMenuVisible] = useState(false);
+  const [selectedIndex, setHighlightedIndex] = useState<null | number>(null);
+
+  useEffect(() => {
+    setHighlightedIndex(isReversed ? options.length - 1 : 0);
+  }, [resolution.match.matchingString, options, isReversed]);
+
+  const selectOptionAndCleanUp = useCallback(
+    (selectedEntry: TOption) => {
+      editor.update(() => {
+        const textNodeContainingQuery = splitNodeContainingQuery(editor, resolution.match);
+
+        onSelectOption(selectedEntry, textNodeContainingQuery, close, resolution.match.matchingString);
+      });
+    },
+    [close, editor, resolution.match, onSelectOption],
+  );
+
+  const updateSelectedIndex = useCallback(
+    (index: number) => {
+      const rootElem = editor.getRootElement();
+      if (rootElem !== null) {
+        rootElem.setAttribute('aria-activedescendant', `typeahead-item-${index}`);
+        setHighlightedIndex(index);
+      }
+    },
+    [editor],
+  );
+
+  useEffect(() => {
+    return () => {
+      const rootElem = editor.getRootElement();
+      if (rootElem !== null) {
+        rootElem.removeAttribute('aria-activedescendant');
+      }
+    };
+  }, [editor]);
+
+  useLayoutEffect(() => {
+    if (options === null) {
+      setHighlightedIndex(null);
+    } else if (selectedIndex === null) {
+      updateSelectedIndex(options.length - 1);
+    }
+  }, [options, selectedIndex, updateSelectedIndex]);
+
+  useEffect(() => {
+    return mergeRegister(
+      editor.registerCommand(
+        SCROLL_TYPEAHEAD_OPTION_INTO_VIEW_COMMAND,
+        ({option}) => {
+          if (option.ref && option.ref.current != null) {
+            scrollIntoViewIfNeeded(option.ref.current, containerId);
+            return true;
+          }
+
+          return false;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+    );
+  }, [editor, updateSelectedIndex, containerId]);
+
+  useEffect(() => {
+    if (menuVisible && typeof selectedIndex === 'number' && options?.[selectedIndex]) {
+      const currentSelectedOption = options[selectedIndex];
+
+      // Using setTimeout because we need to wait for popover render
+      setTimeout(() => {
+        if (currentSelectedOption.ref != null && currentSelectedOption.ref.current) {
+          scrollIntoViewIfNeeded(currentSelectedOption.ref.current, containerId);
+        }
+      }, 16);
+    }
+  }, [editor, menuVisible, selectedIndex, options, containerId]);
+
+  useEffect(() => {
+    return mergeRegister(
+      editor.registerCommand<KeyboardEvent>(
+        KEY_ARROW_DOWN_COMMAND,
+        payload => {
+          const event = payload;
+          if (options !== null && options.length && selectedIndex !== null) {
+            const newSelectedIndex = selectedIndex !== options.length - 1 ? selectedIndex + 1 : 0;
+            updateSelectedIndex(newSelectedIndex);
+            const option = options[newSelectedIndex];
+            if (option.ref != null && option.ref.current) {
+              editor.dispatchCommand(SCROLL_TYPEAHEAD_OPTION_INTO_VIEW_COMMAND, {
+                index: newSelectedIndex,
+                option,
+              });
+            }
+            event.preventDefault();
+            event.stopImmediatePropagation();
+          }
+          return true;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+      editor.registerCommand<KeyboardEvent>(
+        KEY_ARROW_UP_COMMAND,
+        payload => {
+          const event = payload;
+          if (options !== null && options.length && selectedIndex !== null) {
+            const newSelectedIndex = selectedIndex !== 0 ? selectedIndex - 1 : options.length - 1;
+            updateSelectedIndex(newSelectedIndex);
+            const option = options[newSelectedIndex];
+            if (option.ref != null && option.ref.current) {
+              editor.dispatchCommand(SCROLL_TYPEAHEAD_OPTION_INTO_VIEW_COMMAND, {
+                index: newSelectedIndex,
+                option,
+              });
+            }
+            event.preventDefault();
+            event.stopImmediatePropagation();
+          }
+          return true;
+        },
+        COMMAND_PRIORITY_NORMAL,
+      ),
+      editor.registerCommand<KeyboardEvent>(
+        KEY_ESCAPE_COMMAND,
+        payload => {
+          const event = payload;
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          close();
+          return true;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+      editor.registerCommand<KeyboardEvent>(
+        KEY_TAB_COMMAND,
+        payload => {
+          const event = payload;
+          if (options === null || selectedIndex === null || options[selectedIndex] == null) {
+            return false;
+          }
+          event.preventDefault();
+          event.stopImmediatePropagation();
+          selectOptionAndCleanUp(options[selectedIndex]);
+          return true;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+      editor.registerCommand(
+        KEY_ENTER_COMMAND,
+        (event: KeyboardEvent | null) => {
+          if (options === null || selectedIndex === null || options[selectedIndex] == null) {
+            return false;
+          }
+          if (event !== null) {
+            event.preventDefault();
+            event.stopImmediatePropagation();
+          }
+          selectOptionAndCleanUp(options[selectedIndex]);
+          return true;
+        },
+        COMMAND_PRIORITY_LOW,
+      ),
+    );
+  }, [selectOptionAndCleanUp, close, editor, options, selectedIndex, updateSelectedIndex]);
+
+  const listItemProps = useMemo(
+    () => ({
+      options,
+      selectOptionAndCleanUp,
+      selectedIndex,
+      setHighlightedIndex,
+    }),
+    [selectOptionAndCleanUp, selectedIndex, options],
+  );
+
+  const menu = menuRenderFn(anchorElementRef, listItemProps, resolution.match.matchingString);
+
+  useLayoutEffect(() => {
+    if (onMenuVisibilityChange && menu !== null && !menuVisible) {
+      onMenuVisibilityChange(true);
+      setMenuVisible(true);
+    } else if (onMenuVisibilityChange && menu === null && menuVisible) {
+      onMenuVisibilityChange(false);
+      setMenuVisible(false);
+    }
+  }, [menu, menuVisible, onMenuVisibilityChange]);
+
+  return menu;
+}
+
+interface UseMenuAnchorRefOptions {
+  resolution: Resolution | null;
+  containerId: string;
+  setResolution: (r: Resolution | null) => void;
+  className?: string;
+  menuVisible?: boolean;
+}
+
+function useMenuAnchorRef(opt: UseMenuAnchorRefOptions): MutableRefObject<HTMLElement> {
+  const {resolution, setResolution, className, menuVisible} = opt;
+  const [editor] = useLexicalComposerContext();
+  const anchorElementRef = useRef<HTMLElement>(document.createElement('div'));
+  const positionMenu = useCallback(() => {
+    const rootElement = editor.getRootElement();
+    const containerDiv = anchorElementRef.current;
+    const menuEle = containerDiv.firstChild as Element;
+
+    if (rootElement !== null && resolution !== null) {
+      const {left, top, height} = resolution.getRect();
+      containerDiv.style.top = `${top + window.pageYOffset}px`;
+      containerDiv.style.left = `${left + window.pageXOffset}px`;
+      containerDiv.style.height = `${height}px`;
+
+      if (menuEle !== null) {
+        const menuRect = menuEle.getBoundingClientRect();
+        const menuHeight = menuRect.height;
+        const menuWidth = menuRect.width;
+
+        const rootElementRect = rootElement.getBoundingClientRect();
+
+        if (left + menuWidth > rootElementRect.right) {
+          containerDiv.style.left = `${rootElementRect.right - menuWidth + window.pageXOffset}px`;
+        }
+        const margin = 10;
+        if (
+          (top + menuHeight > window.innerHeight || top + menuHeight > rootElementRect.bottom) &&
+          top - rootElementRect.top > menuHeight
+        ) {
+          containerDiv.style.top = `${top - menuHeight + window.pageYOffset - (height + margin)}px`;
+        }
+      }
+
+      if (!containerDiv.isConnected) {
+        if (className) {
+          containerDiv.className = className;
+        }
+        containerDiv.setAttribute('aria-label', 'Typeahead menu');
+        containerDiv.setAttribute('id', opt.containerId);
+        containerDiv.setAttribute('role', 'listbox');
+        containerDiv.style.display = 'block';
+        containerDiv.style.position = 'absolute';
+        document.body.append(containerDiv);
+      }
+      anchorElementRef.current = containerDiv;
+      rootElement.setAttribute('aria-controls', 'typeahead-menu');
+    }
+  }, [editor, resolution, className, opt.containerId]);
+
+  const wasInit = useRef(false);
+  useEffect(() => {
+    const rootElement = editor.getRootElement();
+    if (resolution === null) {
+      wasInit.current = false;
+    }
+    if (resolution !== null && menuVisible && !wasInit.current) {
+      // Avoid removing/re-adding the menu when the content changes (causes scroll issues and flickering)
+      wasInit.current = true;
+      positionMenu();
+      return () => {
+        if (rootElement !== null) {
+          rootElement.removeAttribute('aria-controls');
+        }
+
+        const containerDiv = anchorElementRef.current;
+        if (containerDiv !== null && containerDiv.isConnected) {
+          containerDiv.remove();
+        }
+      };
+    }
+
+    return () => {
+      const containerDiv = anchorElementRef.current;
+
+      if (containerDiv !== null) {
+        containerDiv.remove();
+      }
+      return null;
+    };
+  }, [editor, positionMenu, resolution, menuVisible]);
+
+  const onVisibilityChange = useCallback(
+    (isInView: boolean) => {
+      if (resolution !== null) {
+        if (!isInView) {
+          setResolution(null);
+        }
+      }
+    },
+    [resolution, setResolution],
+  );
+
+  useDynamicPositioning(resolution, anchorElementRef.current, positionMenu, onVisibilityChange);
+
+  return anchorElementRef;
+}
+
+export type TypeaheadMenuPluginProps<TOption extends TypeaheadOption> = {
+  onQueryChange: (matchingString: string | null) => void;
+  onSelectOption: (
+    option: TOption,
+    textNodeContainingQuery: TextNode | null,
+    closeMenu: () => void,
+    matchingString: string,
+  ) => void;
+  options: Array<TOption>;
+  menuRenderFn: MenuRenderFn<TOption>;
+  triggerFn: TriggerFn;
+  onOpen?: (resolution: Resolution) => void;
+  onClose?: () => void;
+  anchorClassName?: string;
+  containerId: string;
+  isReversed?: boolean;
+};
+
+export type TriggerFn = (text: string, editor: LexicalEditor) => QueryMatch | null;
+
+export function TypeaheadMenuPlugin<TOption extends TypeaheadOption>({
+  options,
+  onQueryChange,
+  onSelectOption,
+  onOpen,
+  onClose,
+  menuRenderFn,
+  triggerFn,
+  anchorClassName,
+  containerId,
+  isReversed = false,
+}: TypeaheadMenuPluginProps<TOption>): JSX.Element | null {
+  const [editor] = useLexicalComposerContext();
+  const [resolution, setResolution] = useState<Resolution | null>(null);
+  const [menuVisible, setMenuVisible] = useState(false);
+  const anchorElementRef = useMenuAnchorRef({
+    containerId,
+    resolution,
+    setResolution,
+    className: `typeahead-menu ${anchorClassName || ''}`,
+    menuVisible,
+  });
+
+  const closeTypeahead = useCallback(() => {
+    setResolution(null);
+    if (onClose != null && resolution !== null) {
+      onClose();
+    }
+  }, [onClose, resolution]);
+
+  const openTypeahead = useCallback(
+    (res: Resolution) => {
+      setResolution(res);
+      if (onOpen != null && resolution === null) {
+        onOpen(res);
+      }
+    },
+    [onOpen, resolution],
+  );
+
+  useEffect(() => {
+    if (resolution === null && menuVisible) {
+      setMenuVisible(false);
+    }
+    const updateListener = () => {
+      editor.getEditorState().read(() => {
+        const range = document.createRange();
+        const selection = $getSelection();
+        const text = getQueryTextForSearch(editor);
+
+        if (!$isRangeSelection(selection) || !selection.isCollapsed() || text === null || range === null) {
+          closeTypeahead();
+          return;
+        }
+
+        const match = triggerFn(text, editor);
+        onQueryChange(match ? match.matchingString : null);
+
+        if (match !== null && !isSelectionOnEntityBoundary(editor, match.leadOffset)) {
+          const isRangePositioned = tryToPositionRange(match.leadOffset, range);
+          if (isRangePositioned !== null) {
+            startTransition(() =>
+              openTypeahead({
+                getRect: () => range.getBoundingClientRect(),
+                match,
+              }),
+            );
+            return;
+          }
+        }
+        closeTypeahead();
+      });
+    };
+
+    const removeUpdateListener = editor.registerUpdateListener(updateListener);
+
+    return () => {
+      removeUpdateListener();
+    };
+  }, [editor, triggerFn, onQueryChange, resolution, closeTypeahead, openTypeahead, menuVisible, setMenuVisible]);
+
+  return resolution === null || editor === null ? null : (
+    <LexicalPopoverMenu
+      close={closeTypeahead}
+      containerId={containerId}
+      resolution={resolution}
+      editor={editor}
+      anchorElementRef={anchorElementRef}
+      options={options}
+      menuRenderFn={menuRenderFn}
+      onSelectOption={onSelectOption}
+      onMenuVisibilityChange={setMenuVisible}
+      isReversed={isReversed}
+    />
+  );
+}
diff --git a/src/script/components/RichTextEditor/utils/generateNodes.ts b/src/script/components/RichTextEditor/utils/generateNodes.ts
new file mode 100644
index 00000000000..de8d0b294a4
--- /dev/null
+++ b/src/script/components/RichTextEditor/utils/generateNodes.ts
@@ -0,0 +1,44 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MentionEntity} from '../../../message/MentionEntity';
+
+const intoPairs = (xs: number[]) => xs.slice(1).map((x, index) => [xs[index], x]);
+
+const breakAt = (places: number[], str: string) =>
+  intoPairs([0, ...places, str.length]).map(([a, b]) => str.substring(a, b));
+
+const breakWhere = (words: MentionEntity[], str: string) =>
+  breakAt(
+    words.reduce(
+      (accumulator: number[], {startIndex, length}) => [...accumulator, startIndex, startIndex + length],
+      [],
+    ),
+    str,
+  );
+
+export const createNodes = (mentions: MentionEntity[], str: string) => {
+  const sortedMentions = mentions.slice(0).sort(({startIndex: o1}, {startIndex: o2}) => o1 - o2);
+
+  return breakWhere(sortedMentions, str)
+    .map((string: string, index: number) =>
+      index % 2 == 0 ? {data: string, type: 'text'} : {data: string, type: 'Mention'},
+    )
+    .filter(({data}) => data.length > 0);
+};
diff --git a/src/script/components/RichTextEditor/utils/getDomRangeRect.ts b/src/script/components/RichTextEditor/utils/getDomRangeRect.ts
new file mode 100644
index 00000000000..2f9591e869f
--- /dev/null
+++ b/src/script/components/RichTextEditor/utils/getDomRangeRect.ts
@@ -0,0 +1,36 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export const getDOMRangeRect = (nativeSelection: Selection, rootElement: HTMLElement): DOMRect => {
+  const domRange = nativeSelection.getRangeAt(0);
+
+  let rect;
+
+  if (nativeSelection.anchorNode === rootElement) {
+    let inner = rootElement;
+    while (inner.firstElementChild != null) {
+      inner = inner.firstElementChild as HTMLElement;
+    }
+    rect = inner.getBoundingClientRect();
+  } else {
+    rect = domRange.getBoundingClientRect();
+  }
+
+  return rect;
+};
diff --git a/src/script/components/RichTextEditor/utils/getSelectionInfo.ts b/src/script/components/RichTextEditor/utils/getSelectionInfo.ts
new file mode 100644
index 00000000000..cb6c487141b
--- /dev/null
+++ b/src/script/components/RichTextEditor/utils/getSelectionInfo.ts
@@ -0,0 +1,107 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {$getSelection, $isRangeSelection, $isTextNode, LexicalNode, RangeSelection} from 'lexical';
+
+export const LENGTH_LIMIT = 75;
+
+const PUNCTUATION = '\\.,\\*\\?\\$\\|#{}\\(\\)\\^\\[\\]\\\\/!%\'"~=<>_:;\\s';
+
+const VALID_CHARS = (triggers: string[]) => `(?!${triggers.join('|')})[^${PUNCTUATION}]`;
+
+export function getNextSibling(node: LexicalNode) {
+  let nextSibling = node.getNextSibling();
+
+  while (nextSibling !== null && nextSibling.getType() === 'zeroWidth') {
+    nextSibling = nextSibling.getNextSibling();
+  }
+
+  return nextSibling;
+}
+
+export function getPreviousSibling(node: LexicalNode) {
+  let previousSibling = node.getPreviousSibling();
+
+  while (previousSibling !== null && previousSibling.getType() === 'zeroWidth') {
+    previousSibling = previousSibling.getPreviousSibling();
+  }
+
+  return previousSibling;
+}
+
+function isWordChar(char: string, triggers: string[]) {
+  return new RegExp(VALID_CHARS(triggers)).test(char);
+}
+
+type SelectionInfo = {
+  node: LexicalNode;
+  offset: number;
+  isTextNode: boolean;
+  textContent: string;
+  selection: RangeSelection;
+  prevNode: LexicalNode | null;
+  nextNode: LexicalNode | null;
+  cursorAtStartOfNode: boolean;
+  cursorAtEndOfNode: boolean;
+  wordCharBeforeCursor: boolean;
+  wordCharAfterCursor: boolean;
+};
+
+export function getSelectionInfo(triggers: string[]): SelectionInfo | undefined {
+  const selection = $getSelection();
+
+  if (!selection || !$isRangeSelection(selection)) {
+    return undefined;
+  }
+
+  const anchor = selection.anchor;
+  const focus = selection.focus;
+  const nodes = selection.getNodes();
+
+  if (anchor.key !== focus.key || anchor.offset !== focus.offset || nodes.length === 0) {
+    return undefined;
+  }
+
+  const [node] = nodes;
+  const isTextNode = $isTextNode(node) && node.isSimpleText();
+  const offset = anchor.type === 'text' ? anchor.offset : 0;
+  const textContent = node.getTextContent();
+  const cursorAtStartOfNode = offset === 0;
+  const cursorAtEndOfNode = textContent.length === offset;
+  const charBeforeCursor = textContent.charAt(offset - 1);
+  const charAfterCursor = textContent.charAt(offset);
+  const wordCharBeforeCursor = isWordChar(charBeforeCursor, triggers);
+  const wordCharAfterCursor = isWordChar(charAfterCursor, triggers);
+  const prevNode = getPreviousSibling(node);
+  const nextNode = getNextSibling(node);
+
+  return {
+    node,
+    offset,
+    isTextNode,
+    textContent,
+    selection,
+    prevNode,
+    nextNode,
+    cursorAtStartOfNode,
+    cursorAtEndOfNode,
+    wordCharBeforeCursor,
+    wordCharAfterCursor,
+  };
+}
diff --git a/src/script/components/RichTextEditor/utils/messageToEditorNodes.ts b/src/script/components/RichTextEditor/utils/messageToEditorNodes.ts
new file mode 100644
index 00000000000..1ef110926e0
--- /dev/null
+++ b/src/script/components/RichTextEditor/utils/messageToEditorNodes.ts
@@ -0,0 +1,45 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {$createParagraphNode, $createTextNode} from 'lexical';
+
+import {ContentMessage} from 'src/script/entity/message/ContentMessage';
+
+import {createNodes} from './generateNodes';
+
+import {Text} from '../../../entity/message/Text';
+import {$createMentionNode} from '../nodes/MentionNode';
+
+export function toEditorNodes(message: ContentMessage) {
+  const firstAsset = message.getFirstAsset() as Text;
+  const newMentions = firstAsset.mentions().slice();
+  const nodes = createNodes(newMentions, firstAsset.text);
+
+  const paragraphs = nodes.map(node => {
+    if (node.type === 'Mention') {
+      return $createMentionNode('@', node.data.slice(1));
+    }
+
+    return $createTextNode(node.data);
+  });
+
+  const paragraphNode = $createParagraphNode();
+  paragraphNode.append(...paragraphs);
+  return paragraphNode;
+}
diff --git a/src/script/components/SearchInput.tsx b/src/script/components/SearchInput.tsx
index 9836f81dd8b..50d50acdf6f 100644
--- a/src/script/components/SearchInput.tsx
+++ b/src/script/components/SearchInput.tsx
@@ -29,7 +29,7 @@ import {Icon} from './Icon';
 import type {User} from '../entity/User';
 import {MAX_HANDLE_LENGTH} from '../user/UserHandleGenerator';
 
-export interface SearchInputProps {
+interface SearchInputProps {
   onEnter?: (event: React.KeyboardEvent<HTMLInputElement>) => void | Promise<void>;
   /** Will force the component to have a dark theme and not follow user's theme */
   forceDark?: boolean;
@@ -40,7 +40,7 @@ export interface SearchInputProps {
   setSelectedUsers?: (users: User[]) => void;
 }
 
-const SearchInput: React.FC<SearchInputProps> = ({
+export const SearchInput: React.FC<SearchInputProps> = ({
   onEnter,
   input,
   selectedUsers = [],
@@ -115,5 +115,3 @@ const SearchInput: React.FC<SearchInputProps> = ({
     </form>
   );
 };
-
-export {SearchInput};
diff --git a/src/script/components/TitleBar/TitleBar.test.tsx b/src/script/components/TitleBar/TitleBar.test.tsx
index 6101d91899e..05d84c3567f 100644
--- a/src/script/components/TitleBar/TitleBar.test.tsx
+++ b/src/script/components/TitleBar/TitleBar.test.tsx
@@ -38,7 +38,6 @@ import {Conversation} from '../../entity/Conversation';
 import {User} from '../../entity/User';
 import {PanelState} from '../../page/RightSidebar/RightSidebar';
 import {TeamState} from '../../team/TeamState';
-import {UserState} from '../../user/UserState';
 import {ViewModelRepositories} from '../../view_model/MainViewModel';
 
 jest.mock('@wireapp/react-ui-kit', () => ({
@@ -85,7 +84,7 @@ const getDefaultProps = (callingRepository: CallingRepository, conversation: Con
     } as CallingRepository,
   } as ViewModelRepositories,
   teamState: new TeamState(),
-  userState: new UserState(),
+  selfUser: new User(),
 });
 
 describe('TitleBar', () => {
@@ -101,22 +100,22 @@ describe('TitleBar', () => {
   });
 
   it("doesn't show conversation search button for user with activated account", async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => false)});
+    const selfUser = createUser(false);
     const conversation = new Conversation();
 
     const {queryByText} = render(
-      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
     );
 
     expect(queryByText('tooltipConversationSearch')).toBeNull();
   });
 
   it('opens search area after search button click', async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const conversation = new Conversation();
 
     const {getByText} = render(
-      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
     );
 
     const searchButton = getByText('tooltipConversationSearch');
@@ -128,13 +127,13 @@ describe('TitleBar', () => {
   });
 
   it('opens conversation details on conversation name click', async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const displayName = 'test name';
     const conversation = createConversationEntity({
       display_name: ko.pureComputed(() => displayName),
     });
     const props = getDefaultProps(callingRepository, conversation);
-    const {getByText} = render(withTheme(<TitleBar {...props} userState={userState} />));
+    const {getByText} = render(withTheme(<TitleBar {...props} selfUser={selfUser} />));
 
     const conversationName = getByText(displayName);
     expect(conversationName).toBeDefined();
@@ -144,13 +143,13 @@ describe('TitleBar', () => {
   });
 
   it('opens conversation details on info button click', async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const conversation = createConversationEntity();
     const props = getDefaultProps(callingRepository, conversation);
 
     mockedUiKit.useMatchMedia.mockReturnValue(false);
 
-    const {getByLabelText} = render(withTheme(<TitleBar {...props} userState={userState} />));
+    const {getByLabelText} = render(withTheme(<TitleBar {...props} selfUser={selfUser} />));
 
     const infoButton = getByLabelText('tooltipConversationInfo');
     expect(infoButton).toBeDefined();
@@ -172,11 +171,11 @@ describe('TitleBar', () => {
   });
 
   it("doesn't show legal-hold icon for non legal-hold user", async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const conversation = createConversationEntity({hasLegalHold: ko.pureComputed(() => false)});
 
     const {container} = render(
-      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
     );
 
     const legalHoldDotButton = container.querySelector('button[data-uie-name="status-legal-hold-conversation"]');
@@ -184,11 +183,11 @@ describe('TitleBar', () => {
   });
 
   it('shows legal-hold icon for legal-hold user', async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const conversation = createConversationEntity({hasLegalHold: ko.pureComputed(() => true)});
 
     const {container} = render(
-      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
     );
 
     const legalHoldDotButton = container.querySelector('button[data-uie-name="status-legal-hold-conversation"]');
@@ -198,13 +197,13 @@ describe('TitleBar', () => {
   it.each([ConversationVerificationState.UNVERIFIED, ConversationVerificationState.DEGRADED])(
     "doesn't show verified icon in not-verified conversation",
     async state => {
-      const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+      const selfUser = createUser(true);
       const conversation = createConversationEntity({
         verification_state: ko.observable<ConversationVerificationState>(state),
       });
 
       const {container} = render(
-        withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+        withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
       );
 
       const verifiedIcon = container.querySelector('[data-uie-name="conversation-title-bar-verified-icon"]');
@@ -213,13 +212,13 @@ describe('TitleBar', () => {
   );
 
   it('shows verified icon in verified conversation', async () => {
-    const userState = createUserState({isActivatedAccount: ko.pureComputed(() => true)});
+    const selfUser = createUser(true);
     const conversation = createConversationEntity({
       verification_state: ko.observable<ConversationVerificationState>(ConversationVerificationState.VERIFIED),
     });
 
     const {container} = render(
-      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} userState={userState} />),
+      withTheme(<TitleBar {...getDefaultProps(callingRepository, conversation)} selfUser={selfUser} />),
     );
 
     const verifiedIcon = container.querySelector('[data-uie-name="conversation-title-bar-verified-icon"]');
@@ -302,9 +301,10 @@ describe('TitleBar', () => {
   });
 });
 
-function createUserState(user?: Partial<UserState>) {
-  const userState = new UserState();
-  return Object.assign(userState, user) as UserState;
+function createUser(activated: boolean = true) {
+  const user = new User();
+  user.isTemporaryGuest(!activated);
+  return user;
 }
 
 function createTeamState(team?: Partial<TeamState>) {
diff --git a/src/script/components/TitleBar/TitleBar.tsx b/src/script/components/TitleBar/TitleBar.tsx
index a4c3e82d351..6517bfcddcf 100644
--- a/src/script/components/TitleBar/TitleBar.tsx
+++ b/src/script/components/TitleBar/TitleBar.tsx
@@ -30,6 +30,7 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 import {useCallAlertState} from 'Components/calling/useCallAlertState';
 import {Icon} from 'Components/Icon';
 import {LegalHoldDot} from 'Components/LegalHoldDot';
+import {User} from 'src/script/entity/User';
 import {useAppMainState, ViewType} from 'src/script/page/state';
 import {ContentState} from 'src/script/page/useAppState';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
@@ -47,7 +48,6 @@ import {PanelState} from '../../page/RightSidebar/RightSidebar';
 import {TeamState} from '../../team/TeamState';
 import {Shortcut} from '../../ui/Shortcut';
 import {ShortcutType} from '../../ui/ShortcutType';
-import {UserState} from '../../user/UserState';
 import {CallActions} from '../../view_model/CallingViewModel';
 import {ViewModelRepositories} from '../../view_model/MainViewModel';
 
@@ -56,7 +56,7 @@ export interface TitleBarProps {
   conversation: Conversation;
   openRightSidebar: (panelState: PanelState, params: RightSidebarParams, compareEntityId?: boolean) => void;
   repositories: ViewModelRepositories;
-  userState: UserState;
+  selfUser: User;
   teamState: TeamState;
   isRightSidebarOpen?: boolean;
   callState?: CallState;
@@ -66,9 +66,9 @@ export const TitleBar: React.FC<TitleBarProps> = ({
   repositories,
   conversation,
   callActions,
+  selfUser,
   openRightSidebar,
   isRightSidebarOpen = false,
-  userState = container.resolve(UserState),
   callState = container.resolve(CallState),
   teamState = container.resolve(TeamState),
 }) => {
@@ -101,7 +101,7 @@ export const TitleBar: React.FC<TitleBarProps> = ({
     'verification_state',
   ]);
 
-  const {isActivatedAccount} = useKoSubscribableChildren(userState, ['isActivatedAccount']);
+  const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']);
   const {joinedCall, activeCalls} = useKoSubscribableChildren(callState, ['joinedCall', 'activeCalls']);
   const {isVideoCallingEnabled} = useKoSubscribableChildren(teamState, ['isVideoCallingEnabled']);
 
diff --git a/src/script/components/UserDevices.tsx b/src/script/components/UserDevices.tsx
index 65e051dfb01..0bba4ee02e2 100644
--- a/src/script/components/UserDevices.tsx
+++ b/src/script/components/UserDevices.tsx
@@ -70,7 +70,7 @@ export const useUserDevicesHistory = () => {
   };
 };
 
-export const sortUserDevices = (devices: ClientEntity[]): ClientEntity[] => {
+const sortUserDevices = (devices: ClientEntity[]): ClientEntity[] => {
   const [legalholdDevices, otherDevices] = partition(
     devices,
     device => device.class === ClientClassification.LEGAL_HOLD,
diff --git a/src/script/components/UserList/UserList.test.tsx b/src/script/components/UserList/UserList.test.tsx
index 72ba1a816ea..37d978547c5 100644
--- a/src/script/components/UserList/UserList.test.tsx
+++ b/src/script/components/UserList/UserList.test.tsx
@@ -27,7 +27,6 @@ import {User} from 'src/script/entity/User';
 import {TestFactory} from '../../../../test/helper/TestFactory';
 import {withTheme} from '../../auth/util/test/TestUtil';
 import {ConversationRepository} from '../../conversation/ConversationRepository';
-import {UserState} from '../../user/UserState';
 
 const testFactory = new TestFactory();
 let conversationRepository: ConversationRepository;
@@ -41,17 +40,14 @@ beforeAll(() => {
 
 describe('UserList', () => {
   it('lists all selected users', () => {
-    const userState = new UserState();
     const user = new User('test-id');
     user.isMe = true;
 
-    userState.users([user]);
-
     const users = ['1', '2', '3', '4'].map(id => new User(id));
     const props = {
       conversationRepository,
       onSelectUser: (user: User) => jest.fn(),
-      userState,
+      selfUser: user,
       selectedUsers: users,
       users,
       isSelectable: true,
@@ -63,12 +59,9 @@ describe('UserList', () => {
   });
 
   it('select user', async () => {
-    const userState = new UserState();
     const user = new User('test-id');
     user.isMe = true;
 
-    userState.users([user]);
-
     const setStateMock = jest.fn();
     const useStateMock: any = (useState: any) => [useState, setStateMock];
     jest.spyOn(React, 'useState').mockImplementation(useStateMock);
@@ -81,7 +74,7 @@ describe('UserList', () => {
     const props = {
       conversationRepository,
       onSelectUser: mockOnSelectUser,
-      userState,
+      selfUser: user,
       selectedUsers,
       users,
       isSelectable: true,
diff --git a/src/script/components/UserList/UserList.tsx b/src/script/components/UserList/UserList.tsx
index 9722c3b9bcb..8702c21ffc0 100644
--- a/src/script/components/UserList/UserList.tsx
+++ b/src/script/components/UserList/UserList.tsx
@@ -35,7 +35,6 @@ import {ConversationState} from '../../conversation/ConversationState';
 import type {Conversation} from '../../entity/Conversation';
 import type {User} from '../../entity/User';
 import {TeamState} from '../../team/TeamState';
-import {UserState} from '../../user/UserState';
 import {InViewport} from '../utils/InViewport';
 
 export enum UserlistMode {
@@ -70,8 +69,8 @@ export interface UserListProps {
   teamState?: TeamState;
   truncate?: boolean;
   users: User[];
-  userState?: UserState;
   isSelectable?: boolean;
+  selfUser: User;
 }
 
 export const UserList = ({
@@ -90,10 +89,10 @@ export const UserList = ({
   showEmptyAdmin = false,
   noSelfInteraction = false,
   showArrow = false,
-  userState = container.resolve(UserState),
   teamState = container.resolve(TeamState),
   isSelectable = false,
   onSelectUser,
+  selfUser,
 }: UserListProps) => {
   const [maxShownUsers, setMaxShownUsers] = useState(USER_CHUNK_SIZE);
 
@@ -102,9 +101,10 @@ export const UserList = ({
   const hasMoreUsers = !truncate && users.length > maxShownUsers;
 
   const highlightedUserIds = highlightedUsers.map(user => user.id);
-  const selfInTeam = userState.self().inTeam();
-  const {self} = useKoSubscribableChildren(userState, ['self']);
-  const {is_verified: isSelfVerified} = useKoSubscribableChildren(self, ['is_verified']);
+  const {is_verified: isSelfVerified, inTeam: selfInTeam} = useKoSubscribableChildren(selfUser, [
+    'is_verified',
+    'inTeam',
+  ]);
 
   // subscribe to roles changes in order to react to them
   useKoSubscribableChildren(conversation, ['roles']);
diff --git a/src/script/components/UserList/components/UserListItem/UserListItem.tsx b/src/script/components/UserList/components/UserListItem/UserListItem.tsx
index fc9d7cecbde..8c45759bc28 100644
--- a/src/script/components/UserList/components/UserListItem/UserListItem.tsx
+++ b/src/script/components/UserList/components/UserListItem/UserListItem.tsx
@@ -28,6 +28,7 @@ import {ParticipantItemContent} from 'Components/ParticipantItemContent';
 import {listItem, listWrapper} from 'Components/ParticipantItemContent/ParticipantItem.styles';
 import {UserStatusBadges} from 'Components/UserBadges';
 import {UserlistMode} from 'Components/UserList';
+import {useUserName} from 'Components/UserName';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 import {capitalizeFirstChar} from 'Util/StringUtil';
@@ -75,7 +76,6 @@ const UserListItem = ({
     isDirectGuest,
     availability,
     expirationText,
-    name,
   } = useKoSubscribableChildren(user, ['isDirectGuest', 'is_verified', 'availability', 'expirationText', 'name']);
 
   const {isMe: isSelf, isFederated} = user;
@@ -87,7 +87,7 @@ const UserListItem = ({
 
   const selfString = `(${capitalizeFirstChar(t('conversationYouNominative'))})`;
 
-  const userName = isAvailable ? name : t('unavailableUser');
+  const userName = useUserName(user);
 
   const getContentInfoText = () => {
     if (customInfo) {
diff --git a/src/script/components/UserName.tsx b/src/script/components/UserName.tsx
new file mode 100644
index 00000000000..6940bd9e497
--- /dev/null
+++ b/src/script/components/UserName.tsx
@@ -0,0 +1,43 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {t} from 'Util/LocalizerUtil';
+
+import {User} from '../entity/User';
+
+interface UserNameProps {
+  user: User;
+}
+
+/**
+ * will return the name of the user, if available, otherwise a string indicating that the user is unavailable
+ * @param user the user to get the name for
+ */
+export function useUserName(user: User) {
+  const {isAvailable, name} = useKoSubscribableChildren(user, ['isAvailable', 'name']);
+  return isAvailable ? name : t('unavailableUser');
+}
+
+/**
+ * component that will display the username, if available, otherwise a string indicating that the user is unavailable
+ */
+export function UserName({user}: UserNameProps) {
+  return useUserName(user);
+}
diff --git a/src/script/components/UserSearchableList.tsx b/src/script/components/UserSearchableList.tsx
index 39911871bdb..71872f4e656 100644
--- a/src/script/components/UserSearchableList.tsx
+++ b/src/script/components/UserSearchableList.tsx
@@ -37,7 +37,6 @@ import {SearchRepository} from '../search/SearchRepository';
 import type {TeamRepository} from '../team/TeamRepository';
 import {TeamState} from '../team/TeamState';
 import {validateHandle} from '../user/UserHandleGenerator';
-import {UserState} from '../user/UserState';
 
 export type UserListProps = React.ComponentProps<typeof UserList> & {
   conversationState?: ConversationState;
@@ -51,7 +50,7 @@ export type UserListProps = React.ComponentProps<typeof UserList> & {
   teamRepository: TeamRepository;
   teamState?: TeamState;
   truncate?: boolean;
-  userState?: UserState;
+  selfUser: User;
   dataUieName?: string;
   /** will prevent showing those users in the list */
   excludeUsers?: QualifiedId[];
@@ -66,16 +65,16 @@ const UserSearchableList: React.FC<UserListProps> = ({
   highlightedUsers,
   selected: selectedUsers,
   allowRemoteSearch,
+  selfUser,
   users,
   ...props
 }) => {
   const {searchRepository, teamRepository, selfFirst, ...userListProps} = props;
-  const {userState = container.resolve(UserState), conversationState = container.resolve(ConversationState)} = props;
+  const {conversationState = container.resolve(ConversationState)} = props;
 
   const [filteredUsers, setFilteredUsers] = useState<User[]>([]);
   const [remoteTeamMembers, setRemoteTeamMembers] = useState<User[]>([]);
 
-  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
   const {inTeam: selfInTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
 
   /**
@@ -176,6 +175,7 @@ const UserSearchableList: React.FC<UserListProps> = ({
           selectedUsers={selectedUsers}
           highlightedUsers={highlightedUsers}
           onSelectUser={toggleUserSelection}
+          selfUser={selfUser}
         />
       )}
     </div>
diff --git a/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.styles.ts b/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.styles.ts
index 484f1e3686b..b762c4a16e7 100644
--- a/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.styles.ts
+++ b/src/script/components/calling/CallParticipantsListItem/CallParticipantItemContent/CallParticipantItemContent.styles.ts
@@ -19,16 +19,6 @@
 
 import {CSSObject} from '@emotion/react';
 
-export const listItem = (noInteraction = false): CSSObject => ({
-  display: 'flex',
-  overflow: 'hidden',
-  height: '56px',
-  alignItems: 'center',
-  paddingRight: '16px',
-  margin: '0',
-  cursor: noInteraction ? 'default' : 'pointer',
-});
-
 export const chevronIcon: CSSObject = {
   border: 'none',
   background: 'none',
diff --git a/src/script/components/calling/CallingCell.test.tsx b/src/script/components/calling/CallingCell.test.tsx
index c011d0014e2..0e7056b7026 100644
--- a/src/script/components/calling/CallingCell.test.tsx
+++ b/src/script/components/calling/CallingCell.test.tsx
@@ -47,7 +47,7 @@ const createCall = (state: CALL_STATE, selfUser = new User(createUuid()), selfCl
   const selfParticipant = new Participant(selfUser, selfClientId);
   const call = new Call({domain: '', id: ''}, {domain: '', id: ''}, 0, selfParticipant, CALL_TYPE.NORMAL, {
     currentAvailableDeviceId: {
-      audioOutput: ko.pureComputed(() => 'test'),
+      audiooutput: ko.pureComputed(() => 'test'),
     },
   } as MediaDevicesHandler);
   call.state(state);
diff --git a/src/script/components/calling/CallingCell.tsx b/src/script/components/calling/CallingCell.tsx
index 6466ca00332..89a5a12f278 100644
--- a/src/script/components/calling/CallingCell.tsx
+++ b/src/script/components/calling/CallingCell.tsx
@@ -32,7 +32,7 @@ import {GroupVideoGrid} from 'Components/calling/GroupVideoGrid';
 import {useCallAlertState} from 'Components/calling/useCallAlertState';
 import {FadingScrollbar} from 'Components/FadingScrollbar';
 import {Icon} from 'Components/Icon';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {ConversationClassifiedBar} from 'Components/input/ClassifiedBar';
 import {useAppMainState, ViewType} from 'src/script/page/state';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {isEnterKey, KEY} from 'Util/KeyboardUtil';
@@ -106,14 +106,12 @@ const CallingCell: React.FC<CallingCellProps> = ({
   const {
     isGroup,
     participating_user_ets: userEts,
-    allUserEntities: allUsers,
     selfUser,
     display_name: conversationName,
     roles,
   } = useKoSubscribableChildren(conversation, [
     'isGroup',
     'participating_user_ets',
-    'allUserEntities',
     'selfUser',
     'display_name',
     'roles',
@@ -448,11 +446,7 @@ const CallingCell: React.FC<CallingCellProps> = ({
           )}
 
           {classifiedDomains && (
-            <ClassifiedBar
-              conversationDomain={conversation.domain}
-              users={allUsers}
-              classifiedDomains={classifiedDomains}
-            />
+            <ConversationClassifiedBar conversation={conversation} classifiedDomains={classifiedDomains} />
           )}
 
           {!isDeclined && (
diff --git a/src/script/components/calling/CallingOverlayContainer.tsx b/src/script/components/calling/CallingOverlayContainer.tsx
index aae5cd04422..5325f069870 100644
--- a/src/script/components/calling/CallingOverlayContainer.tsx
+++ b/src/script/components/calling/CallingOverlayContainer.tsx
@@ -114,12 +114,12 @@ const CallingContainer: React.FC<CallingContainerProps> = ({
   };
 
   const switchCameraInput = (call: Call, deviceId: string) => {
-    mediaDevicesHandler.currentDeviceId.videoInput(deviceId);
+    mediaDevicesHandler.currentDeviceId.videoinput(deviceId);
     callingRepository.refreshVideoInput();
   };
 
   const switchMicrophoneInput = (call: Call, deviceId: string) => {
-    mediaDevicesHandler.currentDeviceId.audioInput(deviceId);
+    mediaDevicesHandler.currentDeviceId.audioinput(deviceId);
     callingRepository.refreshAudioInput();
   };
 
@@ -134,7 +134,7 @@ const CallingContainer: React.FC<CallingContainerProps> = ({
     const showScreenSelection = (): Promise<void> => {
       return new Promise(resolve => {
         callingRepository.onChooseScreen = (deviceId: string): void => {
-          mediaDevicesHandler.currentDeviceId.screenInput(deviceId);
+          mediaDevicesHandler.currentDeviceId.screeninput(deviceId);
           callState.selectableScreens([]);
           callState.selectableWindows([]);
           resolve();
diff --git a/src/script/components/calling/FullscreenVideoCall.tsx b/src/script/components/calling/FullscreenVideoCall.tsx
index d4d41e025f3..dba48391c1f 100644
--- a/src/script/components/calling/FullscreenVideoCall.tsx
+++ b/src/script/components/calling/FullscreenVideoCall.tsx
@@ -28,7 +28,8 @@ import {IconButton, IconButtonVariant, useMatchMedia} from '@wireapp/react-ui-ki
 
 import {useCallAlertState} from 'Components/calling/useCallAlertState';
 import {Icon} from 'Components/Icon';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {ConversationClassifiedBar} from 'Components/input/ClassifiedBar';
+import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {KEY} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
@@ -52,7 +53,7 @@ import {MuteState} from '../../calling/CallState';
 import type {Participant} from '../../calling/Participant';
 import type {Grid} from '../../calling/videoGridHandler';
 import type {Conversation} from '../../entity/Conversation';
-import {DeviceTypes, ElectronDesktopCapturerSource, MediaDevicesHandler} from '../../media/MediaDevicesHandler';
+import {ElectronDesktopCapturerSource, MediaDevicesHandler} from '../../media/MediaDevicesHandler';
 import type {Multitasking} from '../../notification/NotificationRepository';
 import {useAppState} from '../../page/useAppState';
 import {TeamState} from '../../team/TeamState';
@@ -118,44 +119,44 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
     startedAt,
     participants,
   } = useKoSubscribableChildren(call, ['activeSpeakers', 'currentPage', 'pages', 'startedAt', 'participants']);
-  const {display_name: conversationName, allUserEntities: allUsers} = useKoSubscribableChildren(conversation, [
-    'display_name',
-    'allUserEntities',
-  ]);
+  const {display_name: conversationName} = useKoSubscribableChildren(conversation, ['display_name']);
   const {isVideoCallingEnabled, classifiedDomains} = useKoSubscribableChildren(teamState, [
     'isVideoCallingEnabled',
     'classifiedDomains',
   ]);
 
-  const {videoInput: currentCameraDevice} = useKoSubscribableChildren(mediaDevicesHandler.currentDeviceId, [
-    DeviceTypes.VIDEO_INPUT,
+  const {[MediaDeviceType.VIDEO_INPUT]: currentCameraDevice, [MediaDeviceType.AUDIO_INPUT]: currentMicrophoneDevice} =
+    useKoSubscribableChildren(mediaDevicesHandler.currentDeviceId, [
+      MediaDeviceType.VIDEO_INPUT,
+      MediaDeviceType.AUDIO_INPUT,
+    ]);
+
+  const {videoinput, audioinput} = useKoSubscribableChildren(mediaDevicesHandler.availableDevices, [
+    MediaDeviceType.VIDEO_INPUT,
+    MediaDeviceType.AUDIO_INPUT,
   ]);
 
   const minimize = () => multitasking.isMinimized(true);
-  const {videoInput} = useKoSubscribableChildren(mediaDevicesHandler.availableDevices, [DeviceTypes.VIDEO_INPUT]);
+
   const showToggleVideo =
     isVideoCallingEnabled &&
     (call.initialType === CALL_TYPE.VIDEO ||
       conversation.supportsVideoCall(call.conversationType === CONV_TYPE.CONFERENCE));
   const availableCameras = useMemo(
     () =>
-      videoInput.map(device => (device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id),
-    [videoInput],
+      videoinput.map(device => (device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id),
+    [videoinput],
   );
   const showSwitchCamera = availableCameras.length > 1;
 
-  const {audioInput: currentMicrophoneDevice} = useKoSubscribableChildren(mediaDevicesHandler.currentDeviceId, [
-    DeviceTypes.AUDIO_INPUT,
-  ]);
-  const {audioInput} = useKoSubscribableChildren(mediaDevicesHandler.availableDevices, [DeviceTypes.AUDIO_INPUT]);
   const availableMicrophones = useMemo(
     () =>
-      audioInput.map(device => (device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id),
-    [audioInput],
+      audioinput.map(device => (device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id),
+    [audioinput],
   );
   const showSwitchMicrophone = availableMicrophones.length > 1;
 
-  const {unreadMessagesCount} = useAppState();
+  const unreadMessagesCount = useAppState(state => state.unreadMessagesCount);
   const hasUnreadMessages = unreadMessagesCount > 0;
 
   const {showAlert, isGroupCall, clearShowAlert} = useCallAlertState();
@@ -256,9 +257,8 @@ const FullscreenVideoCall: React.FC<FullscreenVideoCallProps> = ({
           setMaximizedParticipant={participant => setMaximizedParticipant(call, participant)}
         />
         {classifiedDomains && (
-          <ClassifiedBar
-            conversationDomain={conversation.domain}
-            users={allUsers}
+          <ConversationClassifiedBar
+            conversation={conversation}
             classifiedDomains={classifiedDomains}
             style={{
               ...classifiedBarStyles,
diff --git a/src/script/components/calling/fullscreenVideoCall.test.tsx b/src/script/components/calling/fullscreenVideoCall.test.tsx
index 97bd9135173..e4ace23696e 100644
--- a/src/script/components/calling/fullscreenVideoCall.test.tsx
+++ b/src/script/components/calling/fullscreenVideoCall.test.tsx
@@ -47,7 +47,7 @@ describe('fullscreenVideoCall', () => {
     selfUser.isMe = true;
     const call = new Call({domain: '', id: ''}, {domain: '', id: ''}, 0, new Participant(selfUser, ''), 0, {
       currentAvailableDeviceId: {
-        audioOutput: ko.pureComputed(() => 'test'),
+        audiooutput: ko.pureComputed(() => 'test'),
       },
     } as MediaDevicesHandler);
     const props: Partial<FullscreenVideoCallProps> = {
@@ -58,14 +58,14 @@ describe('fullscreenVideoCall', () => {
       isMuted: false,
       mediaDevicesHandler: {
         availableDevices: {
-          audioInput: ko.observableArray(),
-          videoInput: ko.observableArray(),
+          audioinput: ko.observableArray(),
+          videoinput: ko.observableArray(),
         },
         currentDeviceId: {
-          audioInput: ko.observable(''),
-          audioOutput: ko.observable(''),
-          screenInput: ko.observable(''),
-          videoInput: ko.observable(''),
+          audioinput: ko.observable(''),
+          audiooutput: ko.observable(''),
+          screeninput: ko.observable(''),
+          videoinput: ko.observable(''),
         },
       } as MediaDevicesHandler,
       multitasking: {isMinimized: ko.observable(false)},
diff --git a/src/script/components/input/ClassifiedBar.test.tsx b/src/script/components/input/ClassifiedBar.test.tsx
index 0529666b73b..b0ee12772a8 100644
--- a/src/script/components/input/ClassifiedBar.test.tsx
+++ b/src/script/components/input/ClassifiedBar.test.tsx
@@ -19,19 +19,22 @@
 
 import {render} from '@testing-library/react';
 
+import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
 import {createUuid} from 'Util/uuid';
 
-import {ClassifiedBar} from './ClassifiedBar';
+import {ConversationClassifiedBar} from './ClassifiedBar';
 
 describe('ClassifiedBar', () => {
+  const conversation = new Conversation();
   const classifiedDomains = ['same.domain', 'classified.domain', 'other-classified.domain'];
   const sameDomainUser = new User(createUuid(), 'same.domain');
   const classifiedDomainUser = new User(createUuid(), 'classified.domain');
   const otherDomainUser = new User(createUuid(), 'other.domain');
 
   it.each([[[sameDomainUser]], [[sameDomainUser, otherDomainUser]]])('is empty if no domains are given', users => {
-    const {container} = render(<ClassifiedBar users={users} conversationDomain="test" />);
+    conversation.participating_user_ets(users);
+    const {container} = render(<ConversationClassifiedBar conversation={conversation} conversationDomain="test" />);
 
     expect(container.querySelector('[data-uie-name=classified-label]')).toBe(null);
   });
@@ -39,10 +42,11 @@ describe('ClassifiedBar', () => {
   it.each([[[sameDomainUser]], [[classifiedDomainUser]], [[sameDomainUser, classifiedDomainUser]]])(
     'returns classified if all users in the classified domains',
     users => {
+      conversation.participating_user_ets(users);
       const {getByText, queryByText} = render(
-        <ClassifiedBar
+        <ConversationClassifiedBar
           conversationDomain={classifiedDomainUser.domain}
-          users={users}
+          conversation={conversation}
           classifiedDomains={classifiedDomains}
         />,
       );
@@ -57,8 +61,13 @@ describe('ClassifiedBar', () => {
     [[classifiedDomainUser, otherDomainUser]],
     [[sameDomainUser, classifiedDomainUser, otherDomainUser]],
   ])('returns non-classified if a single user is from another domain', users => {
+    conversation.participating_user_ets(users);
     const {queryByText, getByText} = render(
-      <ClassifiedBar conversationDomain={classifiedDomains[0]} users={users} classifiedDomains={classifiedDomains} />,
+      <ConversationClassifiedBar
+        conversationDomain={classifiedDomains[0]}
+        conversation={conversation}
+        classifiedDomains={classifiedDomains}
+      />,
     );
 
     expect(queryByText('conversationClassified')).toBe(null);
diff --git a/src/script/components/input/ClassifiedBar.tsx b/src/script/components/input/ClassifiedBar.tsx
index 005e7f6f1a3..e0ac05f8dd7 100644
--- a/src/script/components/input/ClassifiedBar.tsx
+++ b/src/script/components/input/ClassifiedBar.tsx
@@ -23,7 +23,9 @@ import {CSSObject} from '@emotion/react';
 import cx from 'classnames';
 
 import {Icon} from 'Components/Icon';
+import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
 function isClassified(users: User[], classifiedDomains: string[], conversationDomain?: string): boolean {
@@ -41,11 +43,19 @@ function isClassified(users: User[], classifiedDomains: string[], conversationDo
 interface ClassifiedBarProps {
   classifiedDomains?: string[];
   style?: CSSObject;
-  users: User[];
   conversationDomain?: string;
 }
 
-const ClassifiedBar: React.FC<ClassifiedBarProps> = ({users, classifiedDomains, conversationDomain, style}) => {
+interface UserClassifiedBarProps extends ClassifiedBarProps {
+  users: User[];
+}
+
+export const UserClassifiedBar: React.FC<UserClassifiedBarProps> = ({
+  users,
+  conversationDomain,
+  classifiedDomains,
+  style,
+}) => {
   if (typeof classifiedDomains === 'undefined') {
     return null;
   }
@@ -65,4 +75,14 @@ const ClassifiedBar: React.FC<ClassifiedBarProps> = ({users, classifiedDomains,
   );
 };
 
-export {ClassifiedBar};
+interface ConversationClassifiedBarProps extends ClassifiedBarProps {
+  conversation: Conversation;
+}
+
+export const ConversationClassifiedBar: React.FC<ConversationClassifiedBarProps> = ({
+  conversation,
+  ...classifiedBarProps
+}) => {
+  const {allUserEntities: users} = useKoSubscribableChildren(conversation, ['allUserEntities']);
+  return <UserClassifiedBar users={users} conversationDomain={conversation.domain} {...classifiedBarProps} />;
+};
diff --git a/src/script/components/list/ConversationListCell.tsx b/src/script/components/list/ConversationListCell.tsx
index 8049b22166c..0ff7519368c 100644
--- a/src/script/components/list/ConversationListCell.tsx
+++ b/src/script/components/list/ConversationListCell.tsx
@@ -33,14 +33,14 @@ import {Availability} from '@wireapp/protocol-messaging';
 
 import {AvailabilityState} from 'Components/AvailabilityState';
 import {Avatar, AVATAR_SIZE, GroupAvatar} from 'Components/Avatar';
-import {Icon} from 'Components/Icon';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {isKey, isOneOfKeys, KEY} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 import {noop, setContextMenuPosition} from 'Util/util';
 
+import {ConversationListCellStatusIcon} from './ConversationListCellStatusIcon';
+
 import {generateCellState} from '../../conversation/ConversationCellState';
-import {ConversationStatusIcon} from '../../conversation/ConversationStatusIcon';
 import type {Conversation} from '../../entity/Conversation';
 import {MediaType} from '../../media/MediaType';
 
@@ -252,80 +252,7 @@ const ConversationListCell = ({
             onKeyDown={handleContextKeyDown}
           />
 
-          {!showJoinButton && (
-            <>
-              {cellState.icon === ConversationStatusIcon.PENDING_CONNECTION && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-light"
-                  data-uie-name="status-pending"
-                  title={t('accessibility.conversationStatusPending')}
-                >
-                  <Icon.Pending className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.UNREAD_MENTION && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-dark"
-                  data-uie-name="status-mention"
-                  title={t('accessibility.conversationStatusUnreadMention')}
-                >
-                  <Icon.Mention className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.UNREAD_REPLY && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-dark"
-                  data-uie-name="status-reply"
-                  title={t('accessibility.conversationStatusUnreadReply')}
-                  aria-label={t('accessibility.conversationStatusUnreadReply')}
-                >
-                  <Icon.Reply className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.UNREAD_PING && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-dark"
-                  data-uie-name="status-ping"
-                  title={t('accessibility.conversationStatusUnreadPing')}
-                >
-                  <Icon.Ping className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.MISSED_CALL && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-dark"
-                  data-uie-name="status-missed-call"
-                  title={t('accessibility.callStatusMissed')}
-                >
-                  <Icon.Hangup className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.MUTED && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-light conversation-muted"
-                  data-uie-name="status-silence"
-                  title={t('accessibility.conversationStatusMuted')}
-                >
-                  <Icon.Mute className="svg-icon" />
-                </span>
-              )}
-
-              {cellState.icon === ConversationStatusIcon.UNREAD_MESSAGES && unreadState.allMessages.length > 0 && (
-                <span
-                  className="conversation-list-cell-badge cell-badge-dark"
-                  data-uie-name="status-unread"
-                  title={t('accessibility.conversationStatusUnread')}
-                >
-                  {unreadState.allMessages.length}
-                </span>
-              )}
-            </>
-          )}
+          {!showJoinButton && <ConversationListCellStatusIcon conversation={conversation} />}
 
           {showJoinButton && (
             <button
diff --git a/src/script/components/list/ConversationListCellStatusIcon.tsx b/src/script/components/list/ConversationListCellStatusIcon.tsx
new file mode 100644
index 00000000000..dc14c02bfda
--- /dev/null
+++ b/src/script/components/list/ConversationListCellStatusIcon.tsx
@@ -0,0 +1,119 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useMemo} from 'react';
+
+import {Icon} from 'Components/Icon';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {t} from 'Util/LocalizerUtil';
+
+import {generateCellState} from '../../conversation/ConversationCellState';
+import {ConversationStatusIcon} from '../../conversation/ConversationStatusIcon';
+import type {Conversation} from '../../entity/Conversation';
+
+export interface ConversationListCellStatusIconProps {
+  conversation: Conversation;
+}
+
+const ConversationListCellStatusIcon = ({conversation}: ConversationListCellStatusIconProps) => {
+  const {unreadState, mutedState, isRequest} = useKoSubscribableChildren(conversation, [
+    'unreadState',
+    'mutedState',
+    'isRequest',
+  ]);
+
+  const cellState = useMemo(() => generateCellState(conversation), [unreadState, mutedState, isRequest]);
+
+  return (
+    <>
+      {cellState.icon === ConversationStatusIcon.PENDING_CONNECTION && (
+        <span
+          className="conversation-list-cell-badge cell-badge-light"
+          data-uie-name="status-pending"
+          title={t('accessibility.conversationStatusPending')}
+        >
+          <Icon.Pending className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.UNREAD_MENTION && (
+        <span
+          className="conversation-list-cell-badge cell-badge-dark"
+          data-uie-name="status-mention"
+          title={t('accessibility.conversationStatusUnreadMention')}
+        >
+          <Icon.Mention className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.UNREAD_REPLY && (
+        <span
+          className="conversation-list-cell-badge cell-badge-dark"
+          data-uie-name="status-reply"
+          title={t('accessibility.conversationStatusUnreadReply')}
+          aria-label={t('accessibility.conversationStatusUnreadReply')}
+        >
+          <Icon.Reply className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.UNREAD_PING && (
+        <span
+          className="conversation-list-cell-badge cell-badge-dark"
+          data-uie-name="status-ping"
+          title={t('accessibility.conversationStatusUnreadPing')}
+        >
+          <Icon.Ping className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.MISSED_CALL && (
+        <span
+          className="conversation-list-cell-badge cell-badge-dark"
+          data-uie-name="status-missed-call"
+          title={t('accessibility.callStatusMissed')}
+        >
+          <Icon.Hangup className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.MUTED && (
+        <span
+          className="conversation-list-cell-badge cell-badge-light conversation-muted"
+          data-uie-name="status-silence"
+          title={t('accessibility.conversationStatusMuted')}
+        >
+          <Icon.Mute className="svg-icon" />
+        </span>
+      )}
+
+      {cellState.icon === ConversationStatusIcon.UNREAD_MESSAGES && unreadState.allMessages.length > 0 && (
+        <span
+          className="conversation-list-cell-badge cell-badge-dark"
+          data-uie-name="status-unread"
+          title={t('accessibility.conversationStatusUnread')}
+        >
+          {unreadState.allMessages.length}
+        </span>
+      )}
+    </>
+  );
+};
+
+export {ConversationListCellStatusIcon};
diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx
index 0e793a7fccd..5d23672a3ce 100644
--- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx
+++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.test.tsx
@@ -19,8 +19,9 @@
 
 import {render} from '@testing-library/react';
 import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
+import {Ciphersuite} from '@wireapp/core/lib/messagingProtocols/mls';
 
-import {ConversationProtocolDetails, Ciphersuite} from './ConversationProtocolDetails';
+import {ConversationProtocolDetails} from './ConversationProtocolDetails';
 
 describe('ConversationProtocolDetails', () => {
   it('renders the correct infos for the conversation with mls protocol', () => {
diff --git a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx
index 6661c599595..92e5aaac6e1 100644
--- a/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx
+++ b/src/script/components/panel/ConversationProtocolDetails/ConversationProtocolDetails.tsx
@@ -21,40 +21,10 @@ import React from 'react';
 
 import {CSSObject} from '@emotion/react';
 import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
+import {Ciphersuite} from '@wireapp/core/lib/messagingProtocols/mls';
 
 import {t} from 'Util/LocalizerUtil';
 
-export enum Ciphersuite {
-  /**
-   * DH KEM x25519 | AES-GCM 128 | SHA2-256 | Ed25519
-   */
-  MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519,
-  /**
-   * DH KEM P256 | AES-GCM 128 | SHA2-256 | EcDSA P256
-   */
-  MLS_128_DHKEMP256_AES128GCM_SHA256_P256,
-  /**
-   * DH KEM x25519 | Chacha20Poly1305 | SHA2-256 | Ed25519
-   */
-  MLS_128_DHKEMX25519_CHACHA20POLY1305_SHA256_Ed25519,
-  /**
-   * DH KEM x448 | AES-GCM 256 | SHA2-512 | Ed448
-   */
-  MLS_256_DHKEMX448_AES256GCM_SHA512_Ed448,
-  /**
-   * DH KEM P521 | AES-GCM 256 | SHA2-512 | EcDSA P521
-   */
-  MLS_256_DHKEMP521_AES256GCM_SHA512_P521,
-  /**
-   * DH KEM x448 | Chacha20Poly1305 | SHA2-512 | Ed448
-   */
-  MLS_256_DHKEMX448_CHACHA20POLY1305_SHA512_Ed448,
-  /**
-   * DH KEM P384 | AES-GCM 256 | SHA2-384 | EcDSA P384
-   */
-  MLS_256_DHKEMP384_AES256GCM_SHA384_P384,
-}
-
 export interface ConversationProtocolDetailsProps {
   protocol: ConversationProtocol;
   cipherSuite?: number;
diff --git a/src/script/components/panel/UserActions.test.tsx b/src/script/components/panel/UserActions.test.tsx
index 77beca8c2a7..d9c88d85fc8 100644
--- a/src/script/components/panel/UserActions.test.tsx
+++ b/src/script/components/panel/UserActions.test.tsx
@@ -91,14 +91,17 @@ describe('UserActions', () => {
 
   it('generates actions for another user profile to which I am connected', () => {
     const user = new User('');
+    jest.spyOn(user, 'isAvailable').mockImplementation(ko.pureComputed(() => true));
     const conversation = new Conversation();
     jest.spyOn(conversation, 'isGroup').mockImplementation(ko.pureComputed(() => true));
+    jest.spyOn(conversation, 'participating_user_ids').mockImplementation(ko.observableArray([new User()]));
     user.connection().status(ConnectionStatus.ACCEPTED);
+    const conversationRoleRepository: Partial<ConversationRoleRepository> = {canRemoveParticipants: () => true};
 
     const props = {
       actionsViewModel,
       conversation,
-      conversationRoleRepository: {} as ConversationRoleRepository,
+      conversationRoleRepository: conversationRoleRepository as ConversationRoleRepository,
       isSelfActivated: true,
       onAction: noop,
       selfUser: new User(''),
@@ -108,11 +111,35 @@ describe('UserActions', () => {
     const {queryByTestId} = render(<UserActions {...props} />);
 
     const allActions = getAllActions(queryByTestId);
-    expect(allActions).toHaveLength(2);
+    expect(allActions).toHaveLength(3);
 
     [Actions.OPEN_CONVERSATION, Actions.BLOCK].forEach(action => {
       const identifier = ActionIdentifier[action];
       expect(queryByTestId(identifier)).not.toBeNull();
     });
   });
+
+  it('only generates remove participant action for an unavailable user', () => {
+    const user = new User('');
+    const conversation = new Conversation();
+    jest.spyOn(conversation, 'isGroup').mockImplementation(ko.pureComputed(() => true));
+    jest.spyOn(conversation, 'participating_user_ids').mockImplementation(ko.observableArray([new User()]));
+    user.connection().status(ConnectionStatus.ACCEPTED);
+    const conversationRoleRepository: Partial<ConversationRoleRepository> = {canRemoveParticipants: () => true};
+
+    const props = {
+      actionsViewModel,
+      conversation,
+      conversationRoleRepository: conversationRoleRepository as ConversationRoleRepository,
+      isSelfActivated: true,
+      onAction: noop,
+      selfUser: new User(''),
+      user,
+    };
+
+    const {queryByTestId} = render(<UserActions {...props} />);
+
+    const allActions = getAllActions(queryByTestId);
+    expect(allActions).toHaveLength(1);
+  });
 });
diff --git a/src/script/components/panel/UserActions.tsx b/src/script/components/panel/UserActions.tsx
index 1bedf26cda6..704cbc2fa26 100644
--- a/src/script/components/panel/UserActions.tsx
+++ b/src/script/components/panel/UserActions.tsx
@@ -19,6 +19,7 @@
 
 import React from 'react';
 
+import {ConnectionStatus} from '@wireapp/api-client/lib/connection';
 import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation';
 import {amplify} from 'amplify';
 
@@ -97,6 +98,7 @@ const UserActions: React.FC<UserActionsProps> = ({
   selfUser,
 }) => {
   const {
+    isAvailable,
     isBlocked,
     isCanceled,
     isRequest,
@@ -107,6 +109,7 @@ const UserActions: React.FC<UserActionsProps> = ({
     isOutgoingRequest,
     isIncomingRequest,
   } = useKoSubscribableChildren(user, [
+    'isAvailable',
     'isTemporaryGuest',
     'isTeamMember',
     'isBlocked',
@@ -157,7 +160,7 @@ const UserActions: React.FC<UserActionsProps> = ({
       : undefined;
 
   const open1To1Conversation: MenuItem | undefined =
-    isNotMe && (isConnected || isTeamMember)
+    isNotMe && isAvailable && (isConnected || isTeamMember)
       ? {
           click: async () => {
             await create1to1Conversation(user, true);
@@ -170,7 +173,7 @@ const UserActions: React.FC<UserActionsProps> = ({
       : undefined;
 
   const acceptConnectionRequest: MenuItem | undefined =
-    isNotMe && isIncomingRequest
+    isNotMe && isAvailable && isIncomingRequest
       ? {
           click: async () => {
             await actionsViewModel.acceptConnectionRequest(user);
@@ -214,20 +217,29 @@ const UserActions: React.FC<UserActionsProps> = ({
   const canConnect = !isTeamMember && !isTemporaryGuest;
 
   const sendConnectionRequest: MenuItem | undefined =
-    isNotMe && isNotConnectedUser && canConnect
+    isNotMe && isAvailable && isNotConnectedUser && canConnect
       ? {
           click: async () => {
-            const connectionIsSent = await actionsViewModel.sendConnectionRequest(user);
-            if (!connectionIsSent) {
+            const connectionData = await actionsViewModel.sendConnectionRequest(user);
+
+            if (!connectionData) {
               // Sending the connection failed, there is nothing more to do
               return;
             }
-            // We create a local 1:1 conversation that will act as a placeholder before the other user has accepted the request
-            const newConversation = createPlaceholder1to1Conversation(user, selfUser);
-            const savedConversation = await actionsViewModel.saveConversation(newConversation);
+
+            const {connectionStatus, conversationId} = connectionData;
+
+            // If connection's state is SENT, we create a local 1:1 conversation that will act as a placeholder
+            // before the other user has accepted the request.
+            const connectionConversation =
+              connectionStatus === ConnectionStatus.SENT
+                ? createPlaceholder1to1Conversation(user, selfUser)
+                : await actionsViewModel.getConversationById(conversationId);
+
+            const savedConversation = await actionsViewModel.saveConversation(connectionConversation);
             if (!conversation) {
               // Only open the new conversation if we aren't currently in a conversation context
-              actionsViewModel.open1to1Conversation(savedConversation);
+              await actionsViewModel.open1to1Conversation(savedConversation);
             }
             onAction(Actions.SEND_REQUEST);
           },
@@ -238,7 +250,7 @@ const UserActions: React.FC<UserActionsProps> = ({
       : undefined;
 
   const blockUser: MenuItem | undefined =
-    isNotMe && (isConnected || isRequest)
+    isNotMe && isAvailable && (isConnected || isRequest)
       ? {
           click: async () => {
             await actionsViewModel.blockUser(user);
@@ -252,7 +264,7 @@ const UserActions: React.FC<UserActionsProps> = ({
       : undefined;
 
   const unblockUser: MenuItem | undefined =
-    isNotMe && isBlocked
+    isNotMe && isAvailable && isBlocked
       ? {
           click: async () => {
             await actionsViewModel.unblockUser(user);
diff --git a/src/script/components/panel/UserDetails.tsx b/src/script/components/panel/UserDetails.tsx
index 4a90e338fc6..70007ca0bff 100644
--- a/src/script/components/panel/UserDetails.tsx
+++ b/src/script/components/panel/UserDetails.tsx
@@ -28,16 +28,16 @@ import {AvailabilityState} from 'Components/AvailabilityState';
 import {Avatar, AVATAR_SIZE} from 'Components/Avatar';
 import {ErrorFallback} from 'Components/ErrorFallback';
 import {Icon} from 'Components/Icon';
-import {ClassifiedBar} from 'Components/input/ClassifiedBar';
+import {UserClassifiedBar} from 'Components/input/ClassifiedBar';
+import {UserName} from 'Components/UserName';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
-import type {User} from '../../entity/User';
+import {User} from '../../entity/User';
 
-export interface UserDetailsProps {
+interface UserDetailsProps {
   badge?: string;
   classifiedDomains?: string[];
-  conversationDomain?: string;
   isGroupAdmin?: boolean;
   isSelfVerified: boolean;
   isVerified?: boolean;
@@ -45,14 +45,13 @@ export interface UserDetailsProps {
   avatarStyles?: React.CSSProperties;
 }
 
-export const UserDetailsComponent: React.FC<UserDetailsProps> = ({
+const UserDetailsComponent: React.FC<UserDetailsProps> = ({
   badge,
   participant,
   isSelfVerified,
   isGroupAdmin,
   avatarStyles,
   classifiedDomains,
-  conversationDomain,
 }) => {
   const user = useKoSubscribableChildren(participant, [
     'inTeam',
@@ -89,7 +88,7 @@ export const UserDetailsComponent: React.FC<UserDetailsProps> = ({
             data-uie-name="status-name"
             css={user.isAvailable ? undefined : {color: 'var(--gray-70)'}}
           >
-            {user.isAvailable ? user.name : t('unavailableUser')}
+            <UserName user={participant} />
           </h2>
         )}
 
@@ -107,13 +106,7 @@ export const UserDetailsComponent: React.FC<UserDetailsProps> = ({
         </p>
       )}
 
-      {classifiedDomains && (
-        <ClassifiedBar
-          conversationDomain={conversationDomain}
-          users={[participant]}
-          classifiedDomains={classifiedDomains}
-        />
-      )}
+      {classifiedDomains && <UserClassifiedBar users={[participant]} classifiedDomains={classifiedDomains} />}
 
       <Avatar
         className="panel-participant__avatar"
diff --git a/src/script/components/userDevices/SelfFingerprint.tsx b/src/script/components/userDevices/SelfFingerprint.tsx
index 131155919a8..8b280295b51 100644
--- a/src/script/components/userDevices/SelfFingerprint.tsx
+++ b/src/script/components/userDevices/SelfFingerprint.tsx
@@ -25,7 +25,6 @@ import {container} from 'tsyringe';
 
 import {WebAppEvents} from '@wireapp/webapp-events';
 
-import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {DeviceCard} from './DeviceCard';
@@ -50,11 +49,11 @@ const SelfFingerprint: React.FC<SelfFingerprintProps> = ({
     cryptographyRepository.getLocalFingerprint().then(setLocalFingerprint);
   }, [cryptographyRepository]);
 
-  const {currentClient} = useKoSubscribableChildren(clientState, ['currentClient']);
+  const currentClient = clientState.currentClient;
 
   return (
     <div className={cx('participant-devices__header', {'participant-devices__header--padding': !noPadding})}>
-      <DeviceCard device={currentClient} />
+      {currentClient && <DeviceCard device={currentClient} />}
       <div className="participant-devices__fingerprint">
         <DeviceId deviceId={localFingerprint} />
       </div>
diff --git a/src/script/connection/ConnectionRepository.ts b/src/script/connection/ConnectionRepository.ts
index d6da70fc08c..6331d360c8f 100644
--- a/src/script/connection/ConnectionRepository.ts
+++ b/src/script/connection/ConnectionRepository.ts
@@ -31,6 +31,7 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 import {replaceLink, t} from 'Util/LocalizerUtil';
 import {getLogger, Logger} from 'Util/Logger';
 import {matchQualifiedIds} from 'Util/QualifiedId';
+import {isBackendError} from 'Util/TypePredicateUtil';
 
 import type {ConnectionEntity} from './ConnectionEntity';
 import {ConnectionMapper} from './ConnectionMapper';
@@ -118,12 +119,16 @@ export class ConnectionRepository {
     await this.attachConnectionToUser(connectionEntity);
 
     // Update info about user when connection gets accepted
-    const shouldUpdateUser = previousStatus === ConnectionStatus.SENT && connectionEntity.isConnected();
-    if (shouldUpdateUser) {
+    const wasConnectionAccepted = previousStatus === ConnectionStatus.SENT && connectionEntity.isConnected();
+    if (wasConnectionAccepted) {
       await this.userRepository.refreshUser(connectionEntity.userId);
+    }
+
+    const isConnectionSent = connectionEntity.isOutgoingRequest();
+    if (isConnectionSent || wasConnectionAccepted) {
       // Get conversation related to connection and set its type to 1:1
       // This case is important when the 'user.connection' event arrives after the 'conversation.member-join' event: https://wearezeta.atlassian.net/browse/SQCORE-348
-      amplify.publish(WebAppEvents.CONVERSATION.MAP_CONNECTION, connectionEntity);
+      amplify.publish(WebAppEvents.CONVERSATION.MAP_CONNECTION, connectionEntity, source);
     }
 
     await this.sendNotification(connectionEntity, source, previousStatus);
@@ -182,28 +187,59 @@ export class ConnectionRepository {
    * @param userEntity User to connect to
    * @returns Promise that resolves to true if the request was successfully sent, false if not
    */
-  public async createConnection(userEntity: User): Promise<boolean> {
+  public async createConnection(
+    userEntity: User,
+  ): Promise<{connectionStatus: ConnectionStatus; conversationId: QualifiedId} | null> {
     try {
       const response = await this.connectionService.postConnections(userEntity.qualifiedId);
       const connectionEvent = {connection: response, user: {name: userEntity.name()}};
       await this.onUserConnection(connectionEvent, EventRepository.SOURCE.INJECTED);
-      return true;
+      return {
+        connectionStatus: response.status,
+        conversationId: response.qualified_conversation || {id: response.conversation, domain: ''},
+      };
     } catch (error) {
-      if (error.label === BackendErrorLabel.LEGAL_HOLD_MISSING_CONSENT) {
-        const replaceLinkLegalHold = replaceLink(
-          Config.getConfig().URL.SUPPORT.LEGAL_HOLD_BLOCK,
-          '',
-          'read-more-legal-hold',
-        );
-        PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-          text: {
-            htmlMessage: t('modalUserCannotConnectLegalHoldMessage', {}, replaceLinkLegalHold),
-            title: t('modalUserCannotConnectLegalHoldHeadline'),
-          },
-        });
+      if (isBackendError(error)) {
+        switch (error.label) {
+          case BackendErrorLabel.LEGAL_HOLD_MISSING_CONSENT: {
+            const replaceLinkLegalHold = replaceLink(
+              Config.getConfig().URL.SUPPORT.LEGAL_HOLD_BLOCK,
+              '',
+              'read-more-legal-hold',
+            );
+            PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+              text: {
+                htmlMessage: t('modalUserCannotSendConnectionLegalHoldMessage', {}, replaceLinkLegalHold),
+                title: t('modalUserCannotConnectHeadline'),
+              },
+            });
+            break;
+          }
+
+          case BackendErrorLabel.FEDERATION_NOT_ALLOWED: {
+            PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+              text: {
+                htmlMessage: t('modalUserCannotSendConnectionNotFederatingMessage', userEntity.name()),
+                title: t('modalUserCannotConnectHeadline'),
+              },
+            });
+            break;
+          }
+
+          default: {
+            this.logger.error(`Failed to send connection request to user '${userEntity.id}': ${error.message}`, error);
+            PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+              text: {
+                htmlMessage: t('modalUserCannotSendConnectionMessage'),
+                title: t('modalUserCannotConnectHeadline'),
+              },
+            });
+            break;
+          }
+        }
+        return null;
       }
-      this.logger.error(`Failed to send connection request to user '${userEntity.id}': ${error.message}`, error);
-      return false;
+      throw error;
     }
   }
 
@@ -290,6 +326,43 @@ export class ConnectionRepository {
     } catch (error) {
       const logMessage = `Connection change from '${currentStatus}' to '${newStatus}' failed`;
       this.logger.error(`${logMessage} for '${userEntity.id}' failed: ${error.message}`, error);
+      switch (newStatus) {
+        case ConnectionStatus.ACCEPTED: {
+          PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+            text: {
+              htmlMessage: t('modalUserCannotAcceptConnectionMessage'),
+              title: t('modalUserCannotConnectHeadline'),
+            },
+          });
+          break;
+        }
+        case ConnectionStatus.CANCELLED: {
+          PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+            text: {
+              htmlMessage: t('modalUserCannotCancelConnectionMessage'),
+              title: t('modalUserCannotConnectHeadline'),
+            },
+          });
+          break;
+        }
+        case ConnectionStatus.IGNORED: {
+          PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+            text: {
+              htmlMessage: t('modalUserCannotIgnoreConnectionMessage'),
+              title: t('modalUserCannotConnectHeadline'),
+            },
+          });
+          break;
+        }
+        default: {
+          PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+            text: {
+              title: t('modalUserCannotConnectHeadline'),
+            },
+          });
+          break;
+        }
+      }
     }
   }
 
diff --git a/src/script/conversation/AbstractConversationEventHandler.ts b/src/script/conversation/AbstractConversationEventHandler.ts
index 5e7a5a99598..06bfa81c67a 100644
--- a/src/script/conversation/AbstractConversationEventHandler.ts
+++ b/src/script/conversation/AbstractConversationEventHandler.ts
@@ -17,7 +17,7 @@
  *
  */
 
-import {ConversationEvent} from '@wireapp/api-client/lib/event';
+import {ConversationEvent, FederationEvent} from '@wireapp/api-client/lib/event';
 
 import {ClientConversationEvent} from './EventBuilder';
 
@@ -52,7 +52,7 @@ export class AbstractConversationEventHandler {
    */
   handleConversationEvent(
     conversationEntity: Conversation,
-    eventJson: ConversationEvent | ClientConversationEvent,
+    eventJson: ConversationEvent | ClientConversationEvent | FederationEvent,
   ): Promise<void> {
     const handler = this.eventHandlingConfig[eventJson.type] || (() => Promise.resolve());
     return handler.bind(this)(conversationEntity, eventJson);
diff --git a/src/script/conversation/ConversationAccessPermission.ts b/src/script/conversation/ConversationAccessPermission.ts
index 370c16824bd..f13cafd4db7 100644
--- a/src/script/conversation/ConversationAccessPermission.ts
+++ b/src/script/conversation/ConversationAccessPermission.ts
@@ -35,7 +35,7 @@ export const ACCESS_MODES = {
   CODE: 1 << 5,
 };
 
-export const ACCESS = {...ACCESS_TYPES, ...ACCESS_MODES};
+const ACCESS = {...ACCESS_TYPES, ...ACCESS_MODES};
 
 export function teamPermissionsForAccessState(state: ACCESS_STATE): number {
   switch (state) {
diff --git a/src/script/conversation/ConversationFilter.test.ts b/src/script/conversation/ConversationFilter.test.ts
index dd186b8edb5..b1487d67b0f 100644
--- a/src/script/conversation/ConversationFilter.test.ts
+++ b/src/script/conversation/ConversationFilter.test.ts
@@ -27,6 +27,7 @@ import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConv
 import {ConversationFilter} from './ConversationFilter';
 import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper';
 import {ConversationStatus} from './ConversationStatus';
+import {ConversationVerificationState} from './ConversationVerificationState';
 
 import {Conversation} from '../entity/Conversation';
 
@@ -55,7 +56,6 @@ describe('ConversationFilter', () => {
         group_id: 'test-group-id',
         id: '796161e1-a319-41e3-9b33-2b3ab0b3b87a',
         is_guest: false,
-        is_managed: false,
         last_event_timestamp: 9,
         last_read_timestamp: 0,
         last_server_timestamp: 9,
@@ -71,7 +71,8 @@ describe('ConversationFilter', () => {
         status: 0,
         team_id: undefined,
         type: 3,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
+        mlsVerificationState: ConversationVerificationState.UNVERIFIED,
       };
       const [conversationEntity] = ConversationMapper.mapConversations([conversationData]);
       expect(conversationEntity.is1to1()).toBeFalsy();
@@ -104,7 +105,6 @@ describe('ConversationFilter', () => {
         group_id: 'test-group-id',
         id: '796161e1-a319-41e3-9b33-2b3ab0b3b87a',
         is_guest: false,
-        is_managed: false,
         last_event_timestamp: 4,
         last_read_timestamp: 0,
         last_server_timestamp: 1627916459003,
@@ -124,7 +124,8 @@ describe('ConversationFilter', () => {
         status: 0,
         team_id: null,
         type: 2,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
+        mlsVerificationState: ConversationVerificationState.UNVERIFIED,
       };
       const [conversationEntity] = ConversationMapper.mapConversations([conversationData]);
       expect(conversationEntity.is1to1()).toBeTruthy();
diff --git a/src/script/conversation/ConversationMapper.test.ts b/src/script/conversation/ConversationMapper.test.ts
index 0bc3d81333d..e5290fbdfcb 100644
--- a/src/script/conversation/ConversationMapper.test.ts
+++ b/src/script/conversation/ConversationMapper.test.ts
@@ -44,6 +44,7 @@ import {BaseError} from 'src/script/error/BaseError';
 import {createUuid} from 'Util/uuid';
 
 import {ACCESS_STATE} from './AccessState';
+import {ConversationVerificationState} from './ConversationVerificationState';
 
 import {entities, payload} from '../../../test/api/payloads';
 
@@ -339,7 +340,7 @@ describe('ConversationMapper', () => {
     });
   });
 
-  describe('mergeConversation', () => {
+  describe('mergeConversations', () => {
     function getDataWithReadReceiptMode(
       localReceiptMode: RECEIPT_MODE,
       remoteReceiptMode: RECEIPT_MODE,
@@ -358,7 +359,6 @@ describe('ConversationMapper', () => {
         global_message_timer: null,
         id: conversationId,
         is_guest: false,
-        is_managed: false,
         last_event_timestamp: 1545058511982,
         last_read_timestamp: 1545058511982,
         last_server_timestamp: 1545058511982,
@@ -370,7 +370,7 @@ describe('ConversationMapper', () => {
         status: 0,
         team_id: teamId,
         type: 0,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
       };
 
       const remoteData: Partial<ConversationDatabaseData> = {
@@ -444,7 +444,7 @@ describe('ConversationMapper', () => {
         last_read_timestamp: 1488387380633,
         muted_state: NOTIFICATION_STATE.EVERYTHING,
         muted_timestamp: 0,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
       };
 
       const [mergedConversation] = ConversationMapper.mergeConversations(
@@ -477,7 +477,7 @@ describe('ConversationMapper', () => {
         id: 'de7466b0-985c-4dc3-ad57-17877db45b4c',
         last_event_timestamp: 1488387380633,
         last_read_timestamp: 1488387380633,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
       };
 
       const remoteData2: ConversationBackendData = JSON.parse(JSON.stringify(remoteData));
@@ -541,6 +541,62 @@ describe('ConversationMapper', () => {
       });
     });
 
+    it('returns the local data if the remote data is not present', () => {
+      const localData: Partial<ConversationDatabaseData> = {
+        archived_state: false,
+        archived_timestamp: 1487239601118,
+        cleared_timestamp: 0,
+        ephemeral_timer: 0,
+        global_message_timer: 0,
+        id: 'de7466b0-985c-4dc3-ad57-17877db45b4c',
+        is_guest: false,
+        last_event_timestamp: 1488387380633,
+        last_read_timestamp: 1488387380633,
+        last_server_timestamp: 1488387380633,
+        muted_state: NOTIFICATION_STATE.EVERYTHING,
+        muted_timestamp: 0,
+        name: 'Family Gathering',
+        others: ['532af01e-1e24-4366-aacf-33b67d4ee376'],
+        receipt_mode: RECEIPT_MODE.ON,
+        status: 0,
+        team_id: '5316fe03-24ee-4b19-b789-6d026bd3ce5f',
+        type: 2,
+        verification_state: ConversationVerificationState.UNVERIFIED,
+      };
+
+      const [merged_conversation] = ConversationMapper.mergeConversations(
+        [localData] as ConversationDatabaseData[],
+        {found: []} as RemoteConversations,
+      );
+
+      expect(merged_conversation).toEqual(localData);
+    });
+
+    it('returns the remote data if the local data is not present', () => {
+      const [merged_conversation] = ConversationMapper.mergeConversations([], {
+        found: [remoteData],
+      } as RemoteConversations);
+
+      const mergedConversation = {
+        accessModes: remoteData.access,
+        archived_state: false,
+        archived_timestamp: 1487239601118,
+        creator: '532af01e-1e24-4366-aacf-33b67d4ee376',
+        id: 'de7466b0-985c-4dc3-ad57-17877db45b4c',
+        last_event_timestamp: 1,
+        last_server_timestamp: 1,
+        muted_state: 0,
+        muted_timestamp: 0,
+        name: 'Family Gathering',
+        others: ['532af01e-1e24-4366-aacf-33b67d4ee376'],
+        roles: {},
+        team_id: '5316fe03-24ee-4b19-b789-6d026bd3ce5f',
+        type: 2,
+      };
+
+      expect(merged_conversation).toEqual(mergedConversation);
+    });
+
     it('updates local archive and muted timestamps if time of remote data is newer', () => {
       const localData: Partial<ConversationDatabaseData> = {
         archived_state: false,
@@ -552,7 +608,7 @@ describe('ConversationMapper', () => {
         last_read_timestamp: 1488387380633,
         muted_state: NOTIFICATION_STATE.EVERYTHING,
         muted_timestamp: 0,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
       };
 
       const selfUpdate: Partial<MemberBackendData> = {
@@ -626,7 +682,7 @@ describe('ConversationMapper', () => {
         last_server_timestamp: 1377276270510,
         muted_state: NOTIFICATION_STATE.EVERYTHING,
         muted_timestamp: 0,
-        verification_state: 0,
+        verification_state: ConversationVerificationState.UNVERIFIED,
       };
 
       const [merged_conversation] = ConversationMapper.mergeConversations(
diff --git a/src/script/conversation/ConversationMapper.ts b/src/script/conversation/ConversationMapper.ts
index 987e5609560..b7fd92eea4c 100644
--- a/src/script/conversation/ConversationMapper.ts
+++ b/src/script/conversation/ConversationMapper.ts
@@ -27,16 +27,14 @@ import {
   DefaultConversationRoleName,
   RemoteConversations,
 } from '@wireapp/api-client/lib/conversation';
-import {QualifiedId} from '@wireapp/api-client/lib/user';
 import ko from 'knockout';
 import {isObject} from 'underscore';
 
 import {LegalHoldStatus} from '@wireapp/protocol-messaging';
 
-import {matchQualifiedIds, QualifiedEntity} from 'Util/QualifiedId';
-
 import {ACCESS_STATE} from './AccessState';
 import {ConversationStatus} from './ConversationStatus';
+import {ConversationVerificationState} from './ConversationVerificationState';
 
 import {Conversation} from '../entity/Conversation';
 import {BaseError, BASE_ERROR_TYPE} from '../error/BaseError';
@@ -63,7 +61,7 @@ export interface SelfStatusUpdateDatabaseData {
   otr_muted_status: number;
   receipt_mode: number;
   status: number;
-  verification_state: number;
+  verification_state: ConversationVerificationState;
 }
 
 type Roles = {[userId: string]: DefaultConversationRoleName | string};
@@ -296,40 +294,48 @@ export class ConversationMapper {
     return conversationEntity;
   }
 
+  /**
+   * Will merge the locally stored conversations with the new conversations fetched from the backend.
+   * @param localConversations locally stored conversations
+   * @param remoteConversations new conversations fetched from backend
+   * @returns the new conversations from backend merged with the locally stored conversations
+   */
   static mergeConversations(
     localConversations: ConversationDatabaseData[],
     remoteConversations: RemoteConversations,
   ): ConversationDatabaseData[] {
-    localConversations = localConversations.filter(conversationData => conversationData);
-
-    const failedConversations = (remoteConversations.failed ?? []).reduce(
-      (prev: ConversationDatabaseData[], curr: QualifiedId) => {
-        const convo = localConversations.find(conversationId => matchQualifiedIds(conversationId, curr));
-        return convo ? [...prev, convo] : prev;
-      },
-      [],
-    );
+    const foundRemoteConversations = remoteConversations.found;
 
-    const localArchives = localConversations.filter(
-      conversationData =>
-        conversationData.archived_state &&
-        remoteConversations.found?.findIndex(remote => remote.qualified_id.id === conversationData.id) === -1,
-    );
+    if (!foundRemoteConversations) {
+      return localConversations;
+    }
 
-    const foundRemoteConversations = remoteConversations.found.map(
-      (remoteConversationData: ConversationBackendData, index: number) => {
-        const remoteConversationId: QualifiedEntity = remoteConversationData.qualified_id || {
-          domain: '',
-          id: remoteConversationData.id,
-        };
-        const localConversationData =
-          localConversations.find(conversationId => matchQualifiedIds(conversationId, remoteConversationId)) ||
-          (remoteConversationId as ConversationDatabaseData);
-
-        return this.mergeSingleConversation(localConversationData, remoteConversationData, index);
-      },
-    );
-    return [...foundRemoteConversations, ...failedConversations, ...localArchives];
+    const conversationsMap = new Map<string, ConversationDatabaseData>();
+
+    for (const localConversation of localConversations) {
+      const conversationId = localConversation.qualified_id?.id || localConversation.id;
+      conversationsMap.set(conversationId, localConversation);
+    }
+
+    for (let i = 0; i < foundRemoteConversations.length; i++) {
+      const remoteConversation = foundRemoteConversations[i];
+      const conversationId = remoteConversation.qualified_id?.id || remoteConversation.id;
+      const localConversation = conversationsMap.get(conversationId);
+
+      if (localConversation) {
+        conversationsMap.set(conversationId, this.mergeSingleConversation(localConversation, remoteConversation, i));
+        continue;
+      }
+
+      const localConversationData = (remoteConversation.qualified_id || {
+        id: conversationId,
+        domain: '',
+      }) as ConversationDatabaseData;
+
+      conversationsMap.set(conversationId, this.mergeSingleConversation(localConversationData, remoteConversation, i));
+    }
+
+    return Array.from(conversationsMap.values());
   }
 
   /**
diff --git a/src/script/conversation/ConversationRepository.test.ts b/src/script/conversation/ConversationRepository.test.ts
index caece1f8040..313e8797c91 100644
--- a/src/script/conversation/ConversationRepository.test.ts
+++ b/src/script/conversation/ConversationRepository.test.ts
@@ -21,14 +21,20 @@ import {faker} from '@faker-js/faker';
 import {ClientClassification} from '@wireapp/api-client/lib/client/';
 import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
 import {
+  Conversation as BackendConversation,
   CONVERSATION_ACCESS,
   CONVERSATION_LEGACY_ACCESS_ROLE,
   CONVERSATION_TYPE,
   RemoteConversations,
-} from '@wireapp/api-client/lib/conversation/';
+} from '@wireapp/api-client/lib/conversation';
 import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data';
 import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
-import {ConversationCreateEvent, ConversationMemberJoinEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
+import {
+  ConversationMemberLeaveEvent,
+  ConversationCreateEvent,
+  ConversationMemberJoinEvent,
+  CONVERSATION_EVENT,
+} from '@wireapp/api-client/lib/event/';
 import {QualifiedId} from '@wireapp/api-client/lib/user';
 import {amplify} from 'amplify';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
@@ -52,6 +58,8 @@ import {ClientEvent} from 'src/script/event/Client';
 import {EventRepository} from 'src/script/event/EventRepository';
 import {NOTIFICATION_HANDLING_STATE} from 'src/script/event/NotificationHandlingState';
 import {StorageSchemata} from 'src/script/storage/StorageSchemata';
+import {generateConversation as _generateConversation} from 'test/helper/ConversationGenerator';
+import {createDeleteEvent} from 'test/helper/EventGenerator';
 import {escapeRegex} from 'Util/SanitizationUtil';
 import {createUuid} from 'Util/uuid';
 
@@ -63,34 +71,11 @@ import {generateUser} from '../../../test/helper/UserGenerator';
 import {Core} from '../service/CoreSingleton';
 import {LegacyEventRecord, StorageService} from '../storage';
 
-jest.deepUnmock('axios');
-
-const _generateConversation = (
-  conversation_type = CONVERSATION_TYPE.REGULAR,
-  connection_status = ConnectionStatus.ACCEPTED,
-  conversationProtocol = ConversationProtocol.PROTEUS,
-  domain = '',
-) => {
-  const conversation = new Conversation(createUuid(), domain, conversationProtocol);
-  conversation.type(conversation_type);
-
-  const connectionEntity = new ConnectionEntity();
-  connectionEntity.conversationId = conversation.qualifiedId;
-  connectionEntity.status(connection_status);
-  conversation.connection(connectionEntity);
-
-  if (conversationProtocol === ConversationProtocol.MLS) {
-    conversation.groupId = 'groupId';
-  }
-
-  return conversation;
-};
-
 describe('ConversationRepository', () => {
   const testFactory = new TestFactory();
 
-  let conversation_et = _generateConversation(CONVERSATION_TYPE.REGULAR);
-  const selfConversation = _generateConversation(CONVERSATION_TYPE.SELF);
+  let conversation_et = _generateConversation();
+  const selfConversation = _generateConversation({type: CONVERSATION_TYPE.SELF});
   let self_user_et;
   let server: sinon.SinonFakeServer;
   let storage_service: StorageService;
@@ -120,6 +105,7 @@ describe('ConversationRepository', () => {
     const mark_as_read_url = `${Config.getConfig().BACKEND_REST}/conversations/${conversation_et.id}/self`;
     server.respondWith('PUT', mark_as_read_url, [HTTP_STATUS.OK, {}, '']);
 
+    await testFactory.exposeCallingActors();
     const conversationRepository = await testFactory.exposeConversationActors();
     amplify.publish(WebAppEvents.EVENT.NOTIFICATION_HANDLING_STATE, NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
     storage_service = conversationRepository['conversationService']['storageService'];
@@ -148,7 +134,7 @@ describe('ConversationRepository', () => {
 
   describe('filtered_conversations', () => {
     it('should not contain the self conversation', () => {
-      const self_conversation_et = _generateConversation(CONVERSATION_TYPE.SELF);
+      const self_conversation_et = _generateConversation({type: CONVERSATION_TYPE.SELF});
 
       return testFactory.conversation_repository['saveConversation'](self_conversation_et).then(() => {
         expect(
@@ -168,7 +154,10 @@ describe('ConversationRepository', () => {
     });
 
     it('should not contain a blocked conversations', () => {
-      const blocked_conversation_et = _generateConversation(CONVERSATION_TYPE.ONE_TO_ONE, ConnectionStatus.BLOCKED);
+      const blocked_conversation_et = _generateConversation({
+        type: CONVERSATION_TYPE.ONE_TO_ONE,
+        status: ConnectionStatus.BLOCKED,
+      });
 
       return testFactory.conversation_repository['saveConversation'](blocked_conversation_et).then(() => {
         expect(
@@ -188,7 +177,10 @@ describe('ConversationRepository', () => {
     });
 
     it('should not contain the conversation for a cancelled connection request', () => {
-      const cancelled_conversation_et = _generateConversation(CONVERSATION_TYPE.ONE_TO_ONE, ConnectionStatus.CANCELLED);
+      const cancelled_conversation_et = _generateConversation({
+        type: CONVERSATION_TYPE.ONE_TO_ONE,
+        status: ConnectionStatus.CANCELLED,
+      });
 
       return testFactory.conversation_repository['saveConversation'](cancelled_conversation_et).then(() => {
         expect(
@@ -208,7 +200,10 @@ describe('ConversationRepository', () => {
     });
 
     it('should not contain the conversation for a pending connection request', () => {
-      const pending_conversation_et = _generateConversation(CONVERSATION_TYPE.ONE_TO_ONE, ConnectionStatus.PENDING);
+      const pending_conversation_et = _generateConversation({
+        type: CONVERSATION_TYPE.ONE_TO_ONE,
+        status: ConnectionStatus.PENDING,
+      });
 
       return testFactory.conversation_repository['saveConversation'](pending_conversation_et).then(() => {
         expect(
@@ -282,23 +277,23 @@ describe('ConversationRepository', () => {
 
   describe('getGroupsByName', () => {
     beforeEach(() => {
-      const group_a = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const group_a = _generateConversation();
       group_a.name('Web Dudes');
 
-      const group_b = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const group_b = _generateConversation();
       group_b.name('René, Benny, Gregor, Lipis');
 
-      const group_c = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const group_c = _generateConversation();
       self_user_et = new User('id', null);
       self_user_et.name('John');
       group_c.participating_user_ets.push(self_user_et);
 
-      const group_cleared = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const group_cleared = _generateConversation();
       group_cleared.name('Cleared');
       group_cleared.last_event_timestamp(Date.now() - 1000);
       group_cleared.setTimestamp(Date.now(), Conversation.TIMESTAMP_TYPE.CLEARED);
 
-      const group_removed = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const group_removed = _generateConversation();
       group_removed.name('Removed');
       group_removed.last_event_timestamp(Date.now() - 1000);
       group_removed.setTimestamp(Date.now(), Conversation.TIMESTAMP_TYPE.CLEARED);
@@ -461,7 +456,7 @@ describe('ConversationRepository', () => {
   describe('handleConversationEvent', () => {
     it('detects events send by a user not in the conversation', () => {
       const selfUser = generateUser();
-      const conversationEntity = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const conversationEntity = _generateConversation();
       const event = {
         conversation: conversationEntity.id,
         data: {},
@@ -579,6 +574,7 @@ describe('ConversationRepository', () => {
       it("shows a failed message on the sender's side if the upload fails", () => {
         const selfUser = generateUser();
         const conversation_id = createUuid();
+        const conversationQualifiedId = {domain: '', id: conversation_id};
         const message_id = createUuid();
         const sending_user_id = selfUser.id;
         spyOn(testFactory.conversation_repository['userState'], 'self').and.returnValue(selfUser);
@@ -613,6 +609,31 @@ describe('ConversationRepository', () => {
           type: 'conversation.asset-add',
         };
 
+        const conversation_payload = {
+          creator: conversation_et.id,
+          id: conversation_id,
+          qualified_id: conversationQualifiedId,
+          members: {
+            others: [],
+            self: {
+              hidden_ref: null,
+              id: conversation_et.id,
+              otr_archived_ref: null,
+              otr_muted_ref: null,
+              otr_muted_status: 0,
+              service: null,
+              status_ref: '0.0',
+              status_time: '2015-01-28T12:53:41.847Z',
+            },
+          },
+          name: '',
+          type: 0,
+        } as unknown as BackendConversation;
+
+        jest
+          .spyOn(testFactory.conversation_repository['conversationService'], 'getConversationById')
+          .mockResolvedValue(conversation_payload);
+
         return testFactory.conversation_repository['fetchConversationById']({domain: '', id: conversation_id})
           .then(fetched_conversation => {
             expect(fetched_conversation).toBeDefined();
@@ -653,7 +674,6 @@ describe('ConversationRepository', () => {
         createEvent = {
           conversation: conversationId,
           data: {
-            failed_to_add: [],
             access: [CONVERSATION_ACCESS.INVITE],
             access_role: CONVERSATION_LEGACY_ACCESS_ROLE.ACTIVATED,
             access_role_v2: [],
@@ -707,7 +727,7 @@ describe('ConversationRepository', () => {
       it('should process create event for a new conversation created locally', () => {
         jest
           .spyOn(testFactory.conversation_repository['conversationService'], 'getConversationById')
-          .mockResolvedValue(createEvent.data);
+          .mockResolvedValueOnce(createEvent.data);
         return testFactory.conversation_repository['handleConversationEvent'](createEvent).then(() => {
           expect(testFactory.conversation_repository['onCreate']).toHaveBeenCalled();
           expect(testFactory.conversation_repository.mapConversations).toHaveBeenCalledWith([createEvent.data], 1);
@@ -738,7 +758,7 @@ describe('ConversationRepository', () => {
         spyOn(testFactory.conversation_repository as any, 'onMemberJoin').and.callThrough();
         spyOn(testFactory.conversation_repository, 'updateParticipatingUserEntities').and.callThrough();
         spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve([]));
-        spyOn(container.resolve(Core).service!.conversation, 'isMLSConversationEstablished').and.returnValue(
+        spyOn(container.resolve(Core).service!.conversation, 'mlsGroupExistsLocally').and.returnValue(
           Promise.resolve(true),
         );
 
@@ -768,12 +788,11 @@ describe('ConversationRepository', () => {
         const mockSelfClientId = 'self-client-id';
         const selfUser = generateUser({id: createUuid(), domain: mockDomain});
 
-        const conversationEntity = _generateConversation(
-          CONVERSATION_TYPE.REGULAR,
-          undefined,
-          ConversationProtocol.MLS,
-          mockDomain,
-        );
+        const conversationEntity = _generateConversation({
+          protocol: ConversationProtocol.MLS,
+          id: {domain: mockDomain, id: 'test-id'},
+        });
+
         testFactory.conversation_repository['saveConversation'](conversationEntity);
 
         const memberJoinEvent = {
@@ -792,6 +811,7 @@ describe('ConversationRepository', () => {
           get: jest.fn(() => mockSelfClientId),
         });
 
+        jest.spyOn(container.resolve(Core).service!.mls!, 'conversationExists').mockResolvedValueOnce(true);
         return testFactory.conversation_repository['handleConversationEvent'](memberJoinEvent).then(() => {
           expect(testFactory.conversation_repository['onMemberJoin']).toHaveBeenCalled();
           expect(testFactory.conversation_repository.updateParticipatingUserEntities).toHaveBeenCalled();
@@ -827,7 +847,7 @@ describe('ConversationRepository', () => {
       const selfUser = generateUser();
 
       beforeEach(() => {
-        conversation_et = _generateConversation(CONVERSATION_TYPE.REGULAR);
+        conversation_et = _generateConversation();
         return testFactory.conversation_repository['saveConversation'](conversation_et).then(() => {
           message_et = new Message(createUuid());
           message_et.from = selfUser.id;
@@ -841,19 +861,7 @@ describe('ConversationRepository', () => {
       afterEach(() => conversation_et.removeMessages());
 
       it('should not delete message if user is not matching', async () => {
-        const message_delete_event: DeleteEvent = {
-          conversation: conversation_et.id,
-          data: {
-            deleted_time: 0,
-            message_id: message_et.id,
-            time: '',
-          },
-          from: createUuid(),
-          id: createUuid(),
-          qualified_conversation: {domain: '', id: conversation_et.id},
-          time: new Date().toISOString(),
-          type: ClientEvent.CONVERSATION.MESSAGE_DELETE,
-        };
+        const message_delete_event: DeleteEvent = createDeleteEvent(message_et.id, conversation_et.id);
 
         spyOn(testFactory.conversation_repository['userState'], 'self').and.returnValue(selfUser);
 
@@ -896,22 +904,9 @@ describe('ConversationRepository', () => {
 
       it('should delete message and add delete message if user is not self', () => {
         spyOn(testFactory.event_service, 'deleteEvent');
-        const other_user_id = createUuid();
-        message_et.from = other_user_id;
 
-        const message_delete_event: DeleteEvent = {
-          conversation: conversation_et.id,
-          data: {
-            deleted_time: 0,
-            message_id: message_et.id,
-            time: '',
-          },
-          from: other_user_id,
-          id: createUuid(),
-          qualified_conversation: {domain: '', id: conversation_et.id},
-          time: new Date().toISOString(),
-          type: ClientEvent.CONVERSATION.MESSAGE_DELETE,
-        };
+        const message_delete_event = createDeleteEvent(message_et.id, conversation_et.id);
+        message_et.from = message_delete_event.from;
 
         spyOn(testFactory.conversation_repository['userState'], 'self').and.returnValue(selfUser);
 
@@ -929,19 +924,7 @@ describe('ConversationRepository', () => {
         message_et.from = other_user_id;
         message_et.ephemeral_expires(true);
 
-        const message_delete_event: DeleteEvent = {
-          conversation: conversation_et.id,
-          data: {
-            deleted_time: 0,
-            message_id: message_et.id,
-            time: '',
-          },
-          from: other_user_id,
-          id: createUuid(),
-          qualified_conversation: {domain: '', id: conversation_et.id},
-          time: new Date().toISOString(),
-          type: ClientEvent.CONVERSATION.MESSAGE_DELETE,
-        };
+        const message_delete_event = createDeleteEvent(message_et.id, conversation_et.id);
 
         spyOn(testFactory.conversation_repository['userState'], 'self').and.returnValue(selfUser);
 
@@ -959,7 +942,7 @@ describe('ConversationRepository', () => {
       const selfUser = generateUser();
 
       beforeEach(() => {
-        conversation_et = _generateConversation(CONVERSATION_TYPE.REGULAR);
+        conversation_et = _generateConversation();
 
         return testFactory.conversation_repository['saveConversation'](conversation_et).then(() => {
           const messageToHideEt = new Message(createUuid());
@@ -1160,18 +1143,18 @@ describe('ConversationRepository', () => {
       bob.devices.push(bobs_computer);
       bob.devices.push(bobs_phone);
 
-      const dudes = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const dudes = _generateConversation();
       dudes.name('Web Dudes');
       dudes.participating_user_ets.push(bob);
       dudes.participating_user_ets.push(john);
 
-      const gals = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const gals = _generateConversation();
       gals.name('Web Gals');
       gals.participating_user_ets.push(anne);
       gals.participating_user_ets.push(jane);
       gals.participating_user_ets.push(lara);
 
-      const mixed_group = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const mixed_group = _generateConversation();
       mixed_group.name('Web Dudes & Gals');
       mixed_group.participating_user_ets.push(anne);
       mixed_group.participating_user_ets.push(bob);
@@ -1219,7 +1202,7 @@ describe('ConversationRepository', () => {
       testFactory.propertyRepository.receiptMode(preferenceMode);
 
       // Set the opposite receipt mode on conversation-level
-      const conversationEntity = _generateConversation(CONVERSATION_TYPE.ONE_TO_ONE);
+      const conversationEntity = _generateConversation({type: CONVERSATION_TYPE.ONE_TO_ONE});
       conversationEntity.receiptMode(RECEIPT_MODE.OFF);
 
       // Verify that the account-level preference wins
@@ -1234,7 +1217,7 @@ describe('ConversationRepository', () => {
       testFactory.propertyRepository.receiptMode(preferenceMode);
 
       // Set the opposite receipt mode on conversation-level
-      const conversationEntity = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const conversationEntity = _generateConversation();
       conversationEntity.receiptMode(RECEIPT_MODE.OFF);
 
       // Verify that the conversation-level preference wins
@@ -1246,8 +1229,8 @@ describe('ConversationRepository', () => {
 
   describe('checkForDeletedConversations', () => {
     it('removes conversations that have been deleted on the backend', async () => {
-      const existingGroup = _generateConversation(CONVERSATION_TYPE.REGULAR);
-      const deletedGroup = _generateConversation(CONVERSATION_TYPE.REGULAR);
+      const existingGroup = _generateConversation();
+      const deletedGroup = _generateConversation();
       const conversationRepository = testFactory.conversation_repository!;
 
       spyOn(testFactory.conversation_service, 'getConversationById').and.callFake(({id}) => {
@@ -1427,7 +1410,7 @@ describe('ConversationRepository', () => {
       spyOn(testFactory.user_repository!, 'refreshUsers').and.callFake(() => {
         unavailableUsers.map(user => {
           user.id = createUuid();
-          user.name(faker.name.fullName());
+          user.name(faker.person.fullName());
         });
       });
 
@@ -1464,11 +1447,11 @@ describe('ConversationRepository', () => {
       spyOn(testFactory.user_repository!, 'refreshUsers').and.callFake(() => {
         unavailableUsers1.map(user => {
           user.id = createUuid();
-          user.name(faker.name.fullName());
+          user.name(faker.person.fullName());
         });
         unavailableUsers2.map(user => {
           user.id = createUuid();
-          user.name(faker.name.fullName());
+          user.name(faker.person.fullName());
         });
       });
 
@@ -1526,4 +1509,105 @@ describe('ConversationRepository', () => {
       expect(conversationRepo['refreshAllConversationsUnavailableParticipants']).toHaveBeenCalled();
     });
   });
+
+  describe('removeMembers', () => {
+    it.each([ConversationProtocol.PROTEUS, ConversationProtocol.MIXED])(
+      'should remove member from %s conversation',
+      async protocol => {
+        const conversationRepository = await testFactory.exposeConversationActors();
+
+        const conversation = _generateConversation({protocol});
+
+        const selfUser = generateUser();
+        conversation.selfUser(selfUser);
+
+        const user1 = generateUser();
+        const user2 = generateUser();
+
+        conversation.participating_user_ets([user1, user2]);
+
+        const coreConversationService = container.resolve(Core).service!.conversation;
+
+        jest.spyOn(conversationRepository['eventRepository'], 'injectEvent').mockImplementation(jest.fn());
+
+        await conversationRepository.removeMembers(conversation, [user1.qualifiedId]);
+
+        expect(coreConversationService.removeUserFromConversation).toHaveBeenCalledWith(
+          conversation.qualifiedId,
+          user1.qualifiedId,
+        );
+      },
+    );
+
+    it('should remove member from mls conversation', async () => {
+      const conversationRepository = await testFactory.exposeConversationActors();
+
+      const conversation = _generateConversation({protocol: ConversationProtocol.MLS});
+
+      const selfUser = generateUser();
+      conversation.selfUser(selfUser);
+
+      const user1 = generateUser();
+      const user2 = generateUser();
+
+      conversation.participating_user_ets([user1, user2]);
+
+      const coreConversationService = container.resolve(Core).service!.conversation;
+
+      jest.spyOn(conversationRepository['eventRepository'], 'injectEvent').mockImplementation(jest.fn());
+
+      const mockedMemberLeaveEvent: ConversationMemberLeaveEvent = {
+        conversation: conversation.id,
+        data: {qualified_user_ids: [], user_ids: []},
+        from: '',
+        time: '',
+        type: CONVERSATION_EVENT.MEMBER_LEAVE,
+      };
+      jest
+        .spyOn(coreConversationService, 'removeUsersFromMLSConversation')
+        .mockResolvedValueOnce({events: [mockedMemberLeaveEvent], conversation: {} as BackendConversation});
+      await conversationRepository.removeMembers(conversation, [user1.qualifiedId]);
+
+      expect(coreConversationService.removeUsersFromMLSConversation).toHaveBeenCalledWith({
+        conversationId: conversation.qualifiedId,
+        qualifiedUserIds: [user1.qualifiedId],
+        groupId: conversation.groupId,
+      });
+      expect(conversationRepository['eventRepository'].injectEvent).toHaveBeenCalled();
+    });
+  });
+
+  describe('leaveConversation', () => {
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it.each([ConversationProtocol.PROTEUS, ConversationProtocol.MIXED, ConversationProtocol.MLS])(
+      'should leave %s conversation',
+      async protocol => {
+        const conversationRepository = await testFactory.exposeConversationActors();
+
+        const conversation = _generateConversation({protocol});
+
+        const selfUser = generateUser();
+        conversation.selfUser(selfUser);
+
+        spyOn(conversationRepository['userState'], 'self').and.returnValue(selfUser);
+
+        conversation.participating_user_ets([generateUser(), generateUser()]);
+
+        const coreConversationService = container.resolve(Core).service!.conversation;
+
+        jest.spyOn(conversationRepository['eventRepository'], 'injectEvent').mockImplementation(jest.fn());
+
+        await conversationRepository.leaveConversation(conversation);
+
+        expect(coreConversationService.removeUserFromConversation).toHaveBeenCalledWith(
+          conversation.qualifiedId,
+          selfUser.qualifiedId,
+        );
+        expect(conversationRepository['eventRepository'].injectEvent).toHaveBeenCalled();
+      },
+    );
+  });
 });
diff --git a/src/script/conversation/ConversationRepository.ts b/src/script/conversation/ConversationRepository.ts
index d71c073369f..ab270b4dfaa 100644
--- a/src/script/conversation/ConversationRepository.ts
+++ b/src/script/conversation/ConversationRepository.ts
@@ -43,7 +43,7 @@ import {
 import {BackendErrorLabel} from '@wireapp/api-client/lib/http/';
 import type {BackendError} from '@wireapp/api-client/lib/http/';
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
-import {MLSReturnType} from '@wireapp/core/lib/conversation';
+import {MLSCreateConversationResponse} from '@wireapp/core/lib/conversation';
 import {amplify} from 'amplify';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
 import {container} from 'tsyringe';
@@ -68,7 +68,7 @@ import {
 } from 'Util/StringUtil';
 import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 import {isBackendError} from 'Util/TypePredicateUtil';
-import {noop} from 'Util/util';
+import {supportsMLS} from 'Util/util';
 import {createUuid} from 'Util/uuid';
 
 import {ACCESS_STATE} from './AccessState';
@@ -79,18 +79,21 @@ import {ConversationFilter} from './ConversationFilter';
 import {ConversationLabelRepository} from './ConversationLabelRepository';
 import {ConversationDatabaseData, ConversationMapper} from './ConversationMapper';
 import {ConversationRoleRepository} from './ConversationRoleRepository';
-import {isMLSConversation} from './ConversationSelectors';
+import {isMLSConversation, MLSConversation} from './ConversationSelectors';
 import {ConversationService} from './ConversationService';
 import {ConversationState} from './ConversationState';
 import {ConversationStateHandler} from './ConversationStateHandler';
 import {ConversationStatus} from './ConversationStatus';
 import {ConversationVerificationState} from './ConversationVerificationState';
-import {ConversationVerificationStateHandler} from './ConversationVerificationStateHandler';
+import {ProteusConversationVerificationStateHandler} from './ConversationVerificationStateHandler';
+import {registerMLSConversationVerificationStateHandler} from './ConversationVerificationStateHandler/MLS';
+import {OnConversationVerificationStateChange} from './ConversationVerificationStateHandler/shared';
 import {EventMapper} from './EventMapper';
 import {MessageRepository} from './MessageRepository';
 import {NOTIFICATION_STATE} from './NotificationSetting';
 
 import {AssetTransferState} from '../assets/AssetTransferState';
+import {CallingRepository} from '../calling/CallingRepository';
 import {LEAVE_CALL_REASON} from '../calling/enum/LeaveCallReason';
 import {PrimaryModal} from '../components/Modals/PrimaryModal';
 import {Config} from '../Config';
@@ -128,7 +131,7 @@ import * as LegalHoldEvaluator from '../legal-hold/LegalHoldEvaluator';
 import {MessageCategory} from '../message/MessageCategory';
 import {SuperType} from '../message/SuperType';
 import {SystemMessageType} from '../message/SystemMessageType';
-import {addOtherSelfClientsToMLSConversation, useMLSConversationState} from '../mls';
+import {addOtherSelfClientsToMLSConversation} from '../mls';
 import {PropertiesRepository} from '../properties/PropertiesRepository';
 import {Core} from '../service/CoreSingleton';
 import type {EventRecord} from '../storage';
@@ -147,16 +150,14 @@ type IncomingEvent = ConversationEvent | ClientConversationEvent;
 
 export class ConversationRepository {
   private isBlockingNotificationHandling: boolean;
-  private readonly conversationsWithNewEvents: Map<any, any>;
   private readonly ephemeralHandler: ConversationEphemeralHandler;
   public readonly conversationLabelRepository: ConversationLabelRepository;
   public readonly conversationRoleRepository: ConversationRoleRepository;
   private readonly event_mapper: EventMapper;
   private readonly eventService: EventService;
-  public leaveCall: (conversationId: QualifiedId, reason: LEAVE_CALL_REASON) => void;
   private readonly logger: Logger;
   public readonly stateHandler: ConversationStateHandler;
-  public readonly verificationStateHandler: ConversationVerificationStateHandler;
+  public readonly proteusVerificationStateHandler: ProteusConversationVerificationStateHandler;
   static readonly eventFromStreamMessage = 'event from notification stream';
 
   static get CONFIG() {
@@ -178,6 +179,7 @@ export class ConversationRepository {
     private readonly teamRepository: TeamRepository,
     private readonly userRepository: UserRepository,
     private readonly propertyRepository: PropertiesRepository,
+    private readonly callingRepository: CallingRepository,
     private readonly serverTimeHandler: ServerTimeHandler,
     private readonly userState = container.resolve(UserState),
     private readonly teamState = container.resolve(TeamState),
@@ -190,7 +192,7 @@ export class ConversationRepository {
     this.messageRepository.setClientMismatchHandler(async (mismatch, conversation, silent, consentType) => {
       //we filter out self client id to omit it in mismatch check
       const {userId, clientId} = this.core;
-      const domain = userState.self().domain;
+      const domain = userState.self()?.domain;
 
       const selfClient = {domain, userId, clientId};
       const filteredMissing = mismatch.missing && removeClientFromUserClientMap(mismatch.missing, selfClient);
@@ -244,7 +246,7 @@ export class ConversationRepository {
         if (wasVerified && newDevices.length) {
           // if the conversation is verified but some clients were missing, it means the conversation will degrade.
           // We need to warn the user of the degradation and ask his permission to actually send the message
-          conversation.verification_state(ConversationVerificationState.DEGRADED);
+          conversation?.verification_state(ConversationVerificationState.DEGRADED);
         }
         if (conversation) {
           const hasChangedLegalHoldStatus = conversation.legalHoldStatus() !== legalHoldStatus;
@@ -263,13 +265,24 @@ export class ConversationRepository {
     this.logger = getLogger('ConversationRepository');
 
     this.event_mapper = new EventMapper();
-    this.verificationStateHandler = new ConversationVerificationStateHandler(
-      this.eventRepository,
+
+    // we register and store a handler, that we can manually trigger for incoming events from proteus and mixed conversations
+    this.proteusVerificationStateHandler = new ProteusConversationVerificationStateHandler(
+      this.onConversationVerificationStateChange,
       this.userState,
       this.conversationState,
     );
+
+    if (supportsMLS()) {
+      // we register a handler that will handle MLS conversations on its own
+      registerMLSConversationVerificationStateHandler(
+        this.onConversationVerificationStateChange,
+        this.conversationState,
+        this.core,
+      );
+    }
+
     this.isBlockingNotificationHandling = true;
-    this.conversationsWithNewEvents = new Map();
 
     this.teamState.isTeam.subscribe(() => this.mapGuestStatusSelf());
 
@@ -289,7 +302,6 @@ export class ConversationRepository {
     );
 
     this.conversationRoleRepository = new ConversationRoleRepository(this.teamRepository, this.conversationService);
-    this.leaveCall = noop;
 
     if (this.core.backendFeatures.isFederated) {
       this.scheduleMissingUsersAndConversationsMetadataRefresh();
@@ -317,6 +329,10 @@ export class ConversationRepository {
     window.addEventListener<any>(WebAppEvents.CONVERSATION.JOIN, this.onConversationJoin);
   }
 
+  public initMLSConversationRecoveredListener() {
+    return this.conversationService.addMLSConversationRecoveredListener(this.onMLSConversationRecovered);
+  }
+
   private readonly updateLocalMessageEntity = async ({
     obj: updatedEvent,
     oldObj: oldEvent,
@@ -418,7 +434,7 @@ export class ConversationRepository {
        * ToDo: Fetch all MLS Events from backend before doing anything else
        * Needs to be done to receive the latest epoch and avoid epoch mismatch errors
        */
-      let response: MLSReturnType;
+      let response: MLSCreateConversationResponse;
       const isMLSConversation = payload.protocol === ConversationProtocol.MLS;
       if (isMLSConversation) {
         response = await this.core.service!.conversation.createMLSConversation(
@@ -427,7 +443,8 @@ export class ConversationRepository {
           this.core.clientId,
         );
       } else {
-        response = {conversation: await this.core.service!.conversation.createProteusConversation(payload), events: []};
+        const {conversation, failedToAdd} = await this.core.service!.conversation.createProteusConversation(payload);
+        response = {conversation, events: [], failedToAdd};
       }
 
       const {conversationEntity} = await this.onCreate({
@@ -443,16 +460,12 @@ export class ConversationRepository {
         time: new Date().toISOString(),
         type: CONVERSATION_EVENT.CREATE,
       });
-      if (isMLSConversation && conversationEntity.groupId) {
-        // since we are the creator of the conversation, we can safely mark it as established
-        useMLSConversationState.getState().markAsEstablished(conversationEntity.groupId);
-      }
 
-      const {failed_to_add: failedToAddUsers} = response.conversation;
+      const {failedToAdd} = response;
 
-      if (failedToAddUsers && failedToAddUsers.length > 0) {
+      if (failedToAdd) {
         const failedToAddUsersEvent = EventBuilder.buildFailedToAddUsersEvent(
-          failedToAddUsers,
+          failedToAdd,
           conversationEntity,
           this.userState.self().id,
         );
@@ -461,23 +474,20 @@ export class ConversationRepository {
 
       return conversationEntity;
     } catch (error) {
-      if (!isBackendError(error)) {
-        this.logger.error(error);
-        throw error;
-      }
-
-      switch (error.label) {
-        case BackendErrorLabel.CLIENT_ERROR:
-          this.handleTooManyMembersError();
-          break;
-        case BackendErrorLabel.NOT_CONNECTED:
-          await this.handleUsersNotConnected(userEntities.map(user => user.qualifiedId));
-          break;
-        case BackendErrorLabel.LEGAL_HOLD_MISSING_CONSENT:
-          this.showLegalHoldConsentError();
-          break;
-        default:
-          this.logger.error(error);
+      if (isBackendError(error)) {
+        switch (error.label) {
+          case BackendErrorLabel.CLIENT_ERROR:
+            this.handleTooManyMembersError();
+            break;
+          case BackendErrorLabel.NOT_CONNECTED:
+            await this.handleUsersNotConnected(userEntities.map(user => user.qualifiedId));
+            break;
+          case BackendErrorLabel.LEGAL_HOLD_MISSING_CONSENT:
+            this.showLegalHoldConsentError();
+            break;
+          default:
+            this.logger.error(error);
+        }
       }
       throw error;
     }
@@ -542,7 +552,7 @@ export class ConversationRepository {
       const response = await this.conversationService.getConversationById(qualifiedId);
       const [conversationEntity] = this.mapConversations([response]);
 
-      this.saveConversation(conversationEntity);
+      await this.saveConversation(conversationEntity);
 
       fetching_conversations[conversationId].forEach(({resolveFn}) => resolveFn(conversationEntity));
       delete fetching_conversations[conversationId];
@@ -861,7 +871,7 @@ export class ConversationRepository {
    */
   private readonly onUnblockUser = async (user_et: User): Promise<void> => {
     const conversationEntity = await this.get1To1Conversation(user_et);
-    if (typeof conversationEntity !== 'boolean') {
+    if (conversationEntity) {
       conversationEntity.status(ConversationStatus.CURRENT_MEMBER);
     }
   };
@@ -935,7 +945,7 @@ export class ConversationRepository {
       return;
     }
 
-    this.leaveCall(conversationEntity.qualifiedId, LEAVE_CALL_REASON.USER_MANUALY_LEFT_CONVERSATION);
+    this.callingRepository.leaveCall(conversationEntity.qualifiedId, LEAVE_CALL_REASON.USER_MANUALY_LEFT_CONVERSATION);
 
     if (this.conversationState.isActiveConversation(conversationEntity)) {
       const nextConversation = this.getNextConversation(conversationEntity);
@@ -1086,52 +1096,63 @@ export class ConversationRepository {
    * @param userEntity User entity for whom to get the conversation
    * @returns Resolves with the conversation with requested user
    */
-  async get1To1Conversation(userEntity: User): Promise<Conversation | false> {
-    const inCurrentTeam = userEntity.inTeam() && userEntity.teamId === this.userState.self().teamId;
+  async get1To1Conversation(userEntity: User): Promise<Conversation | null> {
+    const selfUser = this.userState.self();
+    const inCurrentTeam = userEntity.inTeam() && !!selfUser && userEntity.teamId === selfUser.teamId;
 
     if (inCurrentTeam) {
-      const matchingConversationEntity = this.conversationState.conversations().find(conversationEntity => {
-        if (!conversationEntity.is1to1()) {
-          // Disregard conversations that are not 1:1
-          return false;
-        }
-
-        const inTeam = ConversationFilter.isInTeam(conversationEntity, userEntity);
-        if (!inTeam) {
-          // Disregard conversations that are not in the team
-          return false;
-        }
-
-        const isActiveConversation = !conversationEntity.removed_from_conversation();
-        if (!isActiveConversation) {
-          // Disregard conversations that self is no longer part of
-          return false;
-        }
-
-        return ConversationFilter.is1To1WithUser(conversationEntity, userEntity);
-      });
-
-      if (matchingConversationEntity) {
-        return matchingConversationEntity;
-      }
-      return this.createGroupConversation([userEntity]);
+      return this.getOrCreateProteusTeam1to1Conversation(userEntity);
     }
 
     const conversationId = userEntity.connection().conversationId;
     try {
       const conversationEntity = await this.getConversationById(conversationId);
       conversationEntity.connection(userEntity.connection());
-      this.updateParticipatingUserEntities(conversationEntity);
+      await this.updateParticipatingUserEntities(conversationEntity);
       return conversationEntity;
     } catch (error) {
-      const isConversationNotFound = error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
+      const isConversationNotFound =
+        error instanceof ConversationError && error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
       if (!isConversationNotFound) {
         throw error;
       }
-      return false;
+      return null;
     }
   }
 
+  /**
+   * Get or create a proteus team 1to1 conversation with a user. If a conversation does not exist, it will be created.
+   * @param userEntity User entity for whom to get the conversation
+   * @returns Resolves with the conversation with requested user
+   */
+  private async getOrCreateProteusTeam1to1Conversation(userEntity: User): Promise<Conversation> {
+    const matchingConversationEntity = this.conversationState.conversations().find(conversationEntity => {
+      if (!conversationEntity.is1to1()) {
+        // Disregard conversations that are not 1:1
+        return false;
+      }
+
+      const inTeam = ConversationFilter.isInTeam(conversationEntity, userEntity);
+      if (!inTeam) {
+        // Disregard conversations that are not in the team
+        return false;
+      }
+
+      const isActiveConversation = !conversationEntity.removed_from_conversation();
+      if (!isActiveConversation) {
+        // Disregard conversations that self is no longer part of
+        return false;
+      }
+
+      return ConversationFilter.is1To1WithUser(conversationEntity, userEntity);
+    });
+
+    if (matchingConversationEntity) {
+      return matchingConversationEntity;
+    }
+    return this.createGroupConversation([userEntity]);
+  }
+
   /**
    * Check whether message has been read.
    *
@@ -1247,46 +1268,62 @@ export class ConversationRepository {
     }
   };
 
+  private readonly getConnectionConversation = (connectionEntity: ConnectionEntity) => {
+    const {conversationId} = connectionEntity;
+
+    const localConversation = this.conversationState.findConversation(conversationId);
+
+    if (localConversation) {
+      return localConversation;
+    }
+
+    if (connectionEntity.isConnected() || connectionEntity.isOutgoingRequest()) {
+      return this.fetchConversationById(conversationId);
+    }
+
+    return undefined;
+  };
+
   /**
    * Maps user connection to the corresponding conversation.
    *
    * @note If there is no conversation it will request it from the backend
+   *
+   * @param connectionEntity Connection entity
+   * @param source Event source that has triggered the mapping
    * @returns Resolves when connection was mapped return value
    */
-  private readonly mapConnection = (connectionEntity: ConnectionEntity): Promise<Conversation | undefined> => {
-    const qualifiedId: QualifiedId = connectionEntity.conversationId;
-    return Promise.resolve(this.conversationState.findConversation(qualifiedId))
-      .then(conversationEntity => {
-        if (!conversationEntity) {
-          if (connectionEntity.isConnected() || connectionEntity.isOutgoingRequest()) {
-            return this.fetchConversationById(qualifiedId);
-          }
-        }
-        return conversationEntity;
-      })
-      .then(conversationEntity => {
-        if (!conversationEntity) {
-          return undefined;
-        }
-        conversationEntity.connection(connectionEntity);
-
-        if (connectionEntity.isConnected()) {
-          conversationEntity.type(CONVERSATION_TYPE.ONE_TO_ONE);
-        }
+  private readonly mapConnection = async (
+    connectionEntity: ConnectionEntity,
+    source?: EventSource,
+  ): Promise<Conversation | undefined> => {
+    try {
+      const conversation = await this.getConnectionConversation(connectionEntity);
 
-        return this.updateParticipatingUserEntities(conversationEntity);
-      })
-      .then(updatedConversationEntity => {
-        this.conversationState.conversations.notifySubscribers();
-        return updatedConversationEntity;
-      })
-      .catch(error => {
-        const isConversationNotFound = error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
-        if (!isConversationNotFound) {
-          throw error;
-        }
+      if (!conversation) {
         return undefined;
-      });
+      }
+
+      conversation.connection(connectionEntity);
+
+      if (connectionEntity.isConnected()) {
+        conversation.type(CONVERSATION_TYPE.ONE_TO_ONE);
+      }
+
+      const updatedConversation = await this.updateParticipatingUserEntities(conversation);
+
+      this.conversationState.conversations.notifySubscribers();
+
+      return updatedConversation;
+    } catch (error) {
+      const isConversationNotFound =
+        error instanceof ConversationError && error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
+      if (!isConversationNotFound) {
+        throw error;
+      }
+
+      return undefined;
+    }
   };
 
   /**
@@ -1398,9 +1435,6 @@ export class ConversationRepository {
     const isFetchingFromStream = handlingState !== NOTIFICATION_HANDLING_STATE.WEB_SOCKET;
 
     if (this.isBlockingNotificationHandling !== isFetchingFromStream) {
-      if (!isFetchingFromStream) {
-        this.checkChangedConversations();
-      }
       this.isBlockingNotificationHandling = isFetchingFromStream;
       this.logger.info(`Block handling of conversation events: ${this.isBlockingNotificationHandling}`);
     }
@@ -1436,6 +1470,30 @@ export class ConversationRepository {
   // Send events
   //##############################################################################
 
+  private onConversationVerificationStateChange: OnConversationVerificationStateChange = async ({
+    conversationEntity,
+    conversationVerificationState,
+    verificationMessageType,
+    userIds = [],
+  }) => {
+    switch (conversationVerificationState) {
+      case ConversationVerificationState.VERIFIED:
+        const allVerifiedEvent = EventBuilder.buildAllVerified(conversationEntity);
+        await this.eventRepository.injectEvent(allVerifiedEvent);
+        break;
+      case ConversationVerificationState.DEGRADED:
+        if (verificationMessageType) {
+          const event = EventBuilder.buildDegraded(conversationEntity, userIds, verificationMessageType);
+          await this.eventRepository.injectEvent(event);
+        } else {
+          this.logger.error('onConversationVerificationStateChange: Missing verificationMessageType while degrading');
+        }
+        break;
+      default:
+        break;
+    }
+  };
+
   /**
    * Add users to an existing conversation.
    *
@@ -1464,12 +1522,19 @@ export class ConversationRepository {
           events.forEach(event => this.eventRepository.injectEvent(event));
         }
       } else {
-        const conversationMemberJoinEvent = await this.core.service!.conversation.addUsersToProteusConversation({
-          conversationId,
-          qualifiedUsers,
-        });
-        if (conversationMemberJoinEvent) {
-          this.eventRepository.injectEvent(conversationMemberJoinEvent, EventRepository.SOURCE.BACKEND_RESPONSE);
+        const {failedToAdd, event: memberJoinEvent} =
+          await this.core.service!.conversation.addUsersToProteusConversation({
+            conversationId,
+            qualifiedUsers,
+          });
+        if (memberJoinEvent) {
+          await this.eventRepository.injectEvent(memberJoinEvent, EventRepository.SOURCE.BACKEND_RESPONSE);
+        }
+        if (failedToAdd) {
+          await this.eventRepository.injectEvent(
+            EventBuilder.buildFailedToAddUsersEvent(failedToAdd, conversation, this.userState.self().id),
+            EventRepository.SOURCE.INJECTED,
+          );
         }
       }
     } catch (error) {
@@ -1548,24 +1613,15 @@ export class ConversationRepository {
    * @note According to spec we archive a conversation when we clear it.
    * It will be unarchived once it is opened through search. We use the archive flag to distinguish states.
    *
-   * @param conversationEntity Conversation to clear
+   * @param conversation Conversation to clear
    * @param leaveConversation Should we leave the conversation before clearing the content?
    */
-  public async clearConversation(conversationEntity: Conversation, leaveConversation = false) {
-    const isActiveConversation = this.conversationState.isActiveConversation(conversationEntity);
-    const nextConversationEntity = this.getNextConversation(conversationEntity);
-
-    if (leaveConversation) {
-      conversationEntity.status(ConversationStatus.PAST_MEMBER);
-      this.leaveCall(conversationEntity.qualifiedId, LEAVE_CALL_REASON.USER_MANUALY_LEFT_CONVERSATION);
-    }
-
-    await this.messageRepository.updateClearedTimestamp(conversationEntity);
-    await this._clearConversation(conversationEntity);
+  public async clearConversation(conversation: Conversation) {
+    const isActiveConversation = this.conversationState.isActiveConversation(conversation);
+    const nextConversationEntity = this.getNextConversation(conversation);
 
-    if (leaveConversation) {
-      await this.removeMember(conversationEntity, this.userState.self().qualifiedId);
-    }
+    await this.messageRepository.updateClearedTimestamp(conversation);
+    await this._clearConversation(conversation);
 
     if (isActiveConversation) {
       amplify.publish(WebAppEvents.CONVERSATION.SHOW, nextConversationEntity, {});
@@ -1588,74 +1644,67 @@ export class ConversationRepository {
    * @param userId ID of member to be removed from the conversation
    * @returns Resolves when member was removed from the conversation
    */
-  private async removeMemberFromMLSConversation(conversationEntity: Conversation, userId: QualifiedId) {
+  private async removeMembersFromMLSConversation(conversationEntity: MLSConversation, userIds: QualifiedId[]) {
     const {groupId, qualifiedId} = conversationEntity;
     const {events} = await this.core.service!.conversation.removeUsersFromMLSConversation({
       conversationId: qualifiedId,
       groupId,
-      qualifiedUserIds: [userId],
+      qualifiedUserIds: userIds,
     });
 
-    if (!!events.length) {
-      events.forEach(event => this.eventRepository.injectEvent(event));
-    }
+    return events;
   }
 
   /**
    * Remove a member from a Proteus conversation
    *
-   * @param conversationEntity Conversation to remove member from
+   * @param conversation Conversation to remove member from
    * @param userId ID of member to be removed from the conversation
    * @returns Resolves when member was removed from the conversation
    */
-  private async removeMemberFromConversation(conversationEntity: Conversation, userId: QualifiedId) {
-    const response = await this.core.service!.conversation.removeUserFromConversation(
-      conversationEntity.qualifiedId,
-      userId,
+  private async removeMembersFromConversation(conversation: Conversation, userIds: QualifiedId[]) {
+    return await Promise.all(
+      userIds.map(async userId => {
+        const event = await this.core.service!.conversation.removeUserFromConversation(
+          conversation.qualifiedId,
+          userId,
+        );
+        const roles = conversation.roles();
+        delete roles[userId.id];
+        conversation.roles(roles);
+        return event;
+      }),
     );
-    const roles = conversationEntity.roles();
-    delete roles[userId.id];
-    conversationEntity.roles(roles);
-    const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
-    const event = response || EventBuilder.buildMemberLeave(conversationEntity, userId, true, currentTimestamp);
-    await this.eventRepository.injectEvent(event, EventRepository.SOURCE.BACKEND_RESPONSE);
-    return event;
   }
 
   /**
    * Remove the current user from a conversation.
    *
-   * @param conversationEntity Conversation to remove user from
+   * @param conversation Conversation to remove user from
    * @param clearContent Should we clear the conversation content from the database?
    * @returns Resolves when user was removed from the conversation
    */
-  private async leaveConversation(conversationEntity: Conversation, clearContent: boolean) {
+  public async leaveConversation(conversation: Conversation) {
     const userQualifiedId = this.userState.self().qualifiedId;
 
-    return clearContent
-      ? this.clearConversation(conversationEntity, true)
-      : this.removeMemberFromConversation(conversationEntity, userQualifiedId);
+    const events = await this.removeMembersFromConversation(conversation, [userQualifiedId]);
+    await this.eventRepository.injectEvents(events, EventRepository.SOURCE.BACKEND_RESPONSE);
   }
 
   /**
-   * Umbrella function to remove a member from a conversation, no matter the protocol or type.
+   * Umbrella function to remove a member from a conversation (from backend and locally), no matter the protocol or type.
    *
    * @param conversationEntity Conversation to remove member from
    * @param userId ID of member to be removed from the conversation
    * @param clearContent Should we clear the conversation content from the database?
    * @returns Resolves when member was removed from the conversation
    */
-  public async removeMember(conversationEntity: Conversation, userId: QualifiedId, clearContent: boolean = false) {
-    const isUserLeaving = this.userState.self().qualifiedId.id === userId.id;
-    const isMLSConversation = conversationEntity.isUsingMLSProtocol;
+  public async removeMembers(conversationEntity: Conversation, userIds: QualifiedId[]) {
+    const events = isMLSConversation(conversationEntity)
+      ? await this.removeMembersFromMLSConversation(conversationEntity, userIds)
+      : await this.removeMembersFromConversation(conversationEntity, userIds);
 
-    if (isUserLeaving) {
-      return this.leaveConversation(conversationEntity, clearContent);
-    }
-
-    return isMLSConversation
-      ? this.removeMemberFromMLSConversation(conversationEntity, userId)
-      : this.removeMemberFromConversation(conversationEntity, userId);
+    await this.eventRepository.injectEvents(events, EventRepository.SOURCE.BACKEND_RESPONSE);
   }
 
   /**
@@ -1672,7 +1721,7 @@ export class ConversationRepository {
       const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
       const event = hasResponse
         ? response.event
-        : EventBuilder.buildMemberLeave(conversationEntity, user, true, currentTimestamp);
+        : EventBuilder.buildMemberLeave(conversationEntity, [user], this.userState.self().id, currentTimestamp);
 
       this.eventRepository.injectEvent(event, EventRepository.SOURCE.BACKEND_RESPONSE);
       return event;
@@ -1707,7 +1756,10 @@ export class ConversationRepository {
   ): Promise<ConversationMessageTimerUpdateEvent> {
     messageTimer = ConversationEphemeralHandler.validateTimer(messageTimer);
 
-    const response = await this.conversationService.updateConversationMessageTimer(conversationEntity.id, messageTimer);
+    const response = await this.conversationService.updateConversationMessageTimer(
+      conversationEntity.qualifiedId,
+      messageTimer,
+    );
     if (response) {
       this.eventRepository.injectEvent(response, EventRepository.SOURCE.BACKEND_RESPONSE);
     }
@@ -1718,7 +1770,10 @@ export class ConversationRepository {
     conversationEntity: Conversation,
     receiptMode: ConversationReceiptModeUpdateData,
   ) {
-    const response = await this.conversationService.updateConversationReceiptMode(conversationEntity.id, receiptMode);
+    const response = await this.conversationService.updateConversationReceiptMode(
+      conversationEntity.qualifiedId,
+      receiptMode,
+    );
     if (response) {
       this.eventRepository.injectEvent(response, EventRepository.SOURCE.BACKEND_RESPONSE);
     }
@@ -1780,7 +1835,7 @@ export class ConversationRepository {
     };
 
     try {
-      await this.conversationService.updateMemberProperties(conversationEntity.id, payload);
+      await this.conversationService.updateMemberProperties(conversationEntity.qualifiedId, payload);
       const response = {data: payload, from: this.userState.self().id};
       this.onMemberUpdate(conversationEntity, response);
 
@@ -1857,7 +1912,7 @@ export class ConversationRepository {
       otr_archived_ref: new Date(archiveTimestamp).toISOString(),
     };
 
-    const conversationId = conversationEntity.id;
+    const conversationId = conversationEntity.qualifiedId;
 
     const updatePromise = conversationEntity.removed_from_conversation()
       ? Promise.resolve()
@@ -1879,16 +1934,6 @@ export class ConversationRepository {
     this.onMemberUpdate(conversationEntity, response);
   }
 
-  private checkChangedConversations() {
-    this.conversationsWithNewEvents.forEach(conversationEntity => {
-      if (conversationEntity.shouldUnarchive()) {
-        this.unarchiveConversation(conversationEntity, false, ConversationRepository.eventFromStreamMessage);
-      }
-    });
-
-    this.conversationsWithNewEvents.clear();
-  }
-
   /**
    * Clears conversation content from view and the database.
    *
@@ -2011,6 +2056,7 @@ export class ConversationRepository {
       // Prevent logging typing events
       return;
     }
+
     const {time, from, qualified_conversation, type} = event;
     const extra: Record<string, unknown> = {};
     extra.messageId = 'id' in event && event.id;
@@ -2057,26 +2103,15 @@ export class ConversationRepository {
     }
 
     const {conversation, qualified_conversation, data: eventData, type} = eventJson;
+    const dataConversationId: string = (eventData as any)?.conversationId;
     // data.conversationId is always the conversationId that should be read first. If not found we can fallback to qualified_conversation or conversation
-    const conversationId: QualifiedId = eventData?.conversationId
-      ? {domain: '', id: eventData.conversationId}
+    const conversationId: QualifiedId = dataConversationId
+      ? {domain: '', id: dataConversationId}
       : qualified_conversation || {domain: '', id: conversation};
 
     const inSelfConversation = this.conversationState.isSelfConversation(conversationId);
     if (inSelfConversation) {
-      const typesInSelfConversation = [
-        CONVERSATION_EVENT.MEMBER_UPDATE,
-        ClientEvent.CONVERSATION.MESSAGE_HIDDEN,
-        /**
-         * As of today (07/07/2022) the backend sends `WELCOME` message to the user's own
-         * conversation (not the actual conversation that the welcome should be part of)
-         */
-        CONVERSATION_EVENT.MLS_WELCOME_MESSAGE,
-      ];
-
-      if (type === CONVERSATION_EVENT.MLS_WELCOME_MESSAGE) {
-        useMLSConversationState.getState().markAsEstablished(eventData);
-      }
+      const typesInSelfConversation = [CONVERSATION_EVENT.MEMBER_UPDATE, ClientEvent.CONVERSATION.MESSAGE_HIDDEN];
 
       const isExpectedType = typesInSelfConversation.includes(type);
       if (!isExpectedType) {
@@ -2093,21 +2128,21 @@ export class ConversationRepository {
     const onEventPromise = isConversationCreate
       ? Promise.resolve(null)
       : this.getConversationById(conversationId, true);
-    let previouslyArchived = false;
 
     return onEventPromise
       .then((conversationEntity: Conversation) => {
         if (conversationEntity) {
-          // Check if conversation was archived
-          previouslyArchived = conversationEntity.is_archived();
-          const isPastMemberStatus = conversationEntity.status() === ConversationStatus.PAST_MEMBER;
-          const isMemberJoinType = type === CONVERSATION_EVENT.MEMBER_JOIN;
-
-          if (previouslyArchived && isPastMemberStatus && isMemberJoinType) {
-            this.unarchiveConversation(conversationEntity, false, ConversationRepository.eventFromStreamMessage);
-          }
           const isBackendTimestamp = eventSource !== EventSource.INJECTED;
-          if (type !== CONVERSATION_EVENT.MEMBER_JOIN && type !== CONVERSATION_EVENT.MEMBER_LEAVE) {
+
+          const eventsToSkip: (CLIENT_CONVERSATION_EVENT | CONVERSATION_EVENT)[] = [
+            CONVERSATION_EVENT.MEMBER_LEAVE,
+            CONVERSATION_EVENT.MEMBER_JOIN,
+            CONVERSATION_EVENT.DELETE,
+          ];
+
+          const shouldUpdateTimestampServer = !eventsToSkip.includes(type);
+
+          if (shouldUpdateTimestampServer) {
             conversationEntity.updateTimestampServer(eventJson.server_time || eventJson.time, isBackendTimestamp);
           }
         }
@@ -2122,7 +2157,7 @@ export class ConversationRepository {
       )
       .then((entityObject = {} as EntityObject) => {
         if (type !== CONVERSATION_EVENT.MEMBER_JOIN && type !== CONVERSATION_EVENT.MEMBER_LEAVE) {
-          this.handleConversationNotification(entityObject as EntityObject, eventSource, previouslyArchived);
+          this.handleConversationNotification(entityObject as EntityObject, eventSource);
         }
       })
       .catch((error: BaseError) => {
@@ -2172,18 +2207,15 @@ export class ConversationRepository {
       const isFromUnknownUser = allParticipants.every(participant => participant.id !== senderId);
 
       if (isFromUnknownUser) {
-        const membersUpdateMessages = [
-          CONVERSATION_EVENT.MEMBER_LEAVE,
-          CONVERSATION_EVENT.MEMBER_JOIN,
-          ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE,
-        ];
-        const isMembersUpdateEvent = membersUpdateMessages.includes(eventJson.type);
-        if (isMembersUpdateEvent) {
-          const isFromUpdatedMember = eventJson.data.user_ids?.includes(senderId);
-          if (isFromUpdatedMember) {
-            // we ignore leave/join events that are sent by the user actually leaving or joining
-            return conversationEntity;
-          }
+        switch (eventJson.type) {
+          case CONVERSATION_EVENT.MEMBER_LEAVE:
+          case CONVERSATION_EVENT.MEMBER_JOIN:
+          case ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE:
+            const isFromUpdatedMember = eventJson.data.user_ids?.includes(senderId);
+            if (isFromUpdatedMember) {
+              // we ignore leave/join events that are sent by the user actually leaving or joining
+              return conversationEntity;
+            }
         }
 
         const message = `Received '${type}' event from user '${senderId}' unknown in '${conversationEntity.id}'`;
@@ -2220,7 +2252,7 @@ export class ConversationRepository {
       data: {legal_hold_status: messageLegalHoldStatus},
       from: userId,
       time: isoTimestamp,
-    } = eventJson;
+    } = eventJson as any;
     const timestamp = new Date(isoTimestamp).getTime();
     const qualifiedConversation = qualified_conversation || {domain: '', id: conversationId};
     const qualifiedUser = qualified_from || {domain: '', id: userId};
@@ -2325,9 +2357,11 @@ export class ConversationRepository {
       case ClientEvent.CONVERSATION.KNOCK:
       case ClientEvent.CONVERSATION.CALL_TIME_OUT:
       case ClientEvent.CONVERSATION.FAILED_TO_ADD_USERS:
+      case ClientEvent.CONVERSATION.FEDERATION_STOP:
       case ClientEvent.CONVERSATION.LEGAL_HOLD_UPDATE:
       case ClientEvent.CONVERSATION.LOCATION:
       case ClientEvent.CONVERSATION.MISSED_MESSAGES:
+      case ClientEvent.CONVERSATION.MLS_CONVERSATION_RECOVERED:
       case ClientEvent.CONVERSATION.UNABLE_TO_DECRYPT:
       case ClientEvent.CONVERSATION.VERIFICATION:
       case ClientEvent.CONVERSATION.VOICE_CHANNEL_ACTIVATE:
@@ -2358,14 +2392,9 @@ export class ConversationRepository {
    *
    * @param entityObject Object containing the conversation and the message that are targeted by the event
    * @param eventSource Source of event
-   * @param previouslyArchived `true` if the previous state of the conversation was archived
    * @returns Resolves when the conversation was updated
    */
-  private async handleConversationNotification(
-    entityObject: EntityObject,
-    eventSource: EventSource,
-    previouslyArchived: boolean,
-  ) {
+  private async handleConversationNotification(entityObject: EntityObject, eventSource: EventSource) {
     const {conversationEntity, messageEntity} = entityObject;
 
     if (conversationEntity) {
@@ -2387,18 +2416,6 @@ export class ConversationRepository {
           conversationEntity.cleared_timestamp(0);
         }
       }
-
-      // Check if event needs to be un-archived
-      if (previouslyArchived) {
-        // Add to check for un-archiving at the end of stream handling
-        if (eventFromStream) {
-          return this.conversationsWithNewEvents.set(conversationEntity.id, conversationEntity);
-        }
-
-        if (eventFromWebSocket && conversationEntity.shouldUnarchive()) {
-          return this.unarchiveConversation(conversationEntity, false, 'event from WebSocket');
-        }
-      }
     }
   }
 
@@ -2416,6 +2433,22 @@ export class ConversationRepository {
       });
   };
 
+  /**
+   * Add "mls conversation recovered" system message to conversation.
+   */
+  private readonly onMLSConversationRecovered = (conversationId: QualifiedId): void => {
+    const conversation = this.conversationState.findConversation(conversationId);
+
+    if (!conversation) {
+      return;
+    }
+    const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
+
+    const event = EventBuilder.buildMLSConversationRecovered(conversation, currentTimestamp);
+
+    void this.eventRepository.injectEvent(event);
+  };
+
   private on1to1Creation(conversationEntity: Conversation, eventJson: OneToOneCreationEvent) {
     return this.event_mapper
       .mapJsonEvent(eventJson, conversationEntity)
@@ -2467,7 +2500,7 @@ export class ConversationRepository {
           this.addCreationMessage(conversationEntity, false, initialTimestamp, eventSource);
         }
         await this.updateParticipatingUserEntities(conversationEntity);
-        this.verificationStateHandler.onConversationCreate(conversationEntity);
+        this.proteusVerificationStateHandler.onConversationCreate(conversationEntity);
         await this.saveConversation(conversationEntity);
       }
       return {conversationEntity};
@@ -2581,7 +2614,7 @@ export class ConversationRepository {
       .then(() => this.updateParticipatingUserEntities(conversationEntity, false, true))
       .then(() => this.addEventToConversation(conversationEntity, eventJson))
       .then(({messageEntity}) => {
-        this.verificationStateHandler.onMemberJoined(conversationEntity, qualifiedUserIds);
+        this.proteusVerificationStateHandler.onMemberJoined(conversationEntity, qualifiedUserIds);
         return {conversationEntity, messageEntity};
       });
   }
@@ -2599,21 +2632,12 @@ export class ConversationRepository {
       throw new Error(`groupId not found for MLS conversation ${conversation.id}`);
     }
 
-    const isMLSConversationEstablished = await this.core.service!.conversation.isMLSConversationEstablished(groupId);
+    const doesMLSGroupExistLocally = await this.conversationService.mlsGroupExistsLocally(groupId);
 
-    if (!isMLSConversationEstablished) {
+    if (!doesMLSGroupExistLocally) {
       return;
     }
 
-    const mlsConversationState = useMLSConversationState.getState();
-
-    const isMLSConversationMarkedAsEstablished = mlsConversationState.isEstablished(groupId);
-
-    if (!isMLSConversationMarkedAsEstablished) {
-      // If the conversation was not previously marked as established and the core if aware of this conversation, we can mark is as established
-      mlsConversationState.markAsEstablished(groupId);
-    }
-
     if (isSelfJoin) {
       // if user has joined and was also event creator (eg. joined via guest link) we need to add its other clients to mls group
       try {
@@ -2647,7 +2671,7 @@ export class ConversationRepository {
 
     if (removesSelfUser) {
       conversationEntity.status(ConversationStatus.PAST_MEMBER);
-      this.leaveCall(
+      this.callingRepository.leaveCall(
         conversationEntity.qualifiedId,
         LEAVE_CALL_REASON.USER_IS_REMOVED_BY_AN_ADMIN_OR_LEFT_ON_ANOTHER_CLIENT,
       );
@@ -2660,6 +2684,12 @@ export class ConversationRepository {
         await this.conversationService.wipeMLSConversation(conversationEntity);
       }
     } else {
+      /**
+       * @note We have to call pushClients -> setClientsForConv avs api whenever
+       * someone is removed from the conversation in order to make conference calling
+       * encryption keys rotate on involuntary participant leave.
+       */
+      await this.callingRepository.pushClients();
       // Update conversation roles (in case the removed user had some special role and it's not the self user)
       await this.conversationRoleRepository.updateConversationRoles(conversationEntity);
     }
@@ -2679,11 +2709,7 @@ export class ConversationRepository {
 
       await this.updateParticipatingUserEntities(conversationEntity);
 
-      this.verificationStateHandler.onMemberLeft(conversationEntity);
-
-      if (isFromSelf && conversationEntity.removed_from_conversation()) {
-        this.archiveConversation(conversationEntity);
-      }
+      this.proteusVerificationStateHandler.onMemberLeft(conversationEntity);
 
       return {conversationEntity, messageEntity};
     }
diff --git a/src/script/conversation/ConversationService.ts b/src/script/conversation/ConversationService.ts
index 86e16bcf8ad..9c771e566e4 100644
--- a/src/script/conversation/ConversationService.ts
+++ b/src/script/conversation/ConversationService.ts
@@ -50,7 +50,6 @@ import {MLSConversation} from './ConversationSelectors';
 import type {Conversation as ConversationEntity} from '../entity/Conversation';
 import type {EventService} from '../event/EventService';
 import {MessageCategory} from '../message/MessageCategory';
-import {useMLSConversationState} from '../mls';
 import {search as fullTextSearch} from '../search/FullTextSearch';
 import {APIClient} from '../service/APIClientSingleton';
 import {Core} from '../service/CoreSingleton';
@@ -72,6 +71,16 @@ export class ConversationService {
     this.logger = getLogger('ConversationService');
   }
 
+  private get coreConversationService() {
+    const conversationService = this.core.service?.conversation;
+
+    if (!conversationService) {
+      throw new Error('Conversation service not available');
+    }
+
+    return conversationService;
+  }
+
   //##############################################################################
   // Get conversations
   //##############################################################################
@@ -81,7 +90,7 @@ export class ConversationService {
    * @returns Resolves with the conversation information
    */
   async getAllConversations() {
-    return this.apiClient.api.conversation.getConversationList();
+    return this.coreConversationService.getConversations();
   }
 
   /**
@@ -125,7 +134,7 @@ export class ConversationService {
    * @returns Resolves with the server response
    */
   updateConversationMessageTimer(
-    conversationId: string,
+    conversationId: QualifiedId,
     message_timer: number,
   ): Promise<ConversationMessageTimerUpdateEvent> {
     return this.apiClient.api.conversation.putConversationMessageTimer(conversationId, {message_timer});
@@ -141,7 +150,7 @@ export class ConversationService {
    * @returns Resolves with the server response
    */
   updateConversationReceiptMode(
-    conversationId: string,
+    conversationId: QualifiedId,
     receiptMode: ConversationReceiptModeUpdateData,
   ): Promise<ConversationReceiptModeUpdateEvent> {
     return this.apiClient.api.conversation.putConversationReceiptMode(conversationId, receiptMode);
@@ -156,7 +165,7 @@ export class ConversationService {
    * @param payload Updated properties
    * @returns Resolves with the server response
    */
-  updateMemberProperties(conversationId: string, payload: Partial<ConversationMemberUpdateData>): Promise<void> {
+  updateMemberProperties(conversationId: QualifiedId, payload: Partial<ConversationMemberUpdateData>): Promise<void> {
     return this.apiClient.api.conversation.putMembershipProperties(conversationId, payload);
   }
 
@@ -407,7 +416,18 @@ export class ConversationService {
    */
   async wipeMLSConversation(mlsConversation: MLSConversation) {
     const {groupId} = mlsConversation;
-    await this.core.service!.conversation.wipeMLSConversation(groupId);
-    return useMLSConversationState.getState().wipeConversationState(groupId);
+    return this.coreConversationService.wipeMLSConversation(groupId);
+  }
+
+  public addMLSConversationRecoveredListener(onRecovered: (conversationId: QualifiedId) => void) {
+    this.coreConversationService.on('MLSConversationRecovered', ({conversationId}) => onRecovered(conversationId));
+  }
+
+  /**
+   * Checks if MLS conversation exists locally.
+   * @param groupId id of the MLS group
+   */
+  async mlsGroupExistsLocally(groupId: string): Promise<boolean> {
+    return this.coreConversationService.mlsGroupExistsLocally(groupId);
   }
 }
diff --git a/src/script/conversation/ConversationState.ts b/src/script/conversation/ConversationState.ts
index 4eb312d06ed..487d215b0d2 100644
--- a/src/script/conversation/ConversationState.ts
+++ b/src/script/conversation/ConversationState.ts
@@ -29,7 +29,6 @@ import {isMLSConversation, isSelfConversation} from './ConversationSelectors';
 
 import {Conversation} from '../entity/Conversation';
 import {User} from '../entity/User';
-import {useMLSConversationState} from '../mls';
 import {TeamState} from '../team/TeamState';
 import {UserState} from '../user/UserState';
 
@@ -72,16 +71,8 @@ export class ConversationState {
       this.conversations().find(conversation => isMLSConversation(conversation) && isSelfConversation(conversation)),
     );
 
-    //anytime mls conversation state changes, we update the sorted conversations that will recalculate visible conversations
-    useMLSConversationState.subscribe(() => {
-      this.sortedConversations.notifySubscribers();
-    });
-
     this.visibleConversations = ko.pureComputed(() => {
-      const filteredMLSConversations = useMLSConversationState
-        .getState()
-        .filterEstablishedConversations(this.sortedConversations());
-      return filteredMLSConversations.filter(
+      return this.sortedConversations().filter(
         conversation =>
           !conversation.is_cleared() &&
           !conversation.is_archived() &&
@@ -96,10 +87,7 @@ export class ConversationState {
     });
 
     this.archivedConversations = ko.pureComputed(() => {
-      const filteredMLSConversations = useMLSConversationState
-        .getState()
-        .filterEstablishedConversations(this.sortedConversations());
-      return filteredMLSConversations.filter(conversation => conversation.is_archived());
+      return this.sortedConversations().filter(conversation => conversation.is_archived());
     });
 
     this.filteredConversations = ko.pureComputed(() => {
@@ -111,6 +99,9 @@ export class ConversationState {
           ConnectionStatus.PENDING,
         ];
 
+        const isCleared = conversationEntity.is_cleared();
+        const isRemoved = conversationEntity.removed_from_conversation();
+
         if (
           isSelfConversation(conversationEntity) ||
           states_to_filter.includes(conversationEntity.connection().status())
@@ -118,7 +109,7 @@ export class ConversationState {
           return false;
         }
 
-        return !(conversationEntity.is_cleared() && conversationEntity.removed_from_conversation());
+        return !(isCleared && isRemoved);
       });
     });
 
diff --git a/src/script/conversation/ConversationStateHandler.ts b/src/script/conversation/ConversationStateHandler.ts
index da1177d2ec8..dc28daf24e6 100644
--- a/src/script/conversation/ConversationStateHandler.ts
+++ b/src/script/conversation/ConversationStateHandler.ts
@@ -128,7 +128,7 @@ export class ConversationStateHandler extends AbstractConversationEventHandler {
 
   private _mapConversationAccessState(
     conversationEntity: Conversation,
-    eventJson: ConversationEvent<ConversationAccessUpdateData>,
+    eventJson: ConversationEvent<CONVERSATION_EVENT.ACCESS_UPDATE, ConversationAccessUpdateData>,
   ): void {
     const {access: accessModes, ...roles} = eventJson.data;
     ConversationMapper.mapAccessState(conversationEntity, accessModes, roles?.access_role, roles?.access_role_v2);
@@ -140,7 +140,7 @@ export class ConversationStateHandler extends AbstractConversationEventHandler {
 
   private _updateConversationAccessCode(
     conversationEntity: Conversation,
-    eventJson: ConversationEvent<ConversationCode>,
+    eventJson: ConversationEvent<CONVERSATION_EVENT.CODE_UPDATE, ConversationCode>,
   ): void {
     ConversationMapper.mapAccessCode(conversationEntity, eventJson.data);
   }
diff --git a/src/script/conversation/ConversationVerificationStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler.ts
deleted file mode 100644
index 310a469aee1..00000000000
--- a/src/script/conversation/ConversationVerificationStateHandler.ts
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import type {QualifiedId} from '@wireapp/api-client/lib/user/';
-import {amplify} from 'amplify';
-import {container} from 'tsyringe';
-
-import {WebAppEvents} from '@wireapp/webapp-events';
-
-import {getLogger, Logger} from 'Util/Logger';
-import {matchQualifiedIds} from 'Util/QualifiedId';
-
-import {ConversationState} from './ConversationState';
-import {ConversationVerificationState} from './ConversationVerificationState';
-
-import type {ClientEntity} from '../client/ClientEntity';
-import {EventBuilder} from '../conversation/EventBuilder';
-import type {Conversation} from '../entity/Conversation';
-import type {EventRepository} from '../event/EventRepository';
-import {VerificationMessageType} from '../message/VerificationMessageType';
-import {UserState} from '../user/UserState';
-
-export class ConversationVerificationStateHandler {
-  private readonly logger: Logger;
-
-  constructor(
-    private readonly eventRepository: EventRepository,
-    private readonly userState = container.resolve(UserState),
-    private readonly conversationState = container.resolve(ConversationState),
-  ) {
-    this.logger = getLogger('ConversationVerificationStateHandler');
-
-    amplify.subscribe(WebAppEvents.USER.CLIENT_ADDED, this.onClientAdded);
-    amplify.subscribe(WebAppEvents.USER.CLIENT_REMOVED, this.onClientRemoved);
-    amplify.subscribe(WebAppEvents.USER.CLIENTS_UPDATED, this.onClientsUpdated);
-    amplify.subscribe(WebAppEvents.CLIENT.VERIFICATION_STATE_CHANGED, this.onClientVerificationChanged);
-  }
-
-  readonly onClientVerificationChanged = (userId: QualifiedId): void => {
-    this.getActiveConversationsWithUsers([userId]).forEach(({conversationEntity, userIds}) => {
-      const isStateChange = this.checkChangeToVerified(conversationEntity);
-      if (!isStateChange) {
-        this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.UNVERIFIED);
-      }
-    });
-  };
-
-  /**
-   * Self user or other participant added clients.
-   * @param userId ID of user that added client (can be self user ID)
-   */
-  readonly onClientAdded = (userId: QualifiedId, _clientEntity?: ClientEntity): void => {
-    this.onClientsAdded([userId]);
-  };
-
-  /**
-   * Multiple participants added clients.
-   * @param userIds Multiple user IDs (can include self user ID)
-   */
-  onClientsAdded(userIds: QualifiedId[]): void {
-    this.getActiveConversationsWithUsers(userIds).forEach(({conversationEntity, userIds: matchingUserIds}) => {
-      this.checkChangeToDegraded(conversationEntity, matchingUserIds, VerificationMessageType.NEW_DEVICE);
-    });
-  }
-
-  /**
-   * Self user removed a client or other participants deleted clients.
-   * @param userId ID of user that added client (can be self user ID)
-   */
-  readonly onClientRemoved = (userId: QualifiedId): void => {
-    this.getActiveConversationsWithUsers([userId]).forEach(({conversationEntity}) => {
-      this.checkChangeToVerified(conversationEntity);
-    });
-  };
-
-  /**
-   * A new conversation was created.
-   * @param conversationEntity New conversation entity
-   */
-  onConversationCreate(conversationEntity: Conversation): void {
-    this.checkChangeToVerified(conversationEntity);
-  }
-
-  /**
-   * Clients of a user were updated.
-   */
-  readonly onClientsUpdated = (userId: QualifiedId): void => {
-    this.getActiveConversationsWithUsers([userId]).forEach(({conversationEntity, userIds}) => {
-      const isStateChange = this.checkChangeToVerified(conversationEntity);
-      if (!isStateChange) {
-        this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.NEW_DEVICE);
-      }
-    });
-  };
-
-  /**
-   * New member(s) joined the conversation.
-   * @param conversationEntity Changed conversation entity
-   * @param userIds IDs of added members
-   */
-  onMemberJoined(conversationEntity: Conversation, userIds: QualifiedId[]): void {
-    this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.NEW_MEMBER);
-  }
-
-  /**
-   * Member(s) left the conversation.
-   * @param conversationEntity Changed conversation entity
-   */
-  onMemberLeft(conversationEntity: Conversation): void {
-    this.checkChangeToVerified(conversationEntity);
-  }
-
-  /**
-   * Change that could verify conversation.
-   *
-   * @param conversationEntity Changed conversation entity
-   * @returns `true` if state changed
-   */
-  private checkChangeToVerified(conversationEntity: Conversation): boolean {
-    if (this.willChangeToVerified(conversationEntity)) {
-      const allVerifiedEvent = EventBuilder.buildAllVerified(conversationEntity);
-      this.eventRepository.injectEvent(allVerifiedEvent);
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Change that could degrade conversation.
-   *
-   * @param conversationEntity Changed conversation entity
-   * @param userIds IDs of affected users
-   * @param type Type of degradation
-   * @returns `true` if state changed
-   */
-  private checkChangeToDegraded(
-    conversationEntity: Conversation,
-    userIds: QualifiedId[],
-    type: VerificationMessageType,
-  ): boolean {
-    const shouldShowDegradationWarning = type !== VerificationMessageType.UNVERIFIED;
-    const isConversationDegraded = this.willChangeToDegraded(conversationEntity, shouldShowDegradationWarning);
-
-    if (isConversationDegraded) {
-      /**
-       * TEMPORARY DEBUGGING FIX:
-       * We have seen conversations in a degraded state without an unverified device in there.
-       * Previously the code would hide this fact, not create a system message and then fail when it tried to prompt
-       * the user to grant subsequent message sending - essentially blocking the conversation.
-       *
-       * As we are unsure of the trigger of the degradation we temporarily throw an error to get to the bottom of this.
-       * The conversation is also reset to the verified state to ensure we can continue to send messages.
-       */
-      if (!userIds.length) {
-        conversationEntity.verification_state(ConversationVerificationState.VERIFIED);
-        throw new Error('Conversation degraded without affected users');
-      }
-
-      const event = EventBuilder.buildDegraded(conversationEntity, userIds, type);
-      this.eventRepository.injectEvent(event);
-
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Get all conversation where self user and the given users are active.
-   *
-   * @param userIds Multiple user IDs (can include self user ID)
-   * @returns Array of objects containing the conversation entities and matching user IDs
-   */
-  private getActiveConversationsWithUsers(
-    userIds: QualifiedId[],
-  ): {conversationEntity: Conversation; userIds: QualifiedId[]}[] {
-    return this.conversationState
-      .filteredConversations()
-      .map((conversationEntity: Conversation) => {
-        if (!conversationEntity.removed_from_conversation()) {
-          const userIdsInConversation = conversationEntity
-            .participating_user_ids()
-            .concat(this.userState.self().qualifiedId);
-          const matchingUserIds = userIdsInConversation.filter(userIdInConversation =>
-            userIds.find(userId => matchQualifiedIds(userId, userIdInConversation)),
-          );
-
-          if (!!matchingUserIds.length) {
-            return {conversationEntity, userIds: matchingUserIds};
-          }
-        }
-        return undefined;
-      })
-      .filter(activeConversationInfo => !!activeConversationInfo) as {
-      conversationEntity: Conversation;
-      userIds: QualifiedId[];
-    }[];
-  }
-
-  /**
-   * Check whether to degrade conversation and set corresponding state.
-   *
-   * @param conversationEntity Conversation entity to evaluate
-   * @param shouldShowDegradationWarning Should a modal warn about the degradation?
-   * @returns `true` if conversation state changed to degraded
-   */
-  private willChangeToDegraded(conversationEntity: Conversation, shouldShowDegradationWarning = true): boolean {
-    const state = conversationEntity.verification_state();
-    const isDegraded = state === ConversationVerificationState.DEGRADED;
-
-    if (isDegraded) {
-      return false;
-    }
-
-    // Explicit Boolean check to prevent state changes on undefined
-    const isStateVerified = state === ConversationVerificationState.VERIFIED;
-    const isConversationUnverified = conversationEntity.is_verified() === false;
-    if (isStateVerified && isConversationUnverified) {
-      conversationEntity.verification_state(
-        shouldShowDegradationWarning
-          ? ConversationVerificationState.DEGRADED
-          : ConversationVerificationState.UNVERIFIED,
-      );
-      this.logger.log(`Verification of conversation '${conversationEntity.id}' changed to degraded`);
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Check whether to verify conversation and set corresponding state
-   *
-   * @param conversationEntity Conversation entity to evaluate
-   * @returns `true` if conversation state changed to verified
-   */
-  private willChangeToVerified(conversationEntity: Conversation): boolean {
-    const state = conversationEntity.verification_state();
-    const isStateVerified = state === ConversationVerificationState.VERIFIED;
-    if (isStateVerified) {
-      return false;
-    }
-
-    // Explicit Boolean check to prevent state changes on undefined
-    const isConversationVerified = conversationEntity.is_verified() === true;
-    if (isConversationVerified) {
-      conversationEntity.verification_state(ConversationVerificationState.VERIFIED);
-      this.logger.log(`Verification state of conversation '${conversationEntity.id}' changed to verified`);
-      return true;
-    }
-
-    return false;
-  }
-}
diff --git a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.test.ts b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.test.ts
new file mode 100644
index 00000000000..23a82f48d3f
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.test.ts
@@ -0,0 +1,208 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
+
+import {ClientEntity} from 'src/script/client';
+import {Conversation} from 'src/script/entity/Conversation';
+import {User} from 'src/script/entity/User';
+import {Core} from 'src/script/service/CoreSingleton';
+import {createUuid} from 'Util/uuid';
+
+import {
+  MLSConversationVerificationStateHandler,
+  registerMLSConversationVerificationStateHandler,
+} from './MLSStateHandler';
+
+import {ConversationState} from '../../ConversationState';
+
+describe('MLSConversationVerificationStateHandler', () => {
+  const uuid = createUuid();
+  let handler: MLSConversationVerificationStateHandler;
+  let mockOnConversationVerificationStateChange: jest.Mock;
+  let mockConversationState: jest.Mocked<ConversationState>;
+  let mockCore: jest.Mocked<Core>;
+  const groupId = 'groupIdXYZ';
+  const clientEntityId = 'clientIdXYZ';
+  const selfClientEntityId = 'selfClientIdXYZ';
+  const clientEntity: ClientEntity = new ClientEntity(false, '', clientEntityId);
+  const selfClientEntity: ClientEntity = new ClientEntity(false, '', selfClientEntityId);
+  const conversation: Conversation = new Conversation(uuid, '', ConversationProtocol.MLS);
+
+  beforeEach(() => {
+    conversation.groupId = groupId;
+    conversation.getAllUserEntities = jest.fn().mockReturnValue([
+      {
+        devices: () => [clientEntity],
+      },
+    ]);
+    mockOnConversationVerificationStateChange = jest.fn();
+    // Mock the conversation state
+    mockConversationState = {
+      filteredConversations: () => [conversation],
+    } as unknown as jest.Mocked<ConversationState>;
+    mockCore = {
+      service: {
+        mls: {
+          on: jest.fn(),
+        },
+        e2eIdentity: {
+          getUserDeviceEntities: jest.fn().mockResolvedValue([
+            {
+              certificate: 'mockCertificate',
+              clientId: clientEntityId,
+            },
+            {
+              certificate: 'mockCertificate',
+              clientId: selfClientEntityId,
+            },
+          ]),
+        },
+      },
+    } as unknown as jest.Mocked<Core>;
+
+    handler = new MLSConversationVerificationStateHandler(
+      mockOnConversationVerificationStateChange,
+      mockConversationState,
+      mockCore,
+    );
+
+    jest.clearAllMocks();
+  });
+
+  it('should do nothing if MLS service is not available', () => {
+    mockCore.service.mls = undefined;
+
+    const t = () =>
+      registerMLSConversationVerificationStateHandler(
+        mockOnConversationVerificationStateChange,
+        mockConversationState,
+        mockCore,
+      );
+
+    expect(t).not.toThrow();
+  });
+
+  it('should do nothing if e2eIdentity service is not available', () => {
+    mockCore.service.e2eIdentity = undefined;
+
+    registerMLSConversationVerificationStateHandler(
+      mockOnConversationVerificationStateChange,
+      mockConversationState,
+      mockCore,
+    );
+
+    // Assert
+    expect(mockCore.service?.mls?.on).not.toHaveBeenCalled();
+  });
+
+  it('should hook into the newEpoch event of the MLS service', () => {
+    registerMLSConversationVerificationStateHandler(
+      mockOnConversationVerificationStateChange,
+      mockConversationState,
+      mockCore,
+    );
+
+    // Assert
+    expect(mockCore.service.mls.on).toHaveBeenCalledWith('newEpoch', expect.any(Function));
+  });
+
+  describe('checkEpoch', () => {
+    it('should degrade conversation if not all user entities have certificates', async () => {
+      jest.spyOn(handler as any, 'degradeConversation');
+
+      const mockData = {
+        groupId,
+        epoch: 12345,
+      };
+
+      jest.spyOn(handler as any, 'updateUserDevices').mockResolvedValue({
+        isResultComplete: false,
+        identities: [],
+        qualifiedIds: [],
+      });
+
+      await (handler as any).checkEpoch(mockData);
+
+      expect((handler as any).degradeConversation).toHaveBeenCalled();
+    });
+
+    it('should verify conversation if all checks pass', async () => {
+      jest.spyOn(handler as any, 'verifyConversation');
+
+      const mockData = {
+        groupId,
+        epoch: 12345,
+      };
+
+      jest.spyOn(handler as any, 'updateUserDevices').mockResolvedValue({
+        isResultComplete: true,
+        identities: [
+          {
+            certificate: 'mockCertificate',
+          },
+        ],
+        qualifiedIds: [],
+      });
+
+      jest.spyOn(handler as any, 'isCertificateActiveAndValid').mockResolvedValue(true);
+
+      await (handler as any).checkEpoch(mockData); // Calling the private method
+
+      expect((handler as any).verifyConversation).toHaveBeenCalled();
+    });
+
+    it('should update ClientEntity isMLSVerified observable', async () => {
+      const mockData = {
+        groupId,
+        epoch: 12345,
+      };
+
+      jest.spyOn(handler as any, 'isCertificateActiveAndValid').mockReturnValue(true);
+      jest.spyOn(handler as any, 'verifyConversation').mockImplementation(() => null);
+
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(false);
+
+      await (handler as any).checkEpoch(mockData); // Calling the private method
+
+      expect(clientEntity.meta.isMLSVerified?.()).toBe(true);
+    });
+
+    it('should update selfClient isMLSVerified observable', async () => {
+      const mockData = {
+        groupId,
+        epoch: 12345,
+      };
+
+      const user = new User();
+      user.isMe = true;
+      user.localClient = selfClientEntity;
+      conversation.getAllUserEntities = jest.fn().mockReturnValue([user]);
+
+      jest.spyOn(handler as any, 'isCertificateActiveAndValid').mockReturnValue(true);
+      jest.spyOn(handler as any, 'verifyConversation').mockImplementation(() => null);
+
+      expect(selfClientEntity.meta.isMLSVerified?.()).toBe(false);
+
+      await (handler as any).checkEpoch(mockData); // Calling the private method
+
+      expect(selfClientEntity.meta.isMLSVerified?.()).toBe(true);
+    });
+  });
+});
diff --git a/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts
new file mode 100644
index 00000000000..a19b6203305
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/MLS/MLSStateHandler.ts
@@ -0,0 +1,179 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {X509Certificate} from '@peculiar/x509';
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {WireIdentity} from '@wireapp/core/lib/messagingProtocols/mls';
+import {container} from 'tsyringe';
+
+import {ClientEntity} from 'src/script/client';
+import {VerificationMessageType} from 'src/script/message/VerificationMessageType';
+import {Core} from 'src/script/service/CoreSingleton';
+import {Logger, getLogger} from 'Util/Logger';
+
+import {MLSConversation, isMLSConversation} from '../../ConversationSelectors';
+import {ConversationState} from '../../ConversationState';
+import {
+  getConversationByGroupId,
+  attemptChangeToDegraded,
+  attemptChangeToVerified,
+  OnConversationVerificationStateChange,
+} from '../shared';
+
+export class MLSConversationVerificationStateHandler {
+  private readonly logger: Logger;
+
+  public constructor(
+    private readonly onConversationVerificationStateChange: OnConversationVerificationStateChange,
+    private readonly conversationState = container.resolve(ConversationState),
+    private readonly core = container.resolve(Core),
+  ) {
+    this.logger = getLogger('MLSConversationVerificationStateHandler');
+    // We need to check if the core service is available and if the e2eIdentity is available
+    if (!this.core.service?.mls || !this.core.service?.e2eIdentity) {
+      return;
+    }
+
+    // We hook into the newEpoch event of the MLS service to check if the conversation needs to be verified or degraded
+    this.core.service.mls.on('newEpoch', this.checkEpoch);
+  }
+
+  /**
+   * This function checks if the conversation is verified and if it is, it will degrade it
+   * @param conversationEntity
+   * @param userIds
+   */
+  private degradeConversation = async (conversationEntity: MLSConversation, userIds: QualifiedId[]) => {
+    this.logger.log(`Conversation ${conversationEntity.name} will be degraded`);
+    const conversationVerificationState = attemptChangeToDegraded({
+      conversationEntity,
+      logger: this.logger,
+    });
+    if (conversationVerificationState) {
+      this.onConversationVerificationStateChange({
+        conversationEntity,
+        conversationVerificationState,
+        verificationMessageType: VerificationMessageType.UNVERIFIED,
+        userIds,
+      });
+    }
+  };
+
+  /**
+   * This function checks if the conversation is degraded and if it is, it will verify it
+   * @param conversationEntity
+   * @param userIds
+   */
+  private verifyConversation = async (conversationEntity: MLSConversation) => {
+    this.logger.log(`Conversation ${conversationEntity.name} will be verified`);
+
+    const conversationVerificationState = attemptChangeToVerified({conversationEntity, logger: this.logger});
+
+    if (conversationVerificationState) {
+      this.onConversationVerificationStateChange({
+        conversationEntity,
+        conversationVerificationState,
+      });
+    }
+  };
+
+  /**
+   * This function returns the WireIdentity of all userDeviceEntities in a conversation, as long as they have a certificate.
+   * If the conversation has userDeviceEntities without a certificate, it will not be included in the returned array
+   *
+   * It also updates the isMLSVerified observable of all the devices in the conversation
+   */
+  private updateUserDevices = async (conversation: MLSConversation) => {
+    const userEntities = conversation.getAllUserEntities();
+    const allClients: ClientEntity[] = [];
+    const allIdentities: WireIdentity[] = [];
+    userEntities.forEach(async userEntity => {
+      let devices = userEntity.devices();
+      // Add the localClient to the devices array if it is the current user
+      if (userEntity.isMe && userEntity.localClient) {
+        devices = [...devices, userEntity.localClient];
+      }
+      const deviceUserPairs = devices
+        .map(device => ({
+          [device.id]: userEntity.qualifiedId,
+        }))
+        .reduce((acc, current) => {
+          return {...acc, ...current};
+        }, {});
+      const identities = await this.core.service!.e2eIdentity!.getUserDeviceEntities(
+        conversation.groupId,
+        deviceUserPairs,
+      );
+      identities.forEach(async identity => {
+        const verified = await this.isCertificateActiveAndValid(identity.certificate);
+        if (verified) {
+          const device = devices.find(device => device.id === identity.clientId);
+          /**
+           * ToDo: Change the current implementation of isMLSVerified to be stored in Zustand instead of ko.observable
+           */
+          device?.meta.isMLSVerified?.(true);
+          allIdentities.push(identity);
+        }
+      });
+      allClients.push(...devices);
+    });
+
+    return {
+      isResultComplete: allClients.length === allIdentities.length,
+      qualifiedIds: userEntities.map(userEntity => userEntity.qualifiedId),
+    };
+  };
+
+  private async isCertificateActiveAndValid(certificateString: string): Promise<boolean> {
+    const cert = new X509Certificate(certificateString);
+    const isValid = await cert.verify();
+    const isActive = cert.notAfter.getTime() > Date.now();
+
+    return isValid && isActive;
+  }
+
+  private async checkEpoch({groupId, epoch}: {groupId: string; epoch: number}): Promise<void> {
+    this.logger.log(`Epoch changed to ${epoch} for groupId ${groupId}`);
+    const conversationEntity = getConversationByGroupId({conversationState: this.conversationState, groupId});
+    if (!conversationEntity) {
+      this.logger.error(`Epoch changed but conversationEntity can't be found`);
+      return;
+    }
+
+    if (isMLSConversation(conversationEntity)) {
+      const {isResultComplete, qualifiedIds} = await this.updateUserDevices(conversationEntity);
+
+      // If the number of userDevicePairs is not equal to the number of identities, our Conversation is not secure
+      if (!isResultComplete) {
+        return this.degradeConversation(conversationEntity, qualifiedIds);
+      }
+
+      // If we reach this point, all checks have passed and we can set the conversation to verified
+      return this.verifyConversation(conversationEntity);
+    }
+  }
+}
+
+export const registerMLSConversationVerificationStateHandler = (
+  onConversationVerificationStateChange: OnConversationVerificationStateChange,
+  conversationState?: ConversationState,
+  core?: Core,
+): void => {
+  new MLSConversationVerificationStateHandler(onConversationVerificationStateChange, conversationState, core);
+};
diff --git a/src/script/conversation/ConversationVerificationStateHandler/MLS/index.ts b/src/script/conversation/ConversationVerificationStateHandler/MLS/index.ts
new file mode 100644
index 00000000000..17527c28813
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/MLS/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './MLSStateHandler';
diff --git a/src/script/conversation/ConversationVerificationStateHandler.test.ts b/src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.test.ts
similarity index 95%
rename from src/script/conversation/ConversationVerificationStateHandler.test.ts
rename to src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.test.ts
index fbaff5a1790..206594929c3 100644
--- a/src/script/conversation/ConversationVerificationStateHandler.test.ts
+++ b/src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.test.ts
@@ -24,14 +24,14 @@ import {Conversation} from 'src/script/entity/Conversation';
 import {User} from 'src/script/entity/User';
 import {createUuid} from 'Util/uuid';
 
-import {ConversationRepository} from './ConversationRepository';
-import {ConversationVerificationStateHandler} from './ConversationVerificationStateHandler';
+import {ProteusConversationVerificationStateHandler} from './ProteusStateHandler';
 
-import {TestFactory} from '../../../test/helper/TestFactory';
+import {TestFactory} from '../../../../../test/helper/TestFactory';
+import {ConversationRepository} from '../../ConversationRepository';
 
-describe('ConversationVerificationStateHandler', () => {
+describe('ProteusConversationVerificationStateHandler', () => {
   const testFactory = new TestFactory();
-  let stateHandler: ConversationVerificationStateHandler;
+  let stateHandler: ProteusConversationVerificationStateHandler;
   let conversationRepository: ConversationRepository;
 
   let conversationAB: Conversation;
@@ -49,7 +49,7 @@ describe('ConversationVerificationStateHandler', () => {
     return testFactory.exposeConversationActors().then(_conversation_repository => {
       spyOn(testFactory.event_repository, 'injectEvent').and.returnValue(undefined);
       conversationRepository = _conversation_repository;
-      stateHandler = conversationRepository.verificationStateHandler;
+      stateHandler = conversationRepository.proteusVerificationStateHandler;
 
       conversationAB = new Conversation(createUuid());
       conversationB = new Conversation(createUuid());
@@ -252,12 +252,12 @@ describe('ConversationVerificationStateHandler', () => {
   });
 
   describe('onClientVerificationChanged', () => {
-    it('should change state to UNVERIFIED if user unverified client', () => {
+    it('should change state to DEGRADED if user unverified client', () => {
       clientA.meta.isVerified(false);
 
       stateHandler.onClientVerificationChanged(userA.qualifiedId);
 
-      expect(conversationAB.verification_state()).toBe(ConversationVerificationState.UNVERIFIED);
+      expect(conversationAB.verification_state()).toBe(ConversationVerificationState.DEGRADED);
       expect(conversationB.verification_state()).toBe(ConversationVerificationState.VERIFIED);
       expect(conversationAB.is_verified()).toBeFalsy();
     });
diff --git a/src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.ts b/src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.ts
new file mode 100644
index 00000000000..560756c7348
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/Proteus/ProteusStateHandler.ts
@@ -0,0 +1,219 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import type {QualifiedId} from '@wireapp/api-client/lib/user/';
+import {amplify} from 'amplify';
+import {container} from 'tsyringe';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+import {Conversation} from 'src/script/entity/Conversation';
+import {VerificationMessageType} from 'src/script/message/VerificationMessageType';
+import {UserState} from 'src/script/user/UserState';
+import {getLogger, Logger} from 'Util/Logger';
+
+import {isMixedConversation, isProteusConversation} from '../../ConversationSelectors';
+import {ConversationState} from '../../ConversationState';
+import {ConversationVerificationState} from '../../ConversationVerificationState';
+import {
+  getActiveConversationsWithUsers,
+  attemptChangeToVerified,
+  attemptChangeToDegraded,
+  OnConversationVerificationStateChange,
+} from '../shared';
+
+export class ProteusConversationVerificationStateHandler {
+  private readonly logger: Logger;
+
+  constructor(
+    private readonly onConversationVerificationStateChange: OnConversationVerificationStateChange,
+    private readonly userState = container.resolve(UserState),
+    private readonly conversationState = container.resolve(ConversationState),
+  ) {
+    this.logger = getLogger('ProteusConversationVerificationStateHandler');
+
+    amplify.subscribe(WebAppEvents.USER.CLIENT_ADDED, this.onClientAdded);
+    amplify.subscribe(WebAppEvents.USER.CLIENT_REMOVED, this.onClientRemoved);
+    amplify.subscribe(WebAppEvents.USER.CLIENTS_UPDATED, this.onClientsUpdated);
+    amplify.subscribe(WebAppEvents.CLIENT.VERIFICATION_STATE_CHANGED, this.onClientVerificationChanged);
+  }
+
+  readonly onClientVerificationChanged = (userId: QualifiedId): void => {
+    getActiveConversationsWithUsers({
+      userIds: [userId],
+      conversationState: this.conversationState,
+      userState: this.userState,
+    }).forEach(({conversationEntity, userIds}) => {
+      const isStateChange = this.checkChangeToVerified(conversationEntity);
+
+      if (!isStateChange) {
+        this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.UNVERIFIED);
+      }
+    });
+  };
+
+  /**
+   * Self user or other participant added clients.
+   * @param userId ID of user that added client (can be self user ID)
+   */
+  readonly onClientAdded = (userId: QualifiedId): void => {
+    this.onClientsAdded([userId]);
+  };
+
+  /**
+   * Multiple participants added clients.
+   * @param userIds Multiple user IDs (can include self user ID)
+   */
+  onClientsAdded(userIds: QualifiedId[]): void {
+    getActiveConversationsWithUsers({
+      userIds,
+      conversationState: this.conversationState,
+      userState: this.userState,
+    }).forEach(({conversationEntity, userIds: matchingUserIds}) => {
+      this.checkChangeToDegraded(conversationEntity, matchingUserIds, VerificationMessageType.NEW_DEVICE);
+    });
+  }
+
+  /**
+   * Self user removed a client or other participants deleted clients.
+   * @param userId ID of user that added client (can be self user ID)
+   */
+  readonly onClientRemoved = (userId: QualifiedId): void => {
+    getActiveConversationsWithUsers({
+      userIds: [userId],
+      conversationState: this.conversationState,
+      userState: this.userState,
+    }).forEach(({conversationEntity}) => {
+      this.checkChangeToVerified(conversationEntity);
+    });
+  };
+
+  /**
+   * A new conversation was created.
+   * @param conversationEntity New conversation entity
+   */
+  onConversationCreate(conversationEntity: Conversation): void {
+    this.checkChangeToVerified(conversationEntity);
+  }
+
+  /**
+   * Clients of a user were updated.
+   */
+  readonly onClientsUpdated = (userId: QualifiedId): void => {
+    getActiveConversationsWithUsers({
+      userIds: [userId],
+      conversationState: this.conversationState,
+      userState: this.userState,
+    }).forEach(({conversationEntity, userIds}) => {
+      const isStateChange = this.checkChangeToVerified(conversationEntity);
+      if (!isStateChange) {
+        this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.NEW_DEVICE);
+      }
+    });
+  };
+
+  /**
+   * New member(s) joined the conversation.
+   * @param conversationEntity Changed conversation entity
+   * @param userIds IDs of added members
+   */
+  onMemberJoined(conversationEntity: Conversation, userIds: QualifiedId[]): void {
+    this.checkChangeToDegraded(conversationEntity, userIds, VerificationMessageType.NEW_MEMBER);
+  }
+
+  /**
+   * Member(s) left the conversation.
+   * @param conversationEntity Changed conversation entity
+   */
+  onMemberLeft(conversationEntity: Conversation): void {
+    this.checkChangeToVerified(conversationEntity);
+  }
+
+  /**
+   * Change that could verify conversation.
+   *
+   * @param conversationEntity Changed conversation entity
+   * @returns `true` if state changed
+   */
+  private checkChangeToVerified(conversationEntity: Conversation): boolean {
+    // We want to process only Proteus and Mixed conversations
+    if (isProteusConversation(conversationEntity) || isMixedConversation(conversationEntity)) {
+      const conversationVerificationState = attemptChangeToVerified({conversationEntity, logger: this.logger});
+
+      if (conversationVerificationState) {
+        this.onConversationVerificationStateChange({
+          conversationEntity,
+          conversationVerificationState,
+        });
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Change that could degrade conversation.
+   *
+   * @param conversationEntity Changed conversation entity
+   * @param userIds IDs of affected users
+   * @param type Type of degradation
+   * @returns `true` if state changed
+   */
+  private checkChangeToDegraded(
+    conversationEntity: Conversation,
+    userIds: QualifiedId[],
+    type: VerificationMessageType,
+  ): boolean {
+    // We want to process only Proteus or Mixed conversations
+    if (isProteusConversation(conversationEntity) || isMixedConversation(conversationEntity)) {
+      const conversationVerificationState = attemptChangeToDegraded({
+        conversationEntity,
+        logger: this.logger,
+      });
+
+      if (conversationVerificationState !== undefined) {
+        /**
+         * TEMPORARY DEBUGGING FIX:
+         * We have seen conversations in a degraded state without an unverified device in there.
+         * Previously the code would hide this fact, not create a system message and then fail when it tried to prompt
+         * the user to grant subsequent message sending - essentially blocking the conversation.
+         *
+         * As we are unsure of the trigger of the degradation we temporarily throw an error to get to the bottom of this.
+         * The conversation is also reset to the verified state to ensure we can continue to send messages.
+         */
+        if (!userIds.length) {
+          conversationEntity.verification_state(ConversationVerificationState.VERIFIED);
+          throw new Error('Conversation degraded without affected users');
+        }
+
+        this.onConversationVerificationStateChange({
+          conversationEntity,
+          conversationVerificationState,
+          userIds,
+          verificationMessageType: type,
+        });
+
+        return true;
+      }
+    }
+
+    return false;
+  }
+}
diff --git a/src/script/conversation/ConversationVerificationStateHandler/Proteus/index.ts b/src/script/conversation/ConversationVerificationStateHandler/Proteus/index.ts
new file mode 100644
index 00000000000..d3d650e40e6
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/Proteus/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './ProteusStateHandler';
diff --git a/src/script/conversation/ConversationVerificationStateHandler/index.ts b/src/script/conversation/ConversationVerificationStateHandler/index.ts
new file mode 100644
index 00000000000..6afd195ab77
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './Proteus';
+export * from './MLS';
diff --git a/src/script/conversation/ConversationVerificationStateHandler/shared/changeHandler/index.ts b/src/script/conversation/ConversationVerificationStateHandler/shared/changeHandler/index.ts
new file mode 100644
index 00000000000..9c7d26ee7f6
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/shared/changeHandler/index.ts
@@ -0,0 +1,32 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+
+import {ConversationVerificationState} from 'src/script/conversation/ConversationVerificationState';
+import {Conversation} from 'src/script/entity/Conversation';
+import {VerificationMessageType} from 'src/script/message/VerificationMessageType';
+
+interface OnConversationVerificationStateChangeParams {
+  conversationEntity: Conversation;
+  conversationVerificationState: ConversationVerificationState;
+  verificationMessageType?: VerificationMessageType;
+  userIds?: QualifiedId[];
+}
+export type OnConversationVerificationStateChange = (params: OnConversationVerificationStateChangeParams) => void;
diff --git a/src/script/conversation/ConversationVerificationStateHandler/shared/conversation/index.ts b/src/script/conversation/ConversationVerificationStateHandler/shared/conversation/index.ts
new file mode 100644
index 00000000000..c52ceb56ce6
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/shared/conversation/index.ts
@@ -0,0 +1,144 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+
+import {isMLSConversation, MLSConversation} from 'src/script/conversation/ConversationSelectors';
+import {ConversationState} from 'src/script/conversation/ConversationState';
+import {ConversationVerificationState} from 'src/script/conversation/ConversationVerificationState';
+import {Conversation} from 'src/script/entity/Conversation';
+import {UserState} from 'src/script/user/UserState';
+import {Logger} from 'Util/Logger';
+import {matchQualifiedIds} from 'Util/QualifiedId';
+
+interface GetActiveConversationsWithUsersParams {
+  userIds: QualifiedId[];
+  conversationState: ConversationState;
+  userState: UserState;
+}
+type GetActiveConversationsWithUsersResult = {conversationEntity: Conversation; userIds: QualifiedId[]}[];
+
+export const getActiveConversationsWithUsers = ({
+  conversationState,
+  userIds,
+  userState,
+}: GetActiveConversationsWithUsersParams): GetActiveConversationsWithUsersResult => {
+  return conversationState
+    .filteredConversations()
+    .map((conversationEntity: Conversation) => {
+      if (!conversationEntity.removed_from_conversation()) {
+        const userIdsInConversation = conversationEntity.participating_user_ids().concat(userState.self().qualifiedId);
+        const matchingUserIds = userIdsInConversation.filter(userIdInConversation =>
+          userIds.find(userId => matchQualifiedIds(userId, userIdInConversation)),
+        );
+
+        if (!!matchingUserIds.length) {
+          return {conversationEntity, userIds: matchingUserIds};
+        }
+      }
+      return undefined;
+    })
+    .flatMap(activeConversationInfo => (!!activeConversationInfo ? [activeConversationInfo] : []));
+};
+
+interface GetConversationByGroupIdParams {
+  conversationState: ConversationState;
+  groupId: string;
+}
+export const getConversationByGroupId = ({
+  conversationState,
+  groupId,
+}: GetConversationByGroupIdParams): MLSConversation | undefined => {
+  const conversation = conversationState.filteredConversations().find(conversation => conversation.groupId === groupId);
+  if (conversation && isMLSConversation(conversation)) {
+    return conversation;
+  }
+  return undefined;
+};
+
+/**
+ * Check whether to degrade conversation and set corresponding state.
+ *
+ * @param conversationEntity Conversation entity to evaluate
+ * @param shouldShowDegradationWarning Should a modal warn about the degradation?
+ * @returns `true` if conversation state changed to degraded
+ */
+interface AttemptChangeToDegradedParams {
+  conversationEntity: Conversation;
+  shouldShowDegradationWarning?: boolean;
+  logger: Logger;
+}
+export const attemptChangeToDegraded = ({
+  conversationEntity,
+  logger,
+  shouldShowDegradationWarning = true,
+}: AttemptChangeToDegradedParams): ConversationVerificationState | undefined => {
+  const state = conversationEntity.verification_state();
+  const isAlreadyDegraded = state === ConversationVerificationState.DEGRADED;
+
+  if (isAlreadyDegraded) {
+    return undefined;
+  }
+
+  // Explicit Boolean check to prevent state changes on undefined
+  const isStateVerified = state === ConversationVerificationState.VERIFIED;
+  const isConversationUnverified = conversationEntity.is_verified() === false;
+  if (isStateVerified && isConversationUnverified) {
+    const conversationVerificationState = shouldShowDegradationWarning
+      ? ConversationVerificationState.DEGRADED
+      : ConversationVerificationState.UNVERIFIED;
+    conversationEntity.verification_state(conversationVerificationState);
+    logger.log(`Verification of conversation '${conversationEntity.id}' changed to degraded`);
+    return conversationVerificationState;
+  }
+
+  return undefined;
+};
+
+/**
+ * Check whether to verify conversation and set corresponding state
+ *
+ * @param conversationEntity Conversation entity to evaluate
+ * @returns `true` if conversation state changed to verified
+ */
+interface AttemptChangeToVerifiedParams {
+  conversationEntity: Conversation;
+  logger: Logger;
+}
+export const attemptChangeToVerified = ({
+  conversationEntity,
+  logger,
+}: AttemptChangeToVerifiedParams): ConversationVerificationState | undefined => {
+  const state = conversationEntity.verification_state();
+  const isAlreadyVerified = state === ConversationVerificationState.VERIFIED;
+
+  if (isAlreadyVerified) {
+    return undefined;
+  }
+
+  // Explicit Boolean check to prevent state changes on undefined
+  const isConversationVerified = conversationEntity.is_verified() === true;
+  if (isConversationVerified) {
+    conversationEntity.verification_state(ConversationVerificationState.VERIFIED);
+    logger.log(`Verification state of conversation '${conversationEntity.id}' changed to verified`);
+    return ConversationVerificationState.VERIFIED;
+  }
+
+  return undefined;
+};
diff --git a/src/script/conversation/ConversationVerificationStateHandler/shared/index.ts b/src/script/conversation/ConversationVerificationStateHandler/shared/index.ts
new file mode 100644
index 00000000000..02e7cb0326c
--- /dev/null
+++ b/src/script/conversation/ConversationVerificationStateHandler/shared/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './conversation';
+export * from './changeHandler';
diff --git a/src/script/conversation/EventBuilder.ts b/src/script/conversation/EventBuilder.ts
index 5adbdd414cd..09524d1ec02 100644
--- a/src/script/conversation/EventBuilder.ts
+++ b/src/script/conversation/EventBuilder.ts
@@ -17,25 +17,31 @@
  *
  */
 
-import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/';
-import {ConversationOtrMessageAddEvent, CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
-import type {QualifiedId} from '@wireapp/api-client/lib/user/';
+import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data';
+import {
+  ConversationOtrMessageAddEvent,
+  ConversationMLSMessageAddEvent,
+  CONVERSATION_EVENT,
+} from '@wireapp/api-client/lib/event';
+import type {QualifiedId} from '@wireapp/api-client/lib/user';
+import {AddUsersFailureReasons} from '@wireapp/core/lib/conversation';
+import {ReactionType} from '@wireapp/core/lib/conversation/ReactionType';
 import {DecryptionError} from '@wireapp/core/lib/errors/DecryptionError';
 
 import type {REASON as AVS_REASON} from '@wireapp/avs';
-import type {LegalHoldStatus} from '@wireapp/protocol-messaging';
+import type {LegalHoldStatus, Asset} from '@wireapp/protocol-messaging';
 
 import {createUuid} from 'Util/uuid';
 
+import {AssetTransferState} from '../assets/AssetTransferState';
 import {CALL_MESSAGE_TYPE} from '../calling/enum/CallMessageType';
 import type {Conversation} from '../entity/Conversation';
-import {ReactionType} from '../entity/message/ContentMessage';
 import type {Message} from '../entity/message/Message';
 import type {User} from '../entity/User';
 import {CALL, ClientEvent, CONVERSATION} from '../event/Client';
 import {StatusType} from '../message/StatusType';
 import {VerificationMessageType} from '../message/VerificationMessageType';
-import {AssetRecord, EventRecord, ReadReceipt, UserReactionMap} from '../storage';
+import {ReadReceipt, UserReactionMap} from '../storage';
 
 export interface BaseEvent {
   conversation: string;
@@ -49,10 +55,9 @@ export interface BaseEvent {
   time: string;
 }
 
-export interface ConversationEvent<T> extends BaseEvent {
-  data: T;
-  id: string;
-  type: CONVERSATION;
+export interface ConversationEvent<Type extends CONVERSATION | CONVERSATION_EVENT, Data = undefined> extends BaseEvent {
+  data: Data;
+  type: Type;
 }
 
 export interface CallingEvent {
@@ -74,58 +79,87 @@ export interface CallingEvent {
   senderClientId?: string;
 }
 
-export interface BackendEventMessage<T> extends Omit<BaseEvent, 'id'> {
-  data: T;
+export interface BackendEventMessage<Type, Data> extends Omit<BaseEvent, 'id'> {
+  data: Data;
   id?: string;
-  type: string;
+  type: Type;
 }
 
-export interface VoiceChannelActivateEvent extends BaseEvent {
+export type VoiceChannelActivateEvent = ConversationEvent<CONVERSATION.VOICE_CHANNEL_ACTIVATE> & {
   protocol_version: number;
-  type: CONVERSATION.VOICE_CHANNEL_ACTIVATE;
-}
-export type AllVerifiedEventData = {type: VerificationMessageType.VERIFIED};
-export type AllVerifiedEvent = ConversationEvent<AllVerifiedEventData> & {
-  type: typeof ClientEvent.CONVERSATION.VERIFICATION;
-};
-export type AssetAddEvent = Omit<ConversationEvent<any>, 'id'> &
-  Partial<Pick<ConversationEvent<any>, 'id'>> & {status: StatusType; type: CONVERSATION.ASSET_ADD};
-export type DegradedMessageEventData = {type: VerificationMessageType; userIds: QualifiedId[]};
-export type DegradedMessageEvent = ConversationEvent<DegradedMessageEventData> & {
-  type: typeof ClientEvent.CONVERSATION.VERIFICATION;
 };
-export type DeleteEvent = ConversationEvent<{deleted_time: number; message_id: string; time: string}> & {
-  type: CONVERSATION.MESSAGE_DELETE;
+export type VoiceChannelDeactivateEvent = ConversationEvent<
+  CONVERSATION.VOICE_CHANNEL_DEACTIVATE,
+  {duration: number; reason: AVS_REASON}
+> & {
+  protocol_version: number;
 };
+
+export type AllVerifiedEventData = {type: VerificationMessageType.VERIFIED};
+export type AllVerifiedEvent = ConversationEvent<CONVERSATION.VERIFICATION, AllVerifiedEventData>;
+export type AssetAddEvent = ConversationEvent<
+  CONVERSATION.ASSET_ADD,
+  {
+    expects_read_confirmation?: boolean;
+    key?: string;
+    preview_key?: string;
+    info?: {
+      name: string;
+    };
+    content_type: string;
+    content_length: number;
+    status: AssetTransferState;
+    reason?: Asset.NotUploaded | AssetTransferState;
+  }
+>;
+
+export type DegradedMessageEventData = {type: VerificationMessageType; userIds: QualifiedId[]};
+export type DegradedMessageEvent = ConversationEvent<CONVERSATION.VERIFICATION, DegradedMessageEventData>;
+export type DeleteEvent = ConversationEvent<
+  CONVERSATION.MESSAGE_DELETE,
+  {deleted_time: number; message_id: string; time: string}
+>;
+export type FederationStopEvent = ConversationEvent<CONVERSATION.FEDERATION_STOP, {domains: string[]}>;
 export type GroupCreationEventData = {
   allTeamMembers: boolean;
   name: string;
   userIds: QualifiedId[];
 };
-export type GroupCreationEvent = ConversationEvent<GroupCreationEventData> & {type: CONVERSATION.GROUP_CREATION};
-export type LegalHoldMessageEvent = ConversationEvent<{legal_hold_status: LegalHoldStatus}> & {
-  type: CONVERSATION.LEGAL_HOLD_UPDATE;
-};
-export type MemberJoinEvent = BackendEventMessage<{qualified_user_ids?: QualifiedId[]; user_ids: string[]}> & {
-  type: CONVERSATION_EVENT.MEMBER_JOIN;
-};
-export type MemberLeaveEvent = BackendEventMessage<{
-  name?: string;
-  qualified_user_ids?: QualifiedId[];
-  reason?: MemberLeaveReason;
-  user_ids: string[];
-}> & {
-  type: CONVERSATION_EVENT.MEMBER_LEAVE;
-};
-export type MessageAddEvent = Omit<
-  ConversationEvent<{
+export type GroupCreationEvent = ConversationEvent<CONVERSATION.GROUP_CREATION, GroupCreationEventData>;
+export type LegalHoldMessageEvent = ConversationEvent<
+  CONVERSATION.LEGAL_HOLD_UPDATE,
+  {legal_hold_status: LegalHoldStatus}
+>;
+export type MemberJoinEvent = BackendEventMessage<
+  CONVERSATION_EVENT.MEMBER_JOIN,
+  {qualified_user_ids?: QualifiedId[]; user_ids: string[]}
+>;
+export type MemberLeaveEvent = BackendEventMessage<
+  CONVERSATION_EVENT.MEMBER_LEAVE,
+  {
+    name?: string;
+    qualified_user_ids?: QualifiedId[];
+    reason?: MemberLeaveReason;
+    user_ids: string[];
+  }
+>;
+export type MessageAddEvent = ConversationEvent<
+  CONVERSATION.MESSAGE_ADD,
+  {
     sender: string;
     content: string;
     replacing_message_id?: string;
     previews?: string[];
     expects_read_confirmation?: boolean;
-  }>,
-  'id'
+    quote?:
+      | string
+      | {
+          message_id: string;
+          user_id: string;
+          hash: Uint8Array;
+        }
+      | {error: {type: string}};
+  }
 > & {
   /** who have received/read the event */
   read_receipts?: ReadReceipt[];
@@ -133,71 +167,74 @@ export type MessageAddEvent = Omit<
   reactions?: UserReactionMap;
   edited_time?: string;
   status: StatusType;
-  type: CONVERSATION.MESSAGE_ADD;
 };
 export type MissedEvent = BaseEvent & {id: string; type: CONVERSATION.MISSED_MESSAGES};
-export type OneToOneCreationEvent = ConversationEvent<{userIds: QualifiedId[]}> & {
-  type: CONVERSATION.ONE2ONE_CREATION;
-};
+export type MLSConversationRecoveredEvent = BaseEvent & {id: string; type: CONVERSATION.MLS_CONVERSATION_RECOVERED};
+export type OneToOneCreationEvent = ConversationEvent<CONVERSATION.ONE2ONE_CREATION, {userIds: QualifiedId[]}>;
 export type TeamMemberLeaveEvent = Omit<MemberLeaveEvent, 'type'> & {
   type: CONVERSATION.TEAM_MEMBER_LEAVE;
 };
-export type ReactionEvent = ConversationEvent<{message_id: string; reaction: ReactionType}> & {
-  type: CONVERSATION.REACTION;
-};
-export type MessageHiddenEvent = ConversationEvent<{conversation_id: string; message_id: string}> & {
-  type: CONVERSATION.MESSAGE_HIDDEN;
-};
-export type ConfirmationEvent = ConversationEvent<{
-  message_id: string;
-  more_message_ids: string[];
-  status: StatusType;
-}> & {
-  type: CONVERSATION.CONFIRMATION;
-};
-export type ButtonActionConfirmationEvent = ConversationEvent<{buttonId: string; messageId: string}> & {
-  type: CONVERSATION.BUTTON_ACTION_CONFIRMATION;
-};
-export type DeleteEverywhereEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.DELETE_EVERYWHERE;
-};
-export type CompositeMessageAddEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.COMPOSITE_MESSAGE_ADD;
-};
-export type IncomingMessageTooBigEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.INCOMING_MESSAGE_TOO_BIG;
-};
-export type KnockEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.KNOCK;
-};
-export type LocationEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.LOCATION;
-};
-export type UnableToDecryptEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.UNABLE_TO_DECRYPT;
-};
-export type VerificationEvent = ConversationEvent<{}> & {
-  type: CONVERSATION.VERIFICATION;
-};
-export type VoiceChannelDeactivateEvent = ConversationEvent<{duration: number; reason: AVS_REASON}> & {
-  protocol_version: number;
-  type: CONVERSATION.VOICE_CHANNEL_DEACTIVATE;
-};
-export type FileTypeRestrictedEvent = ConversationEvent<{fileExt: string; isIncoming: boolean; name: string}> & {
-  type: CONVERSATION.FILE_TYPE_RESTRICTED;
-};
-export type CallingTimeoutEvent = ConversationEvent<{reason: AVS_REASON.NOONE_JOINED | AVS_REASON.EVERYONE_LEFT}> & {
-  type: CONVERSATION.CALL_TIME_OUT;
-};
-export type FailedToAddUsersMessageEvent = ConversationEvent<{qualifiedIds: QualifiedId[]}> & {
-  type: CONVERSATION.FAILED_TO_ADD_USERS;
-};
-
-export interface ErrorEvent extends BaseEvent {
+export type ReactionEvent = ConversationEvent<CONVERSATION.REACTION, {message_id: string; reaction: ReactionType}>;
+export type MessageHiddenEvent = ConversationEvent<
+  CONVERSATION.MESSAGE_HIDDEN,
+  {conversation_id: string; message_id: string}
+>;
+export type ConfirmationEvent = ConversationEvent<
+  CONVERSATION.CONFIRMATION,
+  {
+    message_id: string;
+    more_message_ids: string[];
+    status: StatusType;
+  }
+>;
+export type ButtonActionConfirmationEvent = ConversationEvent<
+  CONVERSATION.BUTTON_ACTION_CONFIRMATION,
+  {buttonId: string; messageId: string}
+>;
+export type DeleteEverywhereEvent = ConversationEvent<
+  CONVERSATION.DELETE_EVERYWHERE,
+  {
+    deleted_time: string;
+  }
+>;
+export type CompositeMessageAddEvent = ConversationEvent<CONVERSATION.COMPOSITE_MESSAGE_ADD>;
+export type IncomingMessageTooBigEvent = ConversationEvent<CONVERSATION.INCOMING_MESSAGE_TOO_BIG>;
+export type KnockEvent = ConversationEvent<
+  CONVERSATION.KNOCK,
+  {
+    expects_read_confirmation?: boolean;
+  }
+>;
+export type LocationEvent = ConversationEvent<
+  CONVERSATION.LOCATION,
+  {
+    expects_read_confirmation?: boolean;
+  }
+>;
+export type UnableToDecryptEvent = ConversationEvent<CONVERSATION.UNABLE_TO_DECRYPT>;
+export type VerificationEvent = ConversationEvent<CONVERSATION.VERIFICATION>;
+export type FileTypeRestrictedEvent = ConversationEvent<
+  CONVERSATION.FILE_TYPE_RESTRICTED,
+  {fileExt: string; isIncoming: boolean; name: string}
+>;
+export type CallingTimeoutEvent = ConversationEvent<
+  CONVERSATION.CALL_TIME_OUT,
+  {reason: AVS_REASON.NOONE_JOINED | AVS_REASON.EVERYONE_LEFT}
+>;
+export type FailedToAddUsersMessageEvent = ConversationEvent<
+  CONVERSATION.FAILED_TO_ADD_USERS,
+  {
+    qualifiedIds: QualifiedId[];
+    reason: AddUsersFailureReasons;
+    backends: string[];
+  }
+>;
+
+export interface ErrorEvent
+  extends ConversationEvent<CONVERSATION.UNABLE_TO_DECRYPT | CONVERSATION.INCOMING_MESSAGE_TOO_BIG> {
   error: string;
   error_code: number | string;
   id: string;
-  type: CONVERSATION.UNABLE_TO_DECRYPT | CONVERSATION.INCOMING_MESSAGE_TOO_BIG;
 }
 
 export type ClientConversationEvent =
@@ -206,6 +243,7 @@ export type ClientConversationEvent =
   | ErrorEvent
   | CompositeMessageAddEvent
   | ConfirmationEvent
+  | FederationStopEvent
   | DeleteEvent
   | DeleteEverywhereEvent
   | DegradedMessageEvent
@@ -227,6 +265,7 @@ export type ClientConversationEvent =
   | FailedToAddUsersMessageEvent
   | UnableToDecryptEvent
   | MissedEvent
+  | MLSConversationRecoveredEvent
   | LocationEvent
   | VoiceChannelActivateEvent
   | VerificationEvent;
@@ -269,17 +308,6 @@ export const EventBuilder = {
     };
   },
 
-  buildAssetAdd(conversationEntity: Conversation, data: AssetRecord, currentTimestamp: number): AssetAddEvent {
-    return {
-      ...buildQualifiedId(conversationEntity),
-      data,
-      from: conversationEntity.selfUser().id,
-      status: StatusType.SENDING,
-      time: conversationEntity.getNextIsoDate(currentTimestamp),
-      type: ClientEvent.CONVERSATION.ASSET_ADD,
-    };
-  },
-
   buildCallingTimeoutEvent(
     reason: AVS_REASON.NOONE_JOINED | AVS_REASON.EVERYONE_LEFT,
     conversation: Conversation,
@@ -298,14 +326,16 @@ export const EventBuilder = {
   },
 
   buildFailedToAddUsersEvent(
-    qualifiedIds: QualifiedId[],
+    failedToAdd: {users: QualifiedId[]; reason: AddUsersFailureReasons; backends: string[]},
     conversation: Conversation,
     userId: string,
   ): FailedToAddUsersMessageEvent {
     return {
       ...buildQualifiedId(conversation),
       data: {
-        qualifiedIds,
+        qualifiedIds: failedToAdd.users,
+        reason: failedToAdd.reason,
+        backends: failedToAdd.backends,
       },
       from: userId,
       id: createUuid(),
@@ -409,6 +439,7 @@ export const EventBuilder = {
 
     return {
       ...buildQualifiedId(conversationId || conversation),
+      data: undefined,
       error: `${messageError.message} (${eventData.sender})`,
       error_code: errorCode,
       from,
@@ -463,30 +494,54 @@ export const EventBuilder = {
 
   buildMemberLeave(
     conversationEntity: Conversation,
-    userId: QualifiedId,
-    removedBySelfUser: boolean,
+    userIds: QualifiedId[],
+    from: string,
     currentTimestamp: number,
   ): MemberLeaveEvent {
     return {
       ...buildQualifiedId(conversationEntity),
       data: {
-        qualified_user_ids: [userId],
-        user_ids: [userId.id],
+        qualified_user_ids: userIds,
+        user_ids: userIds.map(({id}) => id),
       },
-      from: removedBySelfUser ? conversationEntity.selfUser().id : userId.id,
+      from: from,
       time: conversationEntity.getNextIsoDate(currentTimestamp),
       type: CONVERSATION_EVENT.MEMBER_LEAVE,
     };
   },
 
-  buildMessageAdd(conversationEntity: Conversation, currentTimestamp: number, senderId: string): MessageAddEvent {
+  buildFederationStop(
+    conversationEntity: Conversation,
+    selfUser: User,
+    domains: string[],
+    currentTimestamp: number,
+  ): FederationStopEvent {
+    return {
+      ...buildQualifiedId(conversationEntity),
+      data: {
+        domains,
+      },
+      id: createUuid(),
+      from: selfUser.id,
+      time: conversationEntity.getNextIsoDate(currentTimestamp),
+      type: CONVERSATION.FEDERATION_STOP,
+    };
+  },
+
+  buildMessageAdd(
+    conversationEntity: Conversation,
+    currentTimestamp: number,
+    senderId: string,
+    clientId: string,
+  ): MessageAddEvent {
     return {
       ...buildQualifiedId(conversationEntity),
       data: {
         content: '',
-        sender: senderId,
+        sender: clientId,
       },
-      from: conversationEntity.selfUser().id,
+      id: createUuid(),
+      from: senderId,
       status: StatusType.SENDING,
       time: conversationEntity.getNextIsoDate(currentTimestamp),
       type: ClientEvent.CONVERSATION.MESSAGE_ADD,
@@ -503,6 +558,19 @@ export const EventBuilder = {
     };
   },
 
+  buildMLSConversationRecovered(
+    conversationEntity: Conversation,
+    currentTimestamp: number,
+  ): MLSConversationRecoveredEvent {
+    return {
+      ...buildQualifiedId(conversationEntity),
+      from: conversationEntity.selfUser().id,
+      id: createUuid(),
+      time: conversationEntity.getNextIsoDate(currentTimestamp),
+      type: ClientEvent.CONVERSATION.MLS_CONVERSATION_RECOVERED,
+    };
+  },
+
   buildTeamMemberLeave(
     conversationEntity: Conversation,
     userEntity: User,
@@ -521,12 +589,16 @@ export const EventBuilder = {
     };
   },
 
-  buildUnableToDecrypt(event: Partial<EventRecord>, decryptionError: DecryptionError): ErrorEvent {
+  buildUnableToDecrypt(
+    event: ConversationOtrMessageAddEvent | ConversationMLSMessageAddEvent,
+    decryptionError: DecryptionError,
+  ): ErrorEvent {
     const {qualified_conversation: conversationId, qualified_from, conversation, data: eventData, from, time} = event;
 
     return {
       ...buildQualifiedId(conversationId || conversation),
-      error: `${decryptionError.message} (${eventData.sender})`,
+      error: `${decryptionError.message} (${(eventData as any).sender})`,
+      data: undefined,
       error_code: decryptionError.code ?? '',
       from,
       id: createUuid(),
@@ -544,12 +616,13 @@ export const EventBuilder = {
   ): VoiceChannelActivateEvent {
     return {
       ...buildQualifiedId(conversation),
+      data: undefined,
       from: userId.id,
       id: createUuid(),
       protocol_version: protocolVersion,
       qualified_from: userId,
       time,
-      type: ClientEvent.CONVERSATION.VOICE_CHANNEL_ACTIVATE,
+      type: CONVERSATION.VOICE_CHANNEL_ACTIVATE,
     };
   },
 
diff --git a/src/script/conversation/EventMapper.ts b/src/script/conversation/EventMapper.ts
index 75699741cd4..7f821f239e0 100644
--- a/src/script/conversation/EventMapper.ts
+++ b/src/script/conversation/EventMapper.ts
@@ -32,6 +32,8 @@ import {
   TeamMemberLeaveEvent,
   ErrorEvent,
   ClientConversationEvent,
+  FederationStopEvent,
+  FailedToAddUsersMessageEvent,
 } from './EventBuilder';
 
 import {AssetRemoteData} from '../assets/AssetRemoteData';
@@ -48,6 +50,7 @@ import {ContentMessage} from '../entity/message/ContentMessage';
 import {DecryptErrorMessage} from '../entity/message/DecryptErrorMessage';
 import {DeleteMessage} from '../entity/message/DeleteMessage';
 import {FailedToAddUsersMessage} from '../entity/message/FailedToAddUsersMessage';
+import {FederationStopMessage} from '../entity/message/FederationStopMessage';
 import {FileAsset} from '../entity/message/FileAsset';
 import {FileTypeRestrictedMessage} from '../entity/message/FileTypeRestrictedMessage';
 import {LegalHoldMessage} from '../entity/message/LegalHoldMessage';
@@ -58,6 +61,7 @@ import {MemberMessage} from '../entity/message/MemberMessage';
 import type {Message} from '../entity/message/Message';
 import {MessageTimerUpdateMessage} from '../entity/message/MessageTimerUpdateMessage';
 import {MissedMessage} from '../entity/message/MissedMessage';
+import {MLSConversationRecoveredMessage} from '../entity/message/MLSConversationRecoveredMessage';
 import {PingMessage} from '../entity/message/PingMessage';
 import {ReceiptModeUpdateMessage} from '../entity/message/ReceiptModeUpdateMessage';
 import {RenameMessage} from '../entity/message/RenameMessage';
@@ -295,6 +299,11 @@ export class EventMapper {
         break;
       }
 
+      case ClientEvent.CONVERSATION.FEDERATION_STOP: {
+        messageEntity = this._mapEventFederationStop(event);
+        break;
+      }
+
       case ClientEvent.CONVERSATION.LEGAL_HOLD_UPDATE: {
         messageEntity = this._mapEventLegalHoldUpdate(event);
         break;
@@ -316,6 +325,11 @@ export class EventMapper {
         break;
       }
 
+      case ClientEvent.CONVERSATION.MLS_CONVERSATION_RECOVERED: {
+        messageEntity = this._mapEventMLSConversationRecovered();
+        break;
+      }
+
       case ClientEvent.CONVERSATION.ONE2ONE_CREATION: {
         messageEntity = this._mapEvent1to1Creation(event);
         break;
@@ -483,8 +497,12 @@ export class EventMapper {
     return new CallingTimeoutMessage(data.reason, parseInt(time, 10));
   }
 
-  _mapEventFailedToAddUsers({data, time}: LegacyEventRecord) {
-    return new FailedToAddUsersMessage(data.qualifiedIds, parseInt(time, 10));
+  _mapEventFailedToAddUsers({data, time}: FailedToAddUsersMessageEvent) {
+    return new FailedToAddUsersMessage(data.qualifiedIds, data.reason, data.backends, parseInt(time, 10));
+  }
+
+  _mapEventFederationStop({data, time}: FederationStopEvent) {
+    return new FederationStopMessage(data.domains, parseInt(time, 10));
   }
 
   _mapEventLegalHoldUpdate({data, timestamp}: LegacyEventRecord) {
@@ -615,6 +633,13 @@ export class EventMapper {
     return new MissedMessage();
   }
 
+  /**
+   * Maps JSON data of local MLS conversation recovered event to message entity.
+   */
+  private _mapEventMLSConversationRecovered(): MissedMessage {
+    return new MLSConversationRecoveredMessage();
+  }
+
   /**
    * Maps JSON data of `conversation.knock` message into message entity.
    */
@@ -629,9 +654,7 @@ export class EventMapper {
    * @returns Rename message entity
    */
   private _mapEventRename({data: eventData}: LegacyEventRecord) {
-    const messageEntity = new RenameMessage();
-    messageEntity.name = eventData.name;
-    return messageEntity;
+    return new RenameMessage(eventData.name);
   }
 
   /**
diff --git a/src/script/conversation/MessageRepository.test.ts b/src/script/conversation/MessageRepository.test.ts
index d8c61d5f5d0..c5772445fbe 100644
--- a/src/script/conversation/MessageRepository.test.ts
+++ b/src/script/conversation/MessageRepository.test.ts
@@ -74,9 +74,9 @@ type MessageRepositoryDependencies = {
 
 async function buildMessageRepository(): Promise<[MessageRepository, MessageRepositoryDependencies]> {
   const userState = new UserState();
-  userState.users([selfUser]);
+  userState.self(selfUser);
   const clientState = new ClientState();
-  clientState.currentClient(new ClientEntity(true, ''));
+  clientState.currentClient = new ClientEntity(true, '');
   const core = new Account();
 
   const conversationState = new ConversationState(userState);
@@ -84,7 +84,7 @@ async function buildMessageRepository(): Promise<[MessageRepository, MessageRepo
   selfConversation.selfUser(selfUser);
   conversationState.conversations([selfConversation]);
   const dependencies = {
-    conversationRepository: () => ({} as ConversationRepository),
+    conversationRepository: () => ({}) as ConversationRepository,
     cryptographyRepository: new CryptographyRepository({} as any),
     eventRepository: new EventRepository(new EventService({} as any), {} as any, {} as any, {} as any),
     propertiesRepository: new PropertiesRepository({} as any, {} as any),
@@ -252,4 +252,66 @@ describe('MessageRepository', () => {
       expect(core.service!.conversation.send).toHaveBeenCalled();
     });
   });
+
+  describe('updateUserReactions', () => {
+    it("should add reaction if it doesn't exist", async () => {
+      const [messageRepository] = await buildMessageRepository();
+      const reactions = {
+        user1: 'like,love',
+        user2: 'happy,sad',
+      };
+      const userId = 'user1';
+      const reaction = 'cry';
+      const expectedReactions = {
+        user1: 'like,love,cry',
+        user2: 'happy,sad',
+      };
+      const result = messageRepository.updateUserReactions(reactions, userId, reaction);
+      expect(result).toEqual(expectedReactions[userId]);
+    });
+
+    it('should set the reaction for the user for the first time', async () => {
+      const [messageRepository] = await buildMessageRepository();
+      const reactions = {
+        user1: 'like,love,haha',
+        user2: 'happy,sad',
+      };
+      const userId = 'user3';
+      const reaction = 'like';
+      const expectedReactions = 'like';
+      const result = messageRepository.updateUserReactions(reactions, userId, reaction);
+      expect(result).toEqual(expectedReactions);
+    });
+
+    it('should delete reaction if it exists', async () => {
+      const [messageRepository] = await buildMessageRepository();
+      const reactions = {
+        user1: 'like,love,haha',
+        user2: 'happy,sad',
+      };
+      const userId = 'user1';
+      const reaction = 'haha';
+      const expectedReactions = {
+        user1: 'like,love',
+        user2: 'happy,sad',
+      };
+      const result = messageRepository.updateUserReactions(reactions, userId, reaction);
+      expect(result).toEqual(expectedReactions[userId]);
+    });
+    it('should return an empty string if no reactions for a user', async () => {
+      const [messageRepository] = await buildMessageRepository();
+      const reactions = {
+        user1: 'like',
+        user2: 'happy,sad',
+      };
+      const userId = 'user1';
+      const reaction = 'like';
+      const expectedReactions = {
+        user1: '',
+        user2: 'happy,sad',
+      };
+      const result = messageRepository.updateUserReactions(reactions, userId, reaction);
+      expect(result).toEqual(expectedReactions[userId]);
+    });
+  });
 });
diff --git a/src/script/conversation/MessageRepository.ts b/src/script/conversation/MessageRepository.ts
index 2a2cb8c65be..7bef461ff53 100644
--- a/src/script/conversation/MessageRepository.ts
+++ b/src/script/conversation/MessageRepository.ts
@@ -20,7 +20,13 @@
 import {ConversationProtocol, MessageSendingStatus, QualifiedUserClients} from '@wireapp/api-client/lib/conversation';
 import {BackendErrorLabel} from '@wireapp/api-client/lib/http/';
 import {QualifiedId, RequestCancellationError, User as APIClientUser} from '@wireapp/api-client/lib/user';
-import {MessageSendingState, MessageTargetMode, GenericMessageType, SendResult} from '@wireapp/core/lib/conversation';
+import {
+  MessageSendingState,
+  MessageTargetMode,
+  ReactionType,
+  GenericMessageType,
+  SendResult,
+} from '@wireapp/core/lib/conversation';
 import {
   AudioMetaData,
   EditedTextContent,
@@ -72,7 +78,7 @@ import {CryptographyRepository} from '../cryptography/CryptographyRepository';
 import {PROTO_MESSAGE_TYPE} from '../cryptography/ProtoMessageType';
 import {Conversation} from '../entity/Conversation';
 import {CompositeMessage} from '../entity/message/CompositeMessage';
-import {ContentMessage, ReactionType} from '../entity/message/ContentMessage';
+import {ContentMessage} from '../entity/message/ContentMessage';
 import {FileAsset} from '../entity/message/FileAsset';
 import {Message} from '../entity/message/Message';
 import {User} from '../entity/User';
@@ -89,6 +95,7 @@ import {PropertiesRepository} from '../properties/PropertiesRepository';
 import {PROPERTIES_TYPE} from '../properties/PropertiesType';
 import {Core} from '../service/CoreSingleton';
 import type {EventRecord} from '../storage';
+import {UserReactionMap} from '../storage/record/EventRecord';
 import {TeamState} from '../team/TeamState';
 import {ServerTimeHandler} from '../time/serverTimeHandler';
 import {UserType} from '../tracking/attribute';
@@ -746,9 +753,14 @@ export class MessageRepository {
 
     const injectOptimisticEvent = async () => {
       if (!skipInjection) {
-        const senderId = this.clientState.currentClient().id;
+        const senderId = this.clientState.currentClient?.id;
         const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
-        const optimisticEvent = EventBuilder.buildMessageAdd(conversation, currentTimestamp, senderId);
+        const optimisticEvent = EventBuilder.buildMessageAdd(
+          conversation,
+          currentTimestamp,
+          this.userState.self()!.id,
+          senderId,
+        );
         this.trackContributed(conversation, payload);
         const mappedEvent = await this.cryptography_repository.cryptographyMapper.mapGenericMessage(
           payload,
@@ -784,6 +796,7 @@ export class MessageRepository {
           groupId,
           payload,
           protocol: ConversationProtocol.MLS,
+          conversationId: conversation.qualifiedId,
         }
       : {
           conversationId: conversation.qualifiedId,
@@ -814,19 +827,38 @@ export class MessageRepository {
     }
   }
 
-  /**
-   * Toggle like status of message.
-   *
-   * @param conversationEntity Conversation entity
-   * @param message_et Message to react to
-   */
-  public toggleLike(conversationEntity: Conversation, message_et: ContentMessage): void {
-    if (!conversationEntity.removed_from_conversation()) {
-      const reaction = message_et.is_liked() ? ReactionType.NONE : ReactionType.LIKE;
-      message_et.is_liked(!message_et.is_liked());
+  public updateUserReactions(reactions: UserReactionMap, userId: string, reaction: ReactionType) {
+    const userReactions = reactions[userId] || '';
+    const updatedReactions = {...reactions};
+
+    if (userReactions) {
+      const reactionsArr = userReactions.split(',');
+      const reactionIndex = reactionsArr.indexOf(reaction);
+      if (reactionIndex === -1) {
+        reactionsArr.push(reaction);
+      } else {
+        reactionsArr.splice(reactionIndex, 1);
+      }
+      // if all reactions removed return empty string
+      updatedReactions[userId] = reactionsArr.join(',');
+    } else {
+      // first time reacted
+      updatedReactions[userId] = reaction;
+    }
+    return updatedReactions[userId];
+  }
 
-      window.setTimeout(() => this.sendReaction(conversationEntity, message_et, reaction), 100);
+  public toggleReaction(
+    conversationEntity: Conversation,
+    message_et: ContentMessage,
+    reaction: string,
+    userId: string,
+  ) {
+    if (conversationEntity.removed_from_conversation()) {
+      return null;
     }
+    const updatedReactions = this.updateUserReactions(message_et.reactions(), userId, reaction);
+    return this.sendReactions(conversationEntity, message_et, updatedReactions);
   }
 
   async resetSession(userId: QualifiedId, clientId: string, conversation: Conversation): Promise<void> {
@@ -935,8 +967,9 @@ export class MessageRepository {
    * @param reactionType Reaction
    * @returns Resolves after sending the reaction
    */
-  private async sendReaction(conversation: Conversation, messageEntity: Message, reactionType: ReactionType) {
-    const reaction = MessageBuilder.buildReactionMessage({originalMessageId: messageEntity.id, type: reactionType});
+
+  private async sendReactions(conversation: Conversation, messageEntity: Message, reactions: ReactionType) {
+    const reaction = MessageBuilder.buildReactionMessage({originalMessageId: messageEntity.id, type: reactions});
 
     return this.sendAndInjectMessage(reaction, conversation);
   }
@@ -1093,7 +1126,7 @@ export class MessageRepository {
    */
   public async deleteMessageById(conversationEntity: Conversation, messageId: string): Promise<number> {
     const isLastDeleted =
-      conversationEntity.isShowingLastReceivedMessage() && conversationEntity.getNewestMessage()?.id === messageId;
+      conversationEntity.hasLastReceivedMessageLoaded() && conversationEntity.getNewestMessage()?.id === messageId;
 
     const deleteCount = await this.eventService.deleteEvent(conversationEntity.id, messageId);
     const previousMessage = conversationEntity.getNewestMessage();
@@ -1188,12 +1221,12 @@ export class MessageRepository {
   private async updateMessageAsFailed(conversationEntity: Conversation, eventId: string, error: unknown) {
     try {
       const messageEntity = await this.getMessageInConversationById(conversationEntity, eventId);
-      if (isBackendError(error) && error.label === BackendErrorLabel.FEDERATION_REMOTE_ERROR) {
-        messageEntity.status(StatusType.FEDERATION_ERROR);
-        return this.eventService.updateEvent(messageEntity.primary_key, {status: StatusType.FEDERATION_ERROR});
-      }
-      messageEntity.status(StatusType.FAILED);
-      return this.eventService.updateEvent(messageEntity.primary_key, {status: StatusType.FAILED});
+      const errorStatus =
+        isBackendError(error) && error.label === BackendErrorLabel.FEDERATION_REMOTE_ERROR
+          ? StatusType.FEDERATION_ERROR
+          : StatusType.FAILED;
+      messageEntity.status(errorStatus);
+      return this.eventService.updateEvent(messageEntity.primary_key, {status: errorStatus});
     } catch (error) {
       if ((error as any).type !== ConversationError.TYPE.MESSAGE_NOT_FOUND) {
         throw error;
diff --git a/src/script/conversation/userClientsUtils.ts b/src/script/conversation/userClientsUtils.ts
index 4d1287417d3..4939928a8ce 100644
--- a/src/script/conversation/userClientsUtils.ts
+++ b/src/script/conversation/userClientsUtils.ts
@@ -38,7 +38,10 @@ function extractUserIds<T>(
 export function flattenUserClientsQualifiedIds<T = unknown>(
   userClients: QualifiedUserClientsContainer<T>,
 ): {clients: T[]; userId: QualifiedId}[] {
-  return Object.entries(userClients).reduce((ids, [domain, userClients]) => {
-    return [...ids, ...extractUserIds(userClients, domain)];
-  }, [] as {clients: T[]; userId: QualifiedId}[]);
+  return Object.entries(userClients).reduce(
+    (ids, [domain, userClients]) => {
+      return [...ids, ...extractUserIds(userClients, domain)];
+    },
+    [] as {clients: T[]; userId: QualifiedId}[],
+  );
 }
diff --git a/src/script/cryptography/CryptographyMapper.test.ts b/src/script/cryptography/CryptographyMapper.test.ts
index 103efd766dc..094e51e9800 100644
--- a/src/script/cryptography/CryptographyMapper.test.ts
+++ b/src/script/cryptography/CryptographyMapper.test.ts
@@ -47,12 +47,11 @@ import {createUuid} from 'Util/uuid';
 
 import {CryptographyMapper} from './CryptographyMapper';
 
-import {ReactionType} from '../entity/message/ContentMessage';
-
 describe('CryptographyMapper', () => {
   const mapper = new CryptographyMapper();
 
   let event: any = undefined;
+  const emojiReaction = '😇';
 
   beforeEach(() => {
     event = {
@@ -444,7 +443,7 @@ describe('CryptographyMapper', () => {
       const messageId = createUuid();
 
       const reaction = new Reaction({
-        emoji: ReactionType.LIKE,
+        emoji: emojiReaction,
         messageId,
       });
       const generic_message = new GenericMessage({
@@ -460,7 +459,7 @@ describe('CryptographyMapper', () => {
         expect(event_json.time).toBe(event.time);
         expect(event_json.id).toBe(generic_message.messageId);
         expect(event_json.data.message_id).toBe(generic_message.messageId);
-        expect(event_json.data.reaction).toBe(ReactionType.LIKE);
+        expect(event_json.data.reaction).toBe(emojiReaction);
       });
     });
 
@@ -573,7 +572,7 @@ describe('CryptographyMapper', () => {
       const messageId = createUuid();
 
       const reaction = new Reaction({
-        emoji: ReactionType.LIKE,
+        emoji: emojiReaction,
         messageId,
       });
       const generic_message = new GenericMessage({
@@ -589,7 +588,7 @@ describe('CryptographyMapper', () => {
         expect(event_json.time).toBe(event.time);
         expect(event_json.id).toBe(generic_message.messageId);
         expect(event_json.data.message_id).toBe(generic_message.messageId);
-        expect(event_json.data.reaction).toBe(ReactionType.LIKE);
+        expect(event_json.data.reaction).toBe(emojiReaction);
       });
     });
 
diff --git a/src/script/entity/Conversation.test.ts b/src/script/entity/Conversation.test.ts
index bd8dadb9743..83635207caf 100644
--- a/src/script/entity/Conversation.test.ts
+++ b/src/script/entity/Conversation.test.ts
@@ -21,22 +21,17 @@
 
 import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
 import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/';
-import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 
 import {ClientEntity} from 'src/script/client/ClientEntity';
 import {ConnectionMapper} from 'src/script/connection/ConnectionMapper';
 import {ConversationMapper} from 'src/script/conversation/ConversationMapper';
 import {NOTIFICATION_STATE} from 'src/script/conversation/NotificationSetting';
 import 'src/script/localization/Localizer';
-import {CALL_MESSAGE_TYPE} from 'src/script/message/CallMessageType';
-import {MentionEntity} from 'src/script/message/MentionEntity';
 import {StatusType} from 'src/script/message/StatusType';
 import {createUuid} from 'Util/uuid';
 
 import {Conversation} from './Conversation';
-import {CallMessage} from './message/CallMessage';
 import {ContentMessage} from './message/ContentMessage';
-import {MemberMessage} from './message/MemberMessage';
 import {Message} from './message/Message';
 import {PingMessage} from './message/PingMessage';
 import {Text} from './message/Text';
@@ -298,7 +293,7 @@ describe('Conversation', () => {
 
   describe('getLastDeliveredMessage', () => {
     it('returns undefined if conversation has no messages', () => {
-      expect(conversation_et.getLastDeliveredMessage()).not.toBeDefined();
+      expect(conversation_et.lastDeliveredMessage()).not.toBeDefined();
     });
 
     it('returns last delivered message', () => {
@@ -311,35 +306,35 @@ describe('Conversation', () => {
       sentMessageEntity.status(StatusType.SENT);
       conversation_et.addMessage(sentMessageEntity);
 
-      expect(conversation_et.getLastDeliveredMessage()).not.toBeDefined();
+      expect(conversation_et.lastDeliveredMessage()).not.toBeDefined();
 
       const deliveredMessageEntity = new ContentMessage(createUuid());
       deliveredMessageEntity.user(selfUserEntity);
       deliveredMessageEntity.status(StatusType.DELIVERED);
       conversation_et.addMessage(deliveredMessageEntity);
 
-      expect(conversation_et.getLastDeliveredMessage()).toBe(deliveredMessageEntity);
+      expect(conversation_et.lastDeliveredMessage()).toBe(deliveredMessageEntity);
 
       const nextSentMessageEntity = new ContentMessage(createUuid());
       nextSentMessageEntity.user(selfUserEntity);
       nextSentMessageEntity.status(StatusType.SENT);
       conversation_et.addMessage(nextSentMessageEntity);
 
-      expect(conversation_et.getLastDeliveredMessage()).toBe(deliveredMessageEntity);
+      expect(conversation_et.lastDeliveredMessage()).toBe(deliveredMessageEntity);
 
       const nextDeliveredMessageEntity = new ContentMessage(createUuid());
       nextDeliveredMessageEntity.user(selfUserEntity);
       nextDeliveredMessageEntity.status(StatusType.DELIVERED);
       conversation_et.addMessage(nextDeliveredMessageEntity);
 
-      expect(conversation_et.getLastDeliveredMessage()).toBe(nextDeliveredMessageEntity);
+      expect(conversation_et.lastDeliveredMessage()).toBe(nextDeliveredMessageEntity);
 
       const remoteMessageEntity = new ContentMessage(createUuid());
       remoteMessageEntity.user(remoteUserEntity);
       remoteMessageEntity.status(StatusType.DELIVERED);
       conversation_et.addMessage(remoteMessageEntity);
 
-      expect(conversation_et.getLastDeliveredMessage()).toBe(nextDeliveredMessageEntity);
+      expect(conversation_et.lastDeliveredMessage()).toBe(nextDeliveredMessageEntity);
     });
   });
 
@@ -897,158 +892,6 @@ describe('Conversation', () => {
     });
   });
 
-  describe('shouldUnarchive', () => {
-    let timestamp: number = undefined;
-    let contentMessage: ContentMessage = undefined;
-    let mutedTimestampMessage: PingMessage = undefined;
-    let outdatedMessage: PingMessage = undefined;
-    let pingMessage: PingMessage = undefined;
-    let selfMentionMessage: ContentMessage = undefined;
-    const conversationEntity = new Conversation(createUuid());
-
-    const selfUserEntity = new User(createUuid(), null);
-    selfUserEntity.isMe = true;
-    selfUserEntity.inTeam(true);
-    conversationEntity.selfUser(selfUserEntity);
-
-    beforeEach(() => {
-      timestamp = Date.now();
-      conversationEntity.archivedTimestamp(timestamp);
-      conversationEntity.archivedState(true);
-
-      mutedTimestampMessage = new PingMessage();
-      mutedTimestampMessage.timestamp(timestamp);
-
-      outdatedMessage = new PingMessage();
-      outdatedMessage.timestamp(timestamp - 100);
-
-      contentMessage = new ContentMessage();
-      contentMessage.assets([new Text('id', 'Hello there')]);
-      contentMessage.timestamp(timestamp + 100);
-
-      pingMessage = new PingMessage();
-      pingMessage.timestamp(timestamp + 200);
-
-      selfMentionMessage = new ContentMessage();
-      const mentionEntity = new MentionEntity(0, 7, selfUserEntity.id, selfUserEntity.domain);
-      const textAsset = new Text('id', '@Gregor, Hello there');
-      textAsset.mentions.push(mentionEntity);
-      selfMentionMessage.assets([textAsset]);
-      selfMentionMessage.timestamp(timestamp + 300);
-    });
-
-    afterEach(() => conversationEntity.messages_unordered.removeAll());
-
-    it('returns false if conversation is not archived', () => {
-      conversationEntity.archivedState(false);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(outdatedMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(mutedTimestampMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(contentMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(pingMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(selfMentionMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-    });
-
-    it('returns false if conversation is in no notification state', () => {
-      conversationEntity.mutedState(NOTIFICATION_STATE.NOTHING);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(outdatedMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(mutedTimestampMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(contentMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(pingMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(selfMentionMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-    });
-
-    it('returns expected value if conversation is in only mentions notifications state', () => {
-      conversationEntity.mutedState(NOTIFICATION_STATE.MENTIONS_AND_REPLIES);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(outdatedMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(mutedTimestampMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(contentMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(pingMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(selfMentionMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(true);
-    });
-
-    it('returns expected value if conversation is in everything notifications state', () => {
-      conversationEntity.mutedState(NOTIFICATION_STATE.EVERYTHING);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(outdatedMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(mutedTimestampMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      conversationEntity.messages_unordered.push(contentMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(true);
-      conversationEntity.messages_unordered.removeAll();
-
-      const memberLeaveMessage = new MemberMessage();
-      memberLeaveMessage.type = CONVERSATION_EVENT.MEMBER_LEAVE;
-      memberLeaveMessage.timestamp(timestamp + 100);
-      conversationEntity.messages_unordered.push(memberLeaveMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-
-      const callMessage = new CallMessage(CALL_MESSAGE_TYPE.ACTIVATED);
-      callMessage.timestamp(timestamp + 200);
-      conversationEntity.messages_unordered.push(callMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(true);
-      conversationEntity.messages_unordered.removeAll();
-      conversationEntity.messages_unordered.push(memberLeaveMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      const memberJoinMessage = new MemberMessage();
-      memberJoinMessage.type = CONVERSATION_EVENT.MEMBER_JOIN;
-      memberJoinMessage.timestamp(timestamp + 200);
-      conversationEntity.messages_unordered.push(memberJoinMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(false);
-      const selfJoinMessage = new MemberMessage();
-      selfJoinMessage.type = CONVERSATION_EVENT.MEMBER_JOIN;
-      selfJoinMessage.userIds.push({domain: selfUserEntity.domain, id: selfUserEntity.id});
-      selfJoinMessage.timestamp(timestamp + 200);
-      conversationEntity.messages_unordered.push(selfJoinMessage);
-
-      expect(conversationEntity.shouldUnarchive()).toBe(true);
-    });
-  });
-
   describe('_incrementTimeOnly', () => {
     it('should update only to newer timestamps', () => {
       //@ts-ignore
diff --git a/src/script/entity/Conversation.ts b/src/script/entity/Conversation.ts
index ea6618b8b11..fc0fd27e9a8 100644
--- a/src/script/entity/Conversation.ts
+++ b/src/script/entity/Conversation.ts
@@ -42,10 +42,8 @@ import {truncate} from 'Util/StringUtil';
 
 import {CallMessage} from './message/CallMessage';
 import type {ContentMessage} from './message/ContentMessage';
-import type {MemberMessage} from './message/MemberMessage';
 import type {Message} from './message/Message';
 import {PingMessage} from './message/PingMessage';
-import type {SystemMessage} from './message/SystemMessage';
 import type {User} from './User';
 
 import type {Call} from '../calling/Call';
@@ -59,7 +57,7 @@ import {ConversationStatus} from '../conversation/ConversationStatus';
 import {ConversationVerificationState} from '../conversation/ConversationVerificationState';
 import {NOTIFICATION_STATE} from '../conversation/NotificationSetting';
 import {ConversationError} from '../error/ConversationError';
-import {isContentMessage} from '../guards/Message';
+import {isContentMessage, isDeleteMessage} from '../guards/Message';
 import {StatusType} from '../message/StatusType';
 import {ConversationRecord} from '../storage/record/ConversationRecord';
 import {TeamState} from '../team/TeamState';
@@ -86,8 +84,7 @@ enum TIMESTAMP_TYPE {
 export class Conversation {
   private readonly teamState: TeamState;
   public readonly archivedState: ko.Observable<boolean>;
-  private readonly incomingMessages: ko.ObservableArray<Message | ContentMessage | MemberMessage>;
-  private readonly isManaged: boolean;
+  private readonly incomingMessages: ko.ObservableArray<Message>;
   private readonly isTeam1to1: ko.PureComputed<boolean>;
   public readonly last_server_timestamp: ko.Observable<number>;
   private readonly logger: Logger;
@@ -113,7 +110,7 @@ export class Conversation {
   public cipherSuite: number = 1;
   public readonly isUsingMLSProtocol: boolean;
   public readonly display_name: ko.PureComputed<string>;
-  public readonly firstUserEntity: ko.PureComputed<User>;
+  public readonly firstUserEntity: ko.PureComputed<User | undefined>;
   public readonly enforcedTeamMessageTimer: ko.PureComputed<number>;
   public readonly globalMessageTimer: ko.Observable<number | null>;
   public readonly hasContentMessages: ko.Observable<boolean>;
@@ -132,6 +129,7 @@ export class Conversation {
   public readonly is_loaded: ko.Observable<boolean>;
   public readonly is_pending: ko.Observable<boolean>;
   public readonly is_verified: ko.PureComputed<boolean | undefined>;
+  public readonly isMLSVerified: ko.PureComputed<boolean | undefined>;
   public readonly is1to1: ko.PureComputed<boolean>;
   public readonly isActiveParticipant: ko.PureComputed<boolean>;
   public readonly isClearable: ko.PureComputed<boolean>;
@@ -151,9 +149,9 @@ export class Conversation {
   public readonly last_read_timestamp: ko.Observable<number>;
   public readonly legalHoldStatus: ko.Observable<LegalHoldStatus>;
   public readonly localMessageTimer: ko.Observable<number>;
-  public readonly messages_unordered: ko.ObservableArray<Message | ContentMessage | MemberMessage>;
-  public readonly messages_visible: ko.PureComputed<(Message | ContentMessage | MemberMessage)[]>;
-  public readonly messages: ko.PureComputed<(Message | ContentMessage | MemberMessage)[]>;
+  public readonly messages_unordered: ko.ObservableArray<Message>;
+  public readonly messages_visible: ko.PureComputed<Message[]>;
+  public readonly messages: ko.PureComputed<Message[]>;
   public readonly messageTimer: ko.PureComputed<number>;
   public readonly name: ko.Observable<string>;
   public readonly notificationState: ko.PureComputed<number>;
@@ -173,6 +171,7 @@ export class Conversation {
   public readonly type: ko.Observable<CONVERSATION_TYPE>;
   public readonly unreadState: ko.PureComputed<UnreadState>;
   public readonly verification_state: ko.Observable<ConversationVerificationState>;
+  public readonly mlsVerificationState: ko.Observable<ConversationVerificationState>;
   public readonly withAllTeamMembers: ko.Observable<boolean>;
   public readonly hasExternal: ko.PureComputed<boolean>;
   public readonly hasFederatedUsers: ko.PureComputed<boolean>;
@@ -231,7 +230,6 @@ export class Conversation {
     this.availabilityOfUser = ko.pureComputed(() => this.firstUserEntity()?.availability());
 
     this.isGuest = ko.observable(false);
-    this.isManaged = false;
 
     this.inTeam = ko.pureComputed(() => {
       const isSameTeam = this.selfUser()?.teamId === this.team_id;
@@ -257,7 +255,10 @@ export class Conversation {
       const is1to1Conversation = this.type() === CONVERSATION_TYPE.ONE_TO_ONE;
       return is1to1Conversation || this.isTeam1to1();
     });
-    this.isRequest = ko.pureComputed(() => this.type() === CONVERSATION_TYPE.CONNECT);
+    this.isRequest = ko.pureComputed(
+      () =>
+        this.type() === CONVERSATION_TYPE.CONNECT || (this.is1to1() && this.participating_user_ets()[0]?.isRequest()),
+    );
     this.isSelf = ko.pureComputed(() => this.type() === CONVERSATION_TYPE.SELF);
 
     this.hasDirectGuest = ko.pureComputed(() => {
@@ -290,6 +291,7 @@ export class Conversation {
     this.archivedState = ko.observable(false).extend({notify: 'always'});
     this.mutedState = ko.observable(NOTIFICATION_STATE.EVERYTHING);
     this.verification_state = ko.observable(ConversationVerificationState.UNVERIFIED);
+    this.mlsVerificationState = ko.observable(ConversationVerificationState.UNVERIFIED);
 
     this.archivedTimestamp = ko.observable(0);
     this.cleared_timestamp = ko.observable(0);
@@ -334,6 +336,13 @@ export class Conversation {
 
       return this.allUserEntities().every(userEntity => userEntity.is_verified());
     });
+    this.isMLSVerified = ko.pureComputed(() => {
+      if (!this.hasInitializedUsers()) {
+        return undefined;
+      }
+
+      return this.allUserEntities().every(userEntity => userEntity.isMLSVerified());
+    });
 
     this.legalHoldStatus = ko.observable(LegalHoldStatus.DISABLED);
 
@@ -679,7 +688,7 @@ export class Conversation {
    * @param messageEntity Message entity to be added to the conversation.
    * @returns If a message was replaced in the conversation
    */
-  addMessage(messageEntity: Message | ContentMessage | MemberMessage): boolean | void {
+  addMessage(messageEntity: Message): boolean | void {
     if (messageEntity) {
       const messageWithLinkPreview = () => this._findDuplicate(messageEntity.id, messageEntity.from);
       const editedMessage = () =>
@@ -692,11 +701,13 @@ export class Conversation {
       if (alreadyAdded) {
         return false;
       }
-      if (this.isShowingLastReceivedMessage()) {
+      if (this.hasLastReceivedMessageLoaded()) {
         this.updateTimestamps(messageEntity);
         this.incomingMessages.remove(({id}) => messageEntity.id === id);
+        // If the last received message is currently in memory, we can add this message to the displayed messages
         this.messages_unordered.push(messageEntity);
       } else {
+        // If the conversation is not loaded, we will add this message to the incoming messages (but not to the messages displayed)
         this.incomingMessages.push(messageEntity);
       }
       amplify.publish(WebAppEvents.CONVERSATION.MESSAGE.ADDED, messageEntity);
@@ -817,38 +828,6 @@ export class Conversation {
     this.messages_unordered.removeAll();
   }
 
-  shouldUnarchive(): boolean {
-    if (!this.archivedState() || this.showNotificationsNothing()) {
-      return false;
-    }
-
-    const isNewerMessage = (messageEntity: Message) => messageEntity.timestamp() > this.archivedTimestamp();
-
-    const {allEvents, allMessages, selfMentions, selfReplies} = this.unreadState();
-    if (this.showNotificationsMentionsAndReplies()) {
-      const mentionsAndReplies = selfMentions.concat(selfReplies);
-      return mentionsAndReplies.some(isNewerMessage);
-    }
-
-    const hasNewMessage = allMessages.some(isNewerMessage);
-    if (hasNewMessage) {
-      return true;
-    }
-
-    return allEvents.some(messageEntity => {
-      if (!isNewerMessage(messageEntity)) {
-        return false;
-      }
-
-      const isCallActivation = messageEntity.isCall() && messageEntity.isActivation();
-      const isMemberJoin = messageEntity.isMember() && (messageEntity as MemberMessage).isMemberJoin();
-      const wasSelfUserAdded =
-        isMemberJoin && (messageEntity as MemberMessage).isUserAffected(this.selfUser().qualifiedId);
-
-      return isCallActivation || wasSelfUserAdded;
-    });
-  }
-
   /**
    * Checks for message duplicates.
    *
@@ -868,8 +847,8 @@ export class Conversation {
   }
 
   private _findDuplicate(): undefined;
-  private _findDuplicate(messageId: string, from: string): Message | ContentMessage | MemberMessage;
-  private _findDuplicate(messageId?: string, from?: string): Message | ContentMessage | MemberMessage | undefined {
+  private _findDuplicate(messageId: string, from: string): Message;
+  private _findDuplicate(messageId?: string, from?: string): Message | undefined {
     if (messageId) {
       return this.messages_unordered().find(messageEntity => {
         const sameId = messageEntity.id === messageId;
@@ -896,10 +875,7 @@ export class Conversation {
    * @param message_et Message to be added to conversation
    * @param forceUpdate set the timestamp regardless of previous timestamp value (no checks)
    */
-  updateTimestamps(
-    message_et?: Message | ContentMessage | MemberMessage | SystemMessage,
-    forceUpdate: boolean = false,
-  ): void {
+  updateTimestamps(message_et?: Message, forceUpdate: boolean = false): void {
     if (message_et) {
       const timestamp = message_et.timestamp();
       if (timestamp <= this.last_server_timestamp()) {
@@ -918,21 +894,25 @@ export class Conversation {
     }
   }
 
-  getAllMessages(): (Message | ContentMessage | MemberMessage | SystemMessage)[] {
+  getAllMessages(): Message[] {
     return this.messages();
   }
 
   /**
-   * Get the first message of the conversation.
+   * Get the oldest loaded message of the conversation.
    */
-  getOldestMessage(): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
-    return this.messages()[0];
+  getOldestMessage(): Message | undefined {
+    return this.messages().find(
+      message =>
+        // Deleted message should be ignored since they might have a timestamp in the past (the timestamp of a delete message is the timestamp of the message that was deleted)
+        !isDeleteMessage(message),
+    );
   }
 
   /**
    * Get the last message of the conversation.
    */
-  getNewestMessage(): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  getNewestMessage(): Message | undefined {
     return this.messages()[this.messages().length - 1];
   }
 
@@ -940,7 +920,7 @@ export class Conversation {
    * Get the message before a given message.
    * @param message_et Message to look up from
    */
-  getPreviousMessage(message_et: Message): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  getPreviousMessage(message_et: Message): Message | undefined {
     const messages_visible = this.messages_visible();
     const message_index = messages_visible.indexOf(message_et);
     if (message_index > 0) {
@@ -952,7 +932,7 @@ export class Conversation {
   /**
    * Get the last text message that was added by self user.
    */
-  getLastEditableMessage(): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  getLastEditableMessage(): ContentMessage | undefined {
     const messages = this.messages();
     for (let index = messages.length - 1; index >= 0; index--) {
       const message_et = messages[index];
@@ -966,12 +946,12 @@ export class Conversation {
   /**
    * Get the last delivered message.
    */
-  getLastDeliveredMessage(): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  private getLastDeliveredMessage(): Message | undefined {
     return this.messages()
       .slice()
       .reverse()
       .find(messageEntity => {
-        const isDelivered = messageEntity.status() >= StatusType.DELIVERED;
+        const isDelivered = [StatusType.DELIVERED, StatusType.SEEN].includes(messageEntity.status());
         return isDelivered && messageEntity.user().isMe;
       });
   }
@@ -982,7 +962,7 @@ export class Conversation {
    *
    * @param messageId ID of message to be retrieved
    */
-  getMessage(messageId: string): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  getMessage(messageId: string): Message | undefined {
     return this.messages().find(messageEntity => messageEntity.id === messageId);
   }
   /**
@@ -991,7 +971,7 @@ export class Conversation {
    *
    * @param messageId ID of message to be retrieved
    */
-  getMessageByReplacementId(messageId: string): Message | ContentMessage | MemberMessage | SystemMessage | undefined {
+  getMessageByReplacementId(messageId: string): Message | undefined {
     return this.messages().find(
       messageEntity => isContentMessage(messageEntity) && messageEntity.replacing_message_id === messageId,
     );
@@ -1015,6 +995,17 @@ export class Conversation {
     return userEntities.filter(userEntity => !userEntity.is_verified());
   }
 
+  getUsersWithUnverifiedMLSClients(): User[] {
+    const userEntities = this.selfUser()
+      ? this.participating_user_ets().concat(this.selfUser())
+      : this.participating_user_ets();
+    return userEntities.filter(userEntity => !userEntity.isMLSVerified());
+  }
+
+  getAllUserEntities(): User[] {
+    return this.participating_user_ets();
+  }
+
   supportsVideoCall(sftEnabled: boolean): boolean {
     if (sftEnabled) {
       return true;
@@ -1024,10 +1015,9 @@ export class Conversation {
     return participantCount <= config.MAX_VIDEO_PARTICIPANTS;
   }
 
-  readonly isShowingLastReceivedMessage = (): boolean => {
-    return this.getNewestMessage()?.timestamp()
-      ? this.getNewestMessage().timestamp() >= this.last_event_timestamp()
-      : true;
+  readonly hasLastReceivedMessageLoaded = (): boolean => {
+    const newestMessage = this.getNewestMessage();
+    return newestMessage?.timestamp() ? newestMessage.timestamp() >= this.last_event_timestamp() : true;
   };
 
   serialize(): ConversationRecord {
@@ -1046,7 +1036,6 @@ export class Conversation {
       group_id: this.groupId,
       id: this.id,
       is_guest: this.isGuest(),
-      is_managed: this.isManaged,
       last_event_timestamp: this.last_event_timestamp(),
       last_read_timestamp: this.last_read_timestamp(),
       last_server_timestamp: this.last_server_timestamp(),
@@ -1063,6 +1052,7 @@ export class Conversation {
       team_id: this.team_id,
       type: this.type(),
       verification_state: this.verification_state(),
+      mlsVerificationState: this.mlsVerificationState(),
     };
   }
 }
diff --git a/src/script/entity/User/User.ts b/src/script/entity/User/User.ts
index a14ff3bbe52..25512fff2d4 100644
--- a/src/script/entity/User/User.ts
+++ b/src/script/entity/User/User.ts
@@ -17,6 +17,8 @@
  *
  */
 
+import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
 import {QualifiedId} from '@wireapp/api-client/lib/user';
 import {amplify} from 'amplify';
 import ko from 'knockout';
@@ -45,7 +47,6 @@ export class User {
   public isService: boolean;
   public isSingleSignOn: boolean;
   public isNoPasswordSSO: boolean;
-  public joaatHash: number;
   public providerId?: string;
   public readonly accent_color: ko.PureComputed<string>;
   public readonly accent_id: ko.Observable<number>;
@@ -53,6 +54,7 @@ export class User {
   public readonly connection: ko.Observable<ConnectionEntity>;
   /** does not include current client/device */
   public readonly devices: ko.ObservableArray<ClientEntity>;
+  public localClient: ClientEntity | undefined;
   public readonly email: ko.Observable<string>;
   public locale?: string;
   public readonly expirationRemaining: ko.Observable<number>;
@@ -62,13 +64,17 @@ export class User {
   public readonly initials: ko.PureComputed<string>;
   public readonly inTeam: ko.Observable<boolean>;
   public readonly is_trusted: ko.PureComputed<boolean>;
+  // Manual Proteus verification
   public readonly is_verified: ko.PureComputed<boolean>;
+  // MLS certificate verification
+  public readonly isMLSVerified: ko.PureComputed<boolean>;
   public readonly isBlocked: ko.PureComputed<boolean>;
   public readonly isCanceled: ko.PureComputed<boolean>;
   public readonly isConnected: ko.PureComputed<boolean>;
   public readonly isExpired: ko.Observable<boolean>;
   public readonly isExternal: ko.PureComputed<boolean>;
   public readonly isGuest: ko.Observable<boolean>;
+  public readonly isActivatedAccount: ko.PureComputed<boolean>;
   /** indicates whether that user entity is available (if we have metadata for the user, it's considered available) */
   public readonly isAvailable: ko.PureComputed<boolean>;
 
@@ -98,6 +104,7 @@ export class User {
   /** The federated domain (when the user is on a federated server) */
   public domain: string;
   public readonly isBlockedLegalHold: ko.PureComputed<boolean>;
+  public readonly supportedProtocols: ko.Observable<null | ConversationProtocol[]>;
 
   static get ACCENT_COLOR() {
     return {
@@ -135,7 +142,6 @@ export class User {
     this.providerId = undefined;
     this.serviceId = undefined;
 
-    this.joaatHash = -1;
     this.isAvailable = ko.pureComputed(() => this.id !== '' && this.name() !== '');
 
     this.accent_id = ko.observable(ACCENT_ID.BLUE);
@@ -147,6 +153,8 @@ export class User {
 
     this.name = ko.observable('');
 
+    this.supportedProtocols = ko.observable<null | ConversationProtocol[]>(null);
+
     this.managedBy = ko.observable(User.CONFIG.MANAGED_BY.WIRE);
 
     this.initials = ko.pureComputed(() => {
@@ -182,6 +190,7 @@ export class User {
       return this.isGuest() && !this.isFederated;
     });
     this.isTemporaryGuest = ko.observable(false);
+    this.isActivatedAccount = ko.pureComputed(() => !this.isTemporaryGuest());
     this.teamRole = ko.observable(TEAM_ROLE.NONE);
     this.teamId = undefined;
 
@@ -194,11 +203,22 @@ export class User {
     });
 
     this.devices = ko.observableArray();
+    // Proteus verification
     this.is_verified = ko.pureComputed(() => {
       if (this.devices().length === 0 && !this.isMe) {
         return false;
       }
-      return this.devices().every(client_et => client_et.meta.isVerified());
+      return this.devices().every(client_et => client_et.meta.isVerified?.());
+    });
+    this.isMLSVerified = ko.pureComputed(() => {
+      if (this.devices().length === 0) {
+        if (!this.isMe) {
+          return false;
+        }
+
+        return this.localClient?.meta.isMLSVerified?.() ?? false;
+      }
+      return this.devices().every(client_et => client_et.meta.isMLSVerified?.() ?? false);
     });
     this.isOnLegalHold = ko.pureComputed(() => {
       return this.devices().some(client_et => client_et.isLegalHold());
@@ -241,6 +261,10 @@ export class User {
     return this.isFederated ? `@${this.username()}@${this.domain}` : `@${this.username()}`;
   }
 
+  markConnectionAsUnknown() {
+    this.connection().status(ConnectionStatus.UNKNOWN);
+  }
+
   addClient(new_client_et: ClientEntity): boolean {
     for (const client_et of this.devices()) {
       if (client_et.id === new_client_et.id) {
diff --git a/src/script/entity/message/CallingTimeoutMessage.ts b/src/script/entity/message/CallingTimeoutMessage.ts
index 2df1e5c80ea..b872be68b03 100644
--- a/src/script/entity/message/CallingTimeoutMessage.ts
+++ b/src/script/entity/message/CallingTimeoutMessage.ts
@@ -24,7 +24,10 @@ import {Message} from './Message';
 import {SuperType} from '../../message/SuperType';
 
 export class CallingTimeoutMessage extends Message {
-  constructor(public reason: AVS_REASON.NOONE_JOINED | AVS_REASON.EVERYONE_LEFT, time: number) {
+  constructor(
+    public reason: AVS_REASON.NOONE_JOINED | AVS_REASON.EVERYONE_LEFT,
+    time: number,
+  ) {
     super();
     this.super_type = SuperType.CALL_TIME_OUT;
     this.timestamp(time);
diff --git a/src/script/entity/message/ContentMessage.ts b/src/script/entity/message/ContentMessage.ts
index 816af6d5008..ec255863ca9 100644
--- a/src/script/entity/message/ContentMessage.ts
+++ b/src/script/entity/message/ContentMessage.ts
@@ -19,6 +19,7 @@
 
 import type {QualifiedUserClients} from '@wireapp/api-client/lib/conversation';
 import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {ReactionType} from '@wireapp/core/lib/conversation/ReactionType';
 import ko from 'knockout';
 
 import {copyText} from 'Util/ClipboardUtil';
@@ -37,11 +38,6 @@ import {SuperType} from '../../message/SuperType';
 import {UserReactionMap} from '../../storage';
 import {User} from '../User';
 
-export enum ReactionType {
-  LIKE = '❤️',
-  NONE = '',
-}
-
 export class ContentMessage extends Message {
   private readonly isLikedProvisional: ko.Observable<boolean>;
   public readonly reactions_user_ets: ko.ObservableArray<User>;
@@ -97,12 +93,18 @@ export class ContentMessage extends Message {
 
     this.like_caption = ko.pureComputed(() => {
       const maxShownNames = 2;
-      if (this.reactions_user_ets().length <= maxShownNames) {
+      const likesAmount = this.reactions_user_ets().length;
+      if (likesAmount <= maxShownNames) {
         return this.reactions_user_ets()
           .map(user => user.name())
           .join(', ');
       }
-      return t('conversationLikesCaption', this.reactions_user_ets().length);
+      const caption =
+        likesAmount > 1
+          ? t('conversationLikesCaptionPlural', likesAmount.toString())
+          : t('conversationLikesCaptionSingular', likesAmount.toString());
+
+      return caption;
     });
   }
 
@@ -137,24 +139,9 @@ export class ContentMessage extends Message {
     data: {reaction: ReactionType};
     from: string;
   }): false | {reactions: UserReactionMap; version: number} {
-    const reaction = event_data && event_data.reaction;
-    const hasUser = this.reactions()[from];
-    const shouldAdd = reaction && !hasUser;
-    const shouldDelete = !reaction && hasUser;
-
-    if (!shouldAdd && !shouldDelete) {
-      return false;
-    }
-
-    const newReactions = {...this.reactions()};
-
-    if (shouldAdd) {
-      newReactions[from] = reaction;
-    } else {
-      delete newReactions[from];
-    }
-
-    return {reactions: newReactions, version: this.version + 1};
+    const reactions = event_data && event_data.reaction;
+    const userReactions = {...this.reactions(), [from]: reactions};
+    return {reactions: userReactions, version: this.version + 1};
   }
 
   /**
diff --git a/src/script/entity/message/DecryptErrorMessage.ts b/src/script/entity/message/DecryptErrorMessage.ts
index 42a7bb54949..235717f2e50 100644
--- a/src/script/entity/message/DecryptErrorMessage.ts
+++ b/src/script/entity/message/DecryptErrorMessage.ts
@@ -24,7 +24,10 @@ import {Message} from './Message';
 import {SuperType} from '../../message/SuperType';
 
 export class DecryptErrorMessage extends Message {
-  constructor(public readonly clientId: string, public readonly code: number) {
+  constructor(
+    public readonly clientId: string,
+    public readonly code: number,
+  ) {
     super();
     this.super_type = SuperType.UNABLE_TO_DECRYPT;
   }
diff --git a/src/script/entity/message/DeleteConversationMessage.ts b/src/script/entity/message/DeleteConversationMessage.ts
index 33a578c92b3..24bb24795e2 100644
--- a/src/script/entity/message/DeleteConversationMessage.ts
+++ b/src/script/entity/message/DeleteConversationMessage.ts
@@ -18,7 +18,6 @@
  */
 
 import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent';
-import ko from 'knockout';
 
 import {t} from 'Util/LocalizerUtil';
 
@@ -28,19 +27,14 @@ import {SystemMessageType} from '../../message/SystemMessageType';
 import type {Conversation} from '../Conversation';
 
 export class DeleteConversationMessage extends SystemMessage {
-  public readonly system_message_type: SystemMessageType;
-  public readonly caption: ko.PureComputed<string>;
-
   constructor(conversationEntity: Conversation) {
     super();
 
     this.type = TEAM_EVENT.DELETE;
     this.system_message_type = SystemMessageType.CONVERSATION_DELETE;
 
-    this.caption = ko.pureComputed(() =>
-      conversationEntity
-        ? t('notificationConversationDeletedNamed', conversationEntity.name())
-        : t('notificationConversationDeleted'),
-    );
+    this.caption = conversationEntity
+      ? t('notificationConversationDeletedNamed', conversationEntity.name())
+      : t('notificationConversationDeleted');
   }
 }
diff --git a/src/script/entity/message/FailedToAddUsersMessage.ts b/src/script/entity/message/FailedToAddUsersMessage.ts
index 16d036b9ad2..e9949b44a2c 100644
--- a/src/script/entity/message/FailedToAddUsersMessage.ts
+++ b/src/script/entity/message/FailedToAddUsersMessage.ts
@@ -18,13 +18,19 @@
  */
 
 import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {AddUsersFailureReasons} from '@wireapp/core/lib/conversation';
 
 import {Message} from './Message';
 
 import {SuperType} from '../../message/SuperType';
 
 export class FailedToAddUsersMessage extends Message {
-  constructor(public qualifiedIds: QualifiedId[], time: number) {
+  constructor(
+    public readonly qualifiedIds: QualifiedId[],
+    public readonly reason: AddUsersFailureReasons,
+    public readonly backends: string[] = [],
+    time: number,
+  ) {
     super();
     this.super_type = SuperType.FAILED_TO_ADD_USERS;
     this.timestamp(time);
diff --git a/src/script/entity/message/FederationStopMessage.ts b/src/script/entity/message/FederationStopMessage.ts
new file mode 100644
index 00000000000..c9a5bbfca22
--- /dev/null
+++ b/src/script/entity/message/FederationStopMessage.ts
@@ -0,0 +1,36 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Message} from './Message';
+
+import {SuperType} from '../../message/SuperType';
+
+/**
+ * Federation stop system message
+ */
+export class FederationStopMessage extends Message {
+  constructor(
+    public readonly domains: string[],
+    timestamp: number,
+  ) {
+    super();
+    this.super_type = SuperType.FEDERATION_STOP;
+    this.timestamp(timestamp);
+  }
+}
diff --git a/src/script/entity/message/LegalHoldMessage.ts b/src/script/entity/message/LegalHoldMessage.ts
index a999b195971..429fa8bad5c 100644
--- a/src/script/entity/message/LegalHoldMessage.ts
+++ b/src/script/entity/message/LegalHoldMessage.ts
@@ -27,7 +27,10 @@ import {SuperType} from '../../message/SuperType';
  * Legal hold system message
  */
 export class LegalHoldMessage extends Message {
-  constructor(public legalHoldStatus: LegalHoldStatus, timestamp: number) {
+  constructor(
+    public legalHoldStatus: LegalHoldStatus,
+    timestamp: number,
+  ) {
     super();
     this.super_type = SuperType.LEGALHOLD;
     this.timestamp(timestamp);
diff --git a/src/script/entity/message/MLSConversationRecoveredMessage.ts b/src/script/entity/message/MLSConversationRecoveredMessage.ts
new file mode 100644
index 00000000000..2f0d07fad55
--- /dev/null
+++ b/src/script/entity/message/MLSConversationRecoveredMessage.ts
@@ -0,0 +1,31 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {SystemMessageType} from 'src/script/message/SystemMessageType';
+import {t} from 'Util/LocalizerUtil';
+
+import {SystemMessage} from './SystemMessage';
+
+export class MLSConversationRecoveredMessage extends SystemMessage {
+  constructor() {
+    super();
+    this.system_message_type = SystemMessageType.MLS_CONVERSATION_RECOVERED;
+    this.caption = t('mlsConversationRecovered');
+  }
+}
diff --git a/src/script/entity/message/MemberMessage.ts b/src/script/entity/message/MemberMessage.ts
index 4cb229d78c3..502a2cddb02 100644
--- a/src/script/entity/message/MemberMessage.ts
+++ b/src/script/entity/message/MemberMessage.ts
@@ -22,13 +22,12 @@ import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
 import ko from 'knockout';
 
-import {Declension, getUserName, joinNames, replaceLink, t} from 'Util/LocalizerUtil';
+import {Declension, getUserName, t} from 'Util/LocalizerUtil';
 import {matchQualifiedIds} from 'Util/QualifiedId';
 import {capitalizeFirstChar} from 'Util/StringUtil';
 
 import {SystemMessage} from './SystemMessage';
 
-import {Config} from '../../Config';
 import {ClientEvent} from '../../event/Client';
 import {SuperType} from '../../message/SuperType';
 import {SystemMessageType} from '../../message/SystemMessageType';
@@ -36,32 +35,22 @@ import {User} from '../User';
 
 export class MemberMessage extends SystemMessage {
   public allTeamMembers: User[];
-  private readonly exceedsMaxVisibleUsers: ko.PureComputed<boolean>;
   public readonly hasUsers: ko.PureComputed<boolean>;
-  private readonly hiddenUserCount: ko.PureComputed<number>;
-  private readonly joinedUserEntities: ko.PureComputed<User[]>;
+  public readonly userIds: ko.ObservableArray<QualifiedId>;
+  public readonly userEntities: ko.ObservableArray<User>;
+  /** Users that are affected by the event */
+  public readonly targetedUsers: ko.PureComputed<User[]>;
   public readonly name: ko.Observable<string>;
   public readonly otherUser: ko.PureComputed<User>;
   public readonly senderName: ko.PureComputed<string>;
   public readonly showNamedCreation: ko.PureComputed<boolean>;
-  private readonly visibleUsers: ko.Observable<User[]>;
-  public readonly highlightedUsers: ko.PureComputed<User[]>;
-  public readonly htmlCaption: ko.PureComputed<string>;
   public readonly htmlGroupCreationHeader: ko.PureComputed<string>;
   public readonly remoteUserEntities: ko.PureComputed<User[]>;
   public showServicesWarning: boolean;
-  public readonly userEntities: ko.ObservableArray<User>;
-  public readonly userIds: ko.ObservableArray<QualifiedId>;
   public memberMessageType: SystemMessageType;
   public reason: MemberLeaveReason;
-
-  static get CONFIG() {
-    return {
-      MAX_USERS_VISIBLE: 17,
-      MAX_WHOLE_TEAM_USERS_VISIBLE: 10,
-      REDUCED_USERS_COUNT: 15,
-    };
-  }
+  /** this can be used to check uniqueness of the message. It's computed using the timestamp + users involved in the event */
+  public readonly hash: ko.PureComputed<string>;
 
   constructor() {
     super();
@@ -73,35 +62,17 @@ export class MemberMessage extends SystemMessage {
     this.userIds = ko.observableArray();
     this.name = ko.observable('');
 
-    this.exceedsMaxVisibleUsers = ko.pureComputed(() => {
-      return this.joinedUserEntities().length > MemberMessage.CONFIG.MAX_USERS_VISIBLE;
-    });
-    this.visibleUsers = ko.observable([]);
-    this.hiddenUserCount = ko.pureComputed(() => this.joinedUserEntities().length - this.visibleUsers().length);
-    this.highlightedUsers = ko.pureComputed(() => {
-      return this.type === CONVERSATION_EVENT.MEMBER_JOIN ? this.joinedUserEntities() : [];
-    });
-
     this.hasUsers = ko.pureComputed(() => !!this.userEntities().length);
     this.allTeamMembers = undefined;
     this.showServicesWarning = false;
 
-    // Users joined the conversation without sender
-    this.joinedUserEntities = ko.pureComputed(() => {
-      return this.userEntities().filter(userEntity => !matchQualifiedIds(this.user(), userEntity));
+    this.hash = ko.pureComputed(() => {
+      const users = this.userIds().map(({id}) => id);
+      return `${this.timestamp()}${users.join('')}`;
     });
 
-    this.joinedUserEntities.subscribe(joinedUserEntities => {
-      const selfUser = joinedUserEntities.find(userEntity => userEntity.isMe);
-      const visibleUsers = joinedUserEntities.filter(userEntity => !userEntity.isMe);
-      if (this.exceedsMaxVisibleUsers()) {
-        const spliceCount = MemberMessage.CONFIG.REDUCED_USERS_COUNT;
-        visibleUsers.splice(selfUser ? spliceCount - 1 : spliceCount);
-      }
-      if (selfUser) {
-        visibleUsers.push(selfUser);
-      }
-      this.visibleUsers(visibleUsers);
+    this.targetedUsers = ko.pureComputed(() => {
+      return this.userEntities().filter(userEntity => !matchQualifiedIds(this.user(), userEntity));
     });
 
     // Users joined the conversation without self
@@ -118,129 +89,6 @@ export class MemberMessage extends SystemMessage {
 
     this.otherUser = ko.pureComputed(() => (this.hasUsers() ? this.userEntities()[0] : new User('', null)));
 
-    this.htmlCaption = ko.pureComputed(() => {
-      if (!this.hasUsers()) {
-        return '';
-      }
-
-      const replaceShowMore = {
-        '/showmore': '</a>',
-        showmore: '<a class="message-header-show-more" data-uie-name="do-show-more">',
-      };
-
-      const count = this.hiddenUserCount();
-      const dativeUsers = this.generateNameString(this.exceedsMaxVisibleUsers(), Declension.DATIVE);
-      const accusativeUsers = this.generateNameString(this.exceedsMaxVisibleUsers(), Declension.ACCUSATIVE);
-      const name = this.senderName();
-
-      switch (this.memberMessageType) {
-        case SystemMessageType.CONNECTION_ACCEPTED:
-        case SystemMessageType.CONNECTION_REQUEST: {
-          if (this.otherUser()) {
-            if (this.otherUser().isBlocked()) {
-              return t('conversationConnectionBlocked');
-            }
-
-            if (this.otherUser().isOutgoingRequest()) {
-              return '';
-            }
-          }
-
-          return t('conversationConnectionAccepted');
-        }
-
-        case SystemMessageType.CONVERSATION_CREATE: {
-          if (this.name().length) {
-            const exceedsMaxTeam = this.joinedUserEntities().length > MemberMessage.CONFIG.MAX_WHOLE_TEAM_USERS_VISIBLE;
-            if (this.allTeamMembers && exceedsMaxTeam) {
-              const guestCount = this.joinedUserEntities().filter(userEntity => userEntity.isGuest()).length;
-              if (!guestCount) {
-                return t('conversationCreateTeam', {}, replaceShowMore);
-              }
-
-              const hasSingleGuest = guestCount === 1;
-              return hasSingleGuest
-                ? t('conversationCreateTeamGuest', {}, replaceShowMore)
-                : t('conversationCreateTeamGuests', guestCount, replaceShowMore);
-            }
-
-            return this.exceedsMaxVisibleUsers()
-              ? t('conversationCreateWithMore', {count: count.toString(), users: dativeUsers}, replaceShowMore)
-              : t('conversationCreateWith', dativeUsers);
-          }
-
-          if (this.user().isMe) {
-            return this.exceedsMaxVisibleUsers()
-              ? t('conversationCreatedYouMore', {count: count.toString(), users: dativeUsers}, replaceShowMore)
-              : t('conversationCreatedYou', dativeUsers);
-          }
-
-          return this.exceedsMaxVisibleUsers()
-            ? t('conversationCreatedMore', {count: count.toString(), name, users: dativeUsers}, replaceShowMore)
-            : t('conversationCreated', {name, users: dativeUsers});
-        }
-
-        case SystemMessageType.CONVERSATION_RESUME: {
-          return t('conversationResume', this.generateNameString(false, Declension.DATIVE));
-        }
-
-        default:
-          break;
-      }
-
-      switch (this.type) {
-        case CONVERSATION_EVENT.MEMBER_JOIN: {
-          const senderJoined = matchQualifiedIds(this.otherUser(), this.user());
-          if (senderJoined) {
-            return this.user().isMe
-              ? t('conversationMemberJoinedSelfYou')
-              : t('conversationMemberJoinedSelf', this.senderName());
-          }
-
-          if (this.user().isMe) {
-            return this.exceedsMaxVisibleUsers()
-              ? t('conversationMemberJoinedYouMore', {count: count.toString(), users: accusativeUsers}, replaceShowMore)
-              : t('conversationMemberJoinedYou', accusativeUsers, replaceShowMore);
-          }
-          return this.exceedsMaxVisibleUsers()
-            ? t(
-                'conversationMemberJoinedMore',
-                {count: count.toString(), name, users: accusativeUsers},
-                replaceShowMore,
-              )
-            : t('conversationMemberJoined', {name, users: accusativeUsers}, replaceShowMore);
-        }
-
-        case CONVERSATION_EVENT.MEMBER_LEAVE: {
-          if (this.reason === MemberLeaveReason.LEGAL_HOLD_POLICY_CONFLICT) {
-            return this.generateLegalHoldLeaveMessage();
-          }
-          const temporaryGuestRemoval = this.otherUser().isMe && this.otherUser().isTemporaryGuest();
-          if (temporaryGuestRemoval) {
-            return t('temporaryGuestLeaveMessage');
-          }
-
-          const senderLeft = matchQualifiedIds(this.otherUser(), this.user());
-          if (senderLeft) {
-            return this.user().isMe ? t('conversationMemberLeftYou') : t('conversationMemberLeft', name);
-          }
-
-          const allUsers = this.generateNameString();
-          return this.user().isMe
-            ? t('conversationMemberRemovedYou', allUsers)
-            : t('conversationMemberRemoved', {name, users: allUsers});
-        }
-
-        case ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE: {
-          return t('conversationTeamLeft', name);
-        }
-
-        default:
-          break;
-      }
-      return '';
-    });
-
     this.htmlGroupCreationHeader = ko.pureComputed(() => {
       if (this.showNamedCreation()) {
         if (this.user().isTemporaryGuest()) {
@@ -256,42 +104,6 @@ export class MemberMessage extends SystemMessage {
     });
   }
 
-  private readonly generateLegalHoldLeaveMessage = () => {
-    const replaceLinkLegalHold = replaceLink(
-      Config.getConfig().URL.SUPPORT.LEGAL_HOLD_BLOCK,
-      '',
-      'read-more-legal-hold',
-    );
-    if (this.userEntities().some(user => user.isMe)) {
-      return t('conversationYouRemovedMissingLegalHoldConsent', {}, replaceLinkLegalHold);
-    }
-    const users = this.generateNameString(this.exceedsMaxVisibleUsers());
-
-    if (this.userEntities().length === 1) {
-      return t('conversationMemberRemovedMissingLegalHoldConsent', users, replaceLinkLegalHold);
-    }
-    if (this.exceedsMaxVisibleUsers()) {
-      return t(
-        'conversationMultipleMembersRemovedMissingLegalHoldConsentMore',
-        {
-          count: this.hiddenUserCount().toString(10),
-          users,
-        },
-        replaceLinkLegalHold,
-      );
-    }
-    return t('conversationMultipleMembersRemovedMissingLegalHoldConsent', users, replaceLinkLegalHold);
-  };
-
-  readonly showLargeAvatar = (): boolean => {
-    const largeAvatarTypes = [SystemMessageType.CONNECTION_ACCEPTED, SystemMessageType.CONNECTION_REQUEST];
-    return largeAvatarTypes.includes(this.memberMessageType);
-  };
-
-  private generateNameString(skipAnd = false, declension = Declension.ACCUSATIVE): string {
-    return joinNames(this.visibleUsers(), declension, skipAnd, true);
-  }
-
   isConnection(): boolean {
     const connectionMessageTypes = [SystemMessageType.CONNECTION_ACCEPTED, SystemMessageType.CONNECTION_REQUEST];
     return connectionMessageTypes.includes(this.memberMessageType);
@@ -345,8 +157,4 @@ export class MemberMessage extends SystemMessage {
   isUserAffected(userId: QualifiedId): boolean {
     return !!this.userIds().find(user => matchQualifiedIds(user, userId));
   }
-
-  guestCount(): number {
-    return this.joinedUserEntities().filter(user => user.isGuest()).length;
-  }
 }
diff --git a/src/script/entity/message/Message.ts b/src/script/entity/message/Message.ts
index 77aba96d19d..77a46223e7e 100644
--- a/src/script/entity/message/Message.ts
+++ b/src/script/entity/message/Message.ts
@@ -31,14 +31,15 @@ import type {CallMessage} from './CallMessage';
 import type {CompositeMessage} from './CompositeMessage';
 import type {ContentMessage} from './ContentMessage';
 import type {DecryptErrorMessage} from './DecryptErrorMessage';
-import {DeleteMessage} from './DeleteMessage';
-import {FailedToAddUsersMessage} from './FailedToAddUsersMessage';
+import type {DeleteMessage} from './DeleteMessage';
+import type {FailedToAddUsersMessage} from './FailedToAddUsersMessage';
+import type {FederationStopMessage} from './FederationStopMessage';
 import type {FileAsset} from './FileAsset';
-import {FileTypeRestrictedMessage} from './FileTypeRestrictedMessage';
+import type {FileTypeRestrictedMessage} from './FileTypeRestrictedMessage';
 import type {LegalHoldMessage} from './LegalHoldMessage';
 import type {LinkPreview} from './LinkPreview';
 import type {MemberMessage} from './MemberMessage';
-import {MissedMessage} from './MissedMessage';
+import type {MissedMessage} from './MissedMessage';
 import type {PingMessage} from './PingMessage';
 import type {SystemMessage} from './SystemMessage';
 import type {VerificationMessage} from './VerificationMessage';
@@ -340,6 +341,10 @@ export class Message {
     return this.super_type === SuperType.VERIFICATION;
   }
 
+  isFederationStop(): this is FederationStopMessage {
+    return this.super_type === SuperType.FEDERATION_STOP;
+  }
+
   isLegalHold(): this is LegalHoldMessage {
     return this.super_type === SuperType.LEGALHOLD;
   }
@@ -357,7 +362,7 @@ export class Message {
    * Check if message can be edited.
    * @returns `true`, if message can be edited, `false` otherwise.
    */
-  isEditable(): boolean {
+  isEditable(): this is ContentMessage {
     return this.hasAssetText() && this.user().isMe && !this.isEphemeral();
   }
 
diff --git a/src/script/entity/message/MessageTimerUpdateMessage.ts b/src/script/entity/message/MessageTimerUpdateMessage.ts
index 33d0d0a9331..89ad40b938a 100644
--- a/src/script/entity/message/MessageTimerUpdateMessage.ts
+++ b/src/script/entity/message/MessageTimerUpdateMessage.ts
@@ -18,7 +18,6 @@
  */
 
 import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
-import ko from 'knockout';
 
 import {t} from 'Util/LocalizerUtil';
 import {formatDuration} from 'Util/TimeUtil';
@@ -39,15 +38,15 @@ export class MessageTimerUpdateMessage extends SystemMessage {
 
     this.message_timer = ConversationEphemeralHandler.validateTimer(messageTimer);
 
-    this.caption = ko.pureComputed(() => {
-      if (this.message_timer) {
-        const timeString = formatDuration(this.message_timer).text;
-        return this.user().isMe
-          ? t('conversationUpdatedTimerYou', timeString)
-          : t('conversationUpdatedTimer', timeString);
-      }
-
-      return this.user().isMe ? t('conversationResetTimerYou') : t('conversationResetTimer');
-    });
+    this.caption = getCaption(this.message_timer, this.user().isMe);
   }
 }
+
+const getCaption = (messageTimer: number, isSelfUser: boolean) => {
+  if (messageTimer) {
+    const timeString = formatDuration(messageTimer).text;
+    return isSelfUser ? t('conversationUpdatedTimerYou', timeString) : t('conversationUpdatedTimer', timeString);
+  }
+
+  return isSelfUser ? t('conversationResetTimerYou') : t('conversationResetTimer');
+};
diff --git a/src/script/entity/message/ReceiptModeUpdateMessage.ts b/src/script/entity/message/ReceiptModeUpdateMessage.ts
index cd8faa8b41b..aef3a2966a4 100644
--- a/src/script/entity/message/ReceiptModeUpdateMessage.ts
+++ b/src/script/entity/message/ReceiptModeUpdateMessage.ts
@@ -18,7 +18,6 @@
  */
 
 import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
-import ko from 'knockout';
 
 import {t} from 'Util/LocalizerUtil';
 
@@ -33,11 +32,13 @@ export class ReceiptModeUpdateMessage extends SystemMessage {
     this.type = CONVERSATION_EVENT.RECEIPT_MODE_UPDATE;
     this.system_message_type = SystemMessageType.CONVERSATION_RECEIPT_MODE_UPDATE;
 
-    this.caption = ko.pureComputed(() => {
-      if (isReceiptEnabled) {
-        return this.user().isMe ? t('conversationReceiptsOnYou') : t('conversationReceiptsOn');
-      }
-      return this.user().isMe ? t('conversationReceiptsOffYou') : t('conversationReceiptsOff');
-    });
+    this.caption = getCaption(isReceiptEnabled, this.user().isMe);
   }
 }
+
+const getCaption = (isReceiptEnabled: boolean, isSelfUser: boolean) => {
+  if (isReceiptEnabled) {
+    return isSelfUser ? t('conversationReceiptsOnYou') : t('conversationReceiptsOn');
+  }
+  return isSelfUser ? t('conversationReceiptsOffYou') : t('conversationReceiptsOff');
+};
diff --git a/src/script/entity/message/RenameMessage.ts b/src/script/entity/message/RenameMessage.ts
index cfbf57c19d1..de22c367d2f 100644
--- a/src/script/entity/message/RenameMessage.ts
+++ b/src/script/entity/message/RenameMessage.ts
@@ -18,7 +18,6 @@
  */
 
 import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
-import ko from 'knockout';
 
 import {t} from 'Util/LocalizerUtil';
 
@@ -27,16 +26,14 @@ import {SystemMessage} from './SystemMessage';
 import {SystemMessageType} from '../../message/SystemMessageType';
 
 export class RenameMessage extends SystemMessage {
-  public readonly system_message_type: SystemMessageType;
   public name: string;
 
-  constructor() {
+  constructor(name: string) {
     super();
 
     this.type = CONVERSATION_EVENT.RENAME;
     this.system_message_type = SystemMessageType.CONVERSATION_RENAME;
-    this.name = '';
-
-    this.caption = ko.pureComputed(() => (this.user().isMe ? t('conversationRenameYou') : t('conversationRename')));
+    this.name = name;
+    this.caption = this.user().isMe ? t('conversationRenameYou') : t('conversationRename');
   }
 }
diff --git a/src/script/entity/message/SystemMessage.ts b/src/script/entity/message/SystemMessage.ts
index c8a128186aa..db811db8a24 100644
--- a/src/script/entity/message/SystemMessage.ts
+++ b/src/script/entity/message/SystemMessage.ts
@@ -17,8 +17,6 @@
  *
  */
 
-import ko from 'knockout';
-
 import {Message} from './Message';
 import {RenameMessage} from './RenameMessage';
 
@@ -26,7 +24,7 @@ import {SuperType} from '../../message/SuperType';
 import {SystemMessageType} from '../../message/SystemMessageType';
 
 export class SystemMessage extends Message {
-  public caption: ko.PureComputed<string>;
+  public caption?: string;
   public system_message_type: SystemMessageType;
 
   constructor() {
diff --git a/src/script/error/CallError.ts b/src/script/error/CallError.ts
deleted file mode 100644
index d615ccd4e9a..00000000000
--- a/src/script/error/CallError.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {BaseError, BASE_ERROR_TYPE} from './BaseError';
-
-enum CALL_ERROR_TYPE {
-  MISTARGETED_MESSAGE = 'MISTARGETED_MESSAGE',
-  NO_CONVERSATION_ID = 'NO_CONVERSATION_ID',
-  NO_DATA_CHANNEL = 'NO_DATA_CHANNEL',
-  NO_REPLACEABLE_TRACK = 'NO_REPLACEABLE_TRACK',
-  NO_USER_ID = 'NO_USER_ID',
-  NOT_FOUND = 'NOT_FOUND',
-  NOT_SUPPORTED = 'NOT_SUPPORTED',
-  RTP_SENDER_NOT_SUPPORTED = 'RTP_SENDER_NOT_SUPPORTED',
-  UNSUPPORTED_VERSION = 'UNSUPPORTED_VERSION',
-  WRONG_CONVERSATION_TYPE = 'WRONG_CONVERSATION_TYPE',
-  WRONG_PAYLOAD_FORMAT = 'WRONG_PAYLOAD_FORMAT',
-  WRONG_SENDER = 'WRONG_SENDER',
-  WRONG_STATE = 'WRONG_STATE',
-}
-
-export class CallError extends BaseError {
-  constructor(type: CALL_ERROR_TYPE | BASE_ERROR_TYPE, message: string) {
-    super(type, message);
-  }
-
-  static get MESSAGE(): Record<CALL_ERROR_TYPE, string> {
-    return {
-      MISTARGETED_MESSAGE: 'Message targeted at another client',
-      NOT_FOUND: 'No call for conversation ID found',
-      NOT_SUPPORTED: 'Calling is not supported',
-      NO_CONVERSATION_ID: 'No conversation ID given',
-      NO_DATA_CHANNEL: 'No established data channel for call',
-      NO_REPLACEABLE_TRACK: 'No replaceable MediaStreamTrack found',
-      NO_USER_ID: 'Missing user ID to target message',
-      RTP_SENDER_NOT_SUPPORTED: 'PeerConnection does not support RtcRtpSender extension',
-      UNSUPPORTED_VERSION: 'Unsupported version of the call protocol',
-      WRONG_CONVERSATION_TYPE: 'Wrong conversation type for call message',
-      WRONG_PAYLOAD_FORMAT: 'Payload for a call message is in wrong format',
-      WRONG_SENDER: 'Call change from wrong sender',
-      WRONG_STATE: 'Call in wrong state for change',
-    };
-  }
-
-  static get TYPE(): Record<CALL_ERROR_TYPE, CALL_ERROR_TYPE> {
-    return {
-      MISTARGETED_MESSAGE: CALL_ERROR_TYPE.MISTARGETED_MESSAGE,
-      NOT_FOUND: CALL_ERROR_TYPE.NOT_FOUND,
-      NOT_SUPPORTED: CALL_ERROR_TYPE.NOT_SUPPORTED,
-      NO_CONVERSATION_ID: CALL_ERROR_TYPE.NO_CONVERSATION_ID,
-      NO_DATA_CHANNEL: CALL_ERROR_TYPE.NO_DATA_CHANNEL,
-      NO_REPLACEABLE_TRACK: CALL_ERROR_TYPE.NO_REPLACEABLE_TRACK,
-      NO_USER_ID: CALL_ERROR_TYPE.NO_USER_ID,
-      RTP_SENDER_NOT_SUPPORTED: CALL_ERROR_TYPE.RTP_SENDER_NOT_SUPPORTED,
-      UNSUPPORTED_VERSION: CALL_ERROR_TYPE.UNSUPPORTED_VERSION,
-      WRONG_CONVERSATION_TYPE: CALL_ERROR_TYPE.WRONG_CONVERSATION_TYPE,
-      WRONG_PAYLOAD_FORMAT: CALL_ERROR_TYPE.WRONG_PAYLOAD_FORMAT,
-      WRONG_SENDER: CALL_ERROR_TYPE.WRONG_SENDER,
-      WRONG_STATE: CALL_ERROR_TYPE.WRONG_STATE,
-    };
-  }
-}
diff --git a/src/script/error/ConnectError.ts b/src/script/error/ConnectError.ts
deleted file mode 100644
index 37405984db7..00000000000
--- a/src/script/error/ConnectError.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {BaseError, BASE_ERROR_TYPE} from './BaseError';
-
-enum CONNECT_ERROR_TYPE {
-  NO_CONTACTS = 'NO_CONTACTS',
-  NOT_SUPPORTED = 'NOT_SUPPORTED',
-  UPLOAD = 'UPLOAD',
-}
-
-export class ConnectError extends BaseError {
-  constructor(type: CONNECT_ERROR_TYPE | BASE_ERROR_TYPE, message: string) {
-    super(type, message);
-  }
-
-  static get MESSAGE(): Record<CONNECT_ERROR_TYPE, string> {
-    return {
-      NOT_SUPPORTED: 'Source not supported',
-      NO_CONTACTS: 'No contacts found for matching',
-      UPLOAD: 'Address book upload failed',
-    };
-  }
-
-  static get TYPE(): Record<CONNECT_ERROR_TYPE, CONNECT_ERROR_TYPE> {
-    return {
-      NOT_SUPPORTED: CONNECT_ERROR_TYPE.NOT_SUPPORTED,
-      NO_CONTACTS: CONNECT_ERROR_TYPE.NO_CONTACTS,
-      UPLOAD: CONNECT_ERROR_TYPE.UPLOAD,
-    };
-  }
-}
diff --git a/src/script/event/Client.ts b/src/script/event/Client.ts
index 53fa1c66e9e..b06d78c95ec 100644
--- a/src/script/event/Client.ts
+++ b/src/script/event/Client.ts
@@ -39,11 +39,13 @@ export enum CONVERSATION {
   MESSAGE_DELETE = 'conversation.message-delete',
   MESSAGE_HIDDEN = 'conversation.message-hidden',
   MISSED_MESSAGES = 'conversation.missed-messages',
+  MLS_CONVERSATION_RECOVERED = 'conversation.mls-conversation-recovered',
   ONE2ONE_CREATION = 'conversation.one2one-creation',
   REACTION = 'conversation.reaction',
   TEAM_MEMBER_LEAVE = 'conversation.team-member-leave',
   UNABLE_TO_DECRYPT = 'conversation.unable-to-decrypt',
   VERIFICATION = 'conversation.verification',
+  FEDERATION_STOP = 'conversation.federation-stop',
   VOICE_CHANNEL_ACTIVATE = 'conversation.voice-channel-activate',
   VOICE_CHANNEL_DEACTIVATE = 'conversation.voice-channel-deactivate',
 }
diff --git a/src/script/event/EventProcessor.ts b/src/script/event/EventProcessor.ts
new file mode 100644
index 00000000000..ab878937d01
--- /dev/null
+++ b/src/script/event/EventProcessor.ts
@@ -0,0 +1,34 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {BackendEvent} from '@wireapp/api-client/lib/event';
+
+import {EventSource} from './EventSource';
+
+import {ClientConversationEvent} from '../conversation/EventBuilder';
+
+export type IncomingEvent = BackendEvent | ClientConversationEvent;
+
+export interface EventProcessor {
+  processEvent(event: IncomingEvent, source: EventSource): Promise<void>;
+}
+
+export interface EventMiddleware {
+  processEvent(event: IncomingEvent): Promise<IncomingEvent>;
+}
diff --git a/src/script/event/EventRepository.test.ts b/src/script/event/EventRepository.test.ts
index 9cceef725e2..c352f3dea77 100644
--- a/src/script/event/EventRepository.test.ts
+++ b/src/script/event/EventRepository.test.ts
@@ -19,23 +19,14 @@
 
 import {BackendEvent, CONVERSATION_EVENT, USER_EVENT} from '@wireapp/api-client/lib/event/';
 
-import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging';
-
-import {AssetTransferState} from 'src/script/assets/AssetTransferState';
-import {EventError} from 'src/script/error/EventError';
 import {ClientEvent} from 'src/script/event/Client';
 import {EventRepository} from 'src/script/event/EventRepository';
 import {NOTIFICATION_HANDLING_STATE} from 'src/script/event/NotificationHandlingState';
-import {createUuid} from 'Util/uuid';
 
-import {EventService} from './EventService';
 import {EventSource} from './EventSource';
 
 import {TestFactory} from '../../../test/helper/TestFactory';
 import {ClientConversationEvent} from '../conversation/EventBuilder';
-import {User} from '../entity/User';
-import {StatusType} from '../message/StatusType';
-import {EventRecord} from '../storage';
 
 const testFactory = new TestFactory();
 
@@ -46,64 +37,9 @@ describe('EventRepository', () => {
     return testFactory.exposeEventActors();
   });
 
-  describe('getCommonMessageUpdates', () => {
-    /** @see https://wearezeta.atlassian.net/browse/SQCORE-732 */
-    it('does not overwrite the seen status if a message gets edited', () => {
-      const originalEvent = {
-        category: 16,
-        conversation: 'a7f1187e-9396-44c9-8242-db9d3051dc89',
-        data: {
-          content: 'Original Text Which Has Been Seen By Someone Else',
-          expects_read_confirmation: true,
-          legal_hold_status: 1,
-          mentions: [],
-          previews: [],
-        },
-        from: '24de8432-03ba-439f-88f8-95bdc68b7bdd',
-        from_client_id: '79618bbe93e6821c',
-        id: 'c6269e58-fa82-4f6e-8264-263e09154871',
-        primary_key: '17',
-        read_receipts: [
-          {
-            time: '2021-06-10T19:47:19.570Z',
-            userId: 'b661e27f-24c6-4c52-a425-87a7b7f3df61',
-          },
-        ],
-        status: StatusType.SEEN,
-        time: '2021-06-10T19:47:16.071Z',
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      } as any;
-
-      const editedEvent = {
-        conversation: 'a7f1187e-9396-44c9-8242-db9d3051dc89',
-        data: {
-          content: 'Edited Text Which Replaces The Original Text',
-          expects_read_confirmation: true,
-          mentions: [],
-          previews: [],
-          replacing_message_id: 'c6269e58-fa82-4f6e-8264-263e09154871',
-        },
-        from: '24de8432-03ba-439f-88f8-95bdc68b7bdd',
-        from_client_id: '79618bbe93e6821c',
-        id: 'caff044b-cb9c-47c6-833a-d4b76c678bcd',
-        status: StatusType.SENT,
-        time: '2021-06-10T19:47:23.706Z',
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      } as any;
-
-      const updatedEvent = EventRepository['getCommonMessageUpdates'](originalEvent, editedEvent);
-      expect(updatedEvent.data.content).toBe('Edited Text Which Replaces The Original Text');
-      expect(updatedEvent.status).toBe(StatusType.SEEN);
-      expect(Object.keys(updatedEvent.read_receipts).length).toBe(1);
-    });
-  });
-
   describe('handleEvent', () => {
     beforeEach(() => {
       testFactory.event_repository!.notificationHandlingState(NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
-      jest
-        .spyOn(testFactory.event_service!, 'saveEvent')
-        .mockReturnValue(Promise.resolve({data: 'dummy content'} as EventRecord));
       spyOn<any>(testFactory.event_repository!, 'distributeEvent');
     });
 
@@ -114,7 +50,6 @@ describe('EventRepository', () => {
           EventSource.NOTIFICATION_STREAM,
         )
         .then(() => {
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
     });
@@ -126,7 +61,6 @@ describe('EventRepository', () => {
           EventSource.NOTIFICATION_STREAM,
         )
         .then(() => {
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
     });
@@ -138,7 +72,6 @@ describe('EventRepository', () => {
           EventSource.NOTIFICATION_STREAM,
         )
         .then(() => {
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
           expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
         });
     });
@@ -154,7 +87,6 @@ describe('EventRepository', () => {
       } as BackendEvent;
 
       return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
         expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
       });
     });
@@ -170,7 +102,6 @@ describe('EventRepository', () => {
       } as BackendEvent;
 
       return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
         expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
       });
     });
@@ -186,18 +117,13 @@ describe('EventRepository', () => {
       } as BackendEvent;
 
       return testFactory.event_repository!['handleEvent']({event}, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
         expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
       });
     });
 
     it('accepts "conversation.voice-channel-deactivate" (missed call) events', async () => {
-      const eventServiceSpy = {
-        loadEvent: jest.fn().mockResolvedValue(undefined),
-        saveEvent: jest.fn().mockResolvedValue({data: 'dummy content'}),
-      } as unknown as EventService;
       const fakeProp: any = undefined;
-      const eventRepo = new EventRepository(eventServiceSpy, fakeProp, fakeProp, fakeProp);
+      const eventRepo = new EventRepository({} as any, fakeProp, fakeProp, fakeProp);
       eventRepo.notificationHandlingState(NOTIFICATION_HANDLING_STATE.WEB_SOCKET);
       jest.spyOn<any, any>(eventRepo, 'distributeEvent').mockImplementation(() => {});
 
@@ -212,7 +138,6 @@ describe('EventRepository', () => {
 
       await eventRepo['handleEvent']({event}, EventSource.NOTIFICATION_STREAM);
 
-      expect(eventServiceSpy.saveEvent).toHaveBeenCalled();
       expect(eventRepo['distributeEvent']).toHaveBeenCalled();
     });
 
@@ -228,383 +153,8 @@ describe('EventRepository', () => {
       } as ClientConversationEvent;
 
       return testFactory.event_repository.injectEvent(event).then(() => {
-        expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
         expect(testFactory.event_repository!['distributeEvent']).toHaveBeenCalled();
       });
     });
   });
-
-  describe('processEvent', () => {
-    let event: any;
-    let previously_stored_event: any;
-
-    beforeEach(() => {
-      event = {
-        conversation: createUuid(),
-        data: {
-          content: 'Lorem Ipsum',
-          previews: [],
-        },
-        from: createUuid(),
-        id: createUuid(),
-        time: new Date().toISOString(),
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-
-      jest
-        .spyOn(testFactory.event_service!, 'saveEvent')
-        .mockImplementation(saved_event => Promise.resolve(saved_event as any));
-    });
-
-    it('saves an event with a previously not used ID', () => {
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockClear();
-
-      return testFactory.event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM).then(() => {
-        expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
-      });
-    });
-
-    it('ignores an event with an ID previously used by another user', () => {
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      previously_stored_event.from = createUuid();
-      jest
-        .spyOn(testFactory.event_service!, 'loadEvent')
-        .mockImplementation(() => Promise.resolve(previously_stored_event));
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('ignores a non-"text message" with an ID previously used by the same user', () => {
-      event.type = ClientEvent.CALL.E_CALL;
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      jest
-        .spyOn(testFactory.event_service!, 'loadEvent')
-        .mockImplementation(() => Promise.resolve(previously_stored_event));
-
-      return testFactory
-        .event_repository!['handleEventSaving'](event)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('ignores a plain text message with an ID previously used by the same user for a non-"text message"', () => {
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      previously_stored_event.type = ClientEvent.CALL.E_CALL;
-      jest
-        .spyOn(testFactory.event_service!, 'loadEvent')
-        .mockImplementation(() => Promise.resolve(previously_stored_event));
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('ignores a plain text message with an ID previously used by the same user', () => {
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      jest
-        .spyOn(testFactory.event_service!, 'loadEvent')
-        .mockImplementation(() => Promise.resolve(previously_stored_event));
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('ignores a text message with link preview with an ID previously used by the same user for a text message with link preview', () => {
-      event.data.previews.push(1);
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(previously_stored_event as any);
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('ignores a text message with link preview with an ID previously used by the same user for a text message different content', () => {
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(previously_stored_event as any);
-
-      event.data.previews.push(1);
-      event.data.content = 'Ipsum loren';
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then(() => fail('Method should have thrown an error'))
-        .catch(error => {
-          expect(error).toEqual(jasmine.any(EventError));
-          expect(error.type).toBe(EventError.TYPE.VALIDATION_FAILED);
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('saves a text message with link preview with an ID previously used by the same user for a plain text message', () => {
-      previously_stored_event = JSON.parse(JSON.stringify(event));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(previously_stored_event);
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation(() => Promise.resolve(previously_stored_event));
-
-      const initial_time = event.time;
-      const changed_time = new Date(new Date(event.time).getTime() + 60 * 1000).toISOString();
-      event.data.previews.push(1);
-      event.time = changed_time;
-
-      return testFactory
-        .event_repository!['processEvent'](event, EventSource.NOTIFICATION_STREAM)
-        .then((saved_event: any) => {
-          expect(saved_event.time).toEqual(initial_time);
-          expect(saved_event.time).not.toEqual(changed_time);
-          expect(saved_event.primary_key).toEqual(previously_stored_event.primary_key);
-          expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-        });
-    });
-
-    it('ignores edit message with missing associated original message', () => {
-      const linkPreviewEvent = JSON.parse(JSON.stringify(event));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue({} as any);
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation(() => Promise.resolve({} as EventRecord));
-
-      linkPreviewEvent.data.replacing_message_id = 'initial_message_id';
-
-      return testFactory
-        .event_repository!['handleEventSaving'](linkPreviewEvent)
-        .then(() => fail('Should have thrown an error'))
-        .catch(() => {
-          expect(testFactory.event_service!.replaceEvent).not.toHaveBeenCalled();
-          expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        });
-    });
-
-    it('updates edited messages when link preview arrives', () => {
-      const replacingId = 'old-replaced-message-id';
-      const storedEvent = {
-        ...event,
-        data: {...event.data, replacing_message_id: replacingId},
-      } as EventRecord;
-      const linkPreviewEvent = {...event};
-      jest
-        .spyOn(testFactory.event_service!, 'loadEvent')
-        .mockImplementation((conversationId: string, messageId: string) => {
-          return messageId === replacingId ? Promise.resolve(undefined) : Promise.resolve(storedEvent as any);
-        });
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation((ev: EventRecord) => Promise.resolve(ev));
-
-      linkPreviewEvent.data.replacing_message_id = replacingId;
-      linkPreviewEvent.data.previews = ['preview'];
-
-      return testFactory.event_repository!['handleEventSaving'](linkPreviewEvent).then((updatedEvent: EventRecord) => {
-        expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-        expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        expect(updatedEvent.data.previews[0]).toEqual('preview');
-      });
-    });
-
-    it('updates edited messages', () => {
-      const originalMessage = JSON.parse(JSON.stringify(event));
-      originalMessage.reactions = ['user-id'];
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(originalMessage as any);
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation((updates: EventRecord) => Promise.resolve(updates));
-
-      const initial_time = event.time;
-      const changed_time = new Date(new Date(event.time).getTime() + 60 * 1000).toISOString();
-      originalMessage.primary_key = 12;
-      event.id = createUuid();
-      event.data.content = 'new content';
-      event.data.replacing_message_id = originalMessage.id;
-      event.time = changed_time;
-
-      return testFactory.event_repository!['handleEventSaving'](event).then((updatedEvent: any) => {
-        expect(updatedEvent.time).toEqual(initial_time);
-        expect(updatedEvent.time).not.toEqual(changed_time);
-        expect(updatedEvent.data.content).toEqual('new content');
-        expect(updatedEvent.primary_key).toEqual(originalMessage.primary_key);
-        expect(Object.keys(updatedEvent.reactions).length).toEqual(0);
-        expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-      });
-    });
-
-    it('updates link preview when edited', () => {
-      const replacingId = 'replaced-message-id';
-      const storedEvent = {
-        ...event,
-        data: {...event.data, previews: ['preview']},
-      } as any;
-      const editEvent = {...event} as any;
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(storedEvent as any);
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation((ev: EventRecord) => Promise.resolve(ev));
-
-      editEvent.data.replacing_message_id = replacingId;
-
-      return testFactory.event_repository!['handleEventSaving'](editEvent).then((updatedEvent: EventRecord) => {
-        expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-        expect(testFactory.event_service!.saveEvent).not.toHaveBeenCalled();
-        expect(updatedEvent.data.previews.length).toEqual(0);
-      });
-    });
-
-    it('saves a conversation.asset-add event', () => {
-      const assetAddEvent = {...event, type: ClientEvent.CONVERSATION.ASSET_ADD};
-
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockClear();
-
-      return testFactory
-        .event_repository!['processEvent'](assetAddEvent, EventSource.NOTIFICATION_STREAM)
-        .then(updatedEvent => {
-          expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-          expect(testFactory.event_service!.saveEvent).toHaveBeenCalled();
-        });
-    });
-
-    it('deletes cancelled conversation.asset-add event', async () => {
-      const fromIds = [
-        // cancel from an other user
-        createUuid(),
-        // cancel from the self user
-        testFactory.user_repository['userState'].self().id,
-      ];
-
-      const loadEventSpy = jest.spyOn(testFactory.event_service!, 'loadEvent');
-      const deleteEventSpy = jest.spyOn(testFactory.event_service!, 'deleteEvent');
-      for (const fromId of fromIds) {
-        const assetAddEvent = {...event, from: fromId, type: ClientEvent.CONVERSATION.ASSET_ADD};
-        const assetCancelEvent = {
-          ...assetAddEvent,
-          data: {reason: ProtobufAsset.NotUploaded.CANCELLED, status: AssetTransferState.UPLOAD_FAILED},
-          time: '2017-09-06T09:43:36.528Z',
-        };
-
-        loadEventSpy.mockResolvedValue(assetAddEvent as any);
-        deleteEventSpy.mockImplementation(() => Promise.resolve(1));
-
-        const savedEvent = await testFactory.event_repository!['processEvent'](
-          assetCancelEvent,
-          EventSource.NOTIFICATION_STREAM,
-        );
-        expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-        expect(testFactory.event_service!.deleteEvent).toHaveBeenCalled();
-      }
-    });
-
-    it('deletes other user failed upload for conversation.asset-add event', () => {
-      const assetAddEvent = {...event, type: ClientEvent.CONVERSATION.ASSET_ADD};
-      const assetUploadFailedEvent = {
-        ...assetAddEvent,
-        data: {reason: ProtobufAsset.NotUploaded.FAILED, status: AssetTransferState.UPLOAD_FAILED},
-        time: '2017-09-06T09:43:36.528Z',
-      };
-
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(assetAddEvent as any);
-      jest.spyOn(testFactory.event_service!, 'deleteEvent').mockImplementation(() => Promise.resolve(1));
-
-      return testFactory
-        .event_repository!['processEvent'](assetUploadFailedEvent, EventSource.NOTIFICATION_STREAM)
-        .then(savedEvent => {
-          expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-          expect(testFactory.event_service!.deleteEvent).toHaveBeenCalled();
-        });
-    });
-
-    it('updates self failed upload for conversation.asset-add event', async () => {
-      const assetAddEvent: EventRecord = {...event, type: ClientEvent.CONVERSATION.ASSET_ADD};
-      const assetUploadFailedEvent = {
-        ...assetAddEvent,
-        data: {reason: ProtobufAsset.NotUploaded.FAILED, status: AssetTransferState.UPLOAD_FAILED},
-        time: '2017-09-06T09:43:36.528Z',
-      } as any;
-
-      jest
-        .spyOn(testFactory.event_repository!['userState'], 'self')
-        .mockReturnValue(new User(assetAddEvent.from) as any);
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(assetAddEvent as any);
-      jest
-        .spyOn(testFactory.event_service!, 'updateEventAsUploadFailed')
-        .mockImplementation(() => Promise.resolve(assetUploadFailedEvent));
-
-      const savedEvent = await testFactory.event_repository!['processEvent'](
-        assetUploadFailedEvent,
-        EventSource.NOTIFICATION_STREAM,
-      );
-      expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-      expect(testFactory.event_service!.updateEventAsUploadFailed).toHaveBeenCalled();
-    });
-
-    it('handles conversation.asset-add state update event', () => {
-      const initialAssetEvent = {...event, type: ClientEvent.CONVERSATION.ASSET_ADD};
-
-      const updateStatusEvent = {
-        ...initialAssetEvent,
-        data: {status: AssetTransferState.UPLOADED},
-        time: '2017-09-06T09:43:36.528Z',
-      };
-
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation(eventToUpdate => Promise.resolve(eventToUpdate));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(initialAssetEvent as any);
-
-      return testFactory
-        .event_repository!['processEvent'](updateStatusEvent, EventSource.NOTIFICATION_STREAM)
-        .then((updatedEvent: any) => {
-          expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-          expect(updatedEvent.data.status).toEqual(updateStatusEvent.data.status);
-          expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-        });
-    });
-
-    it('updates video when preview is received', () => {
-      const initialAssetEvent = {...event, type: ClientEvent.CONVERSATION.ASSET_ADD};
-
-      const AssetPreviewEvent = {
-        ...initialAssetEvent,
-        data: {status: AssetTransferState.UPLOADED},
-        time: '2017-09-06T09:43:36.528Z',
-      };
-
-      jest
-        .spyOn(testFactory.event_service!, 'replaceEvent')
-        .mockImplementation(eventToUpdate => Promise.resolve(eventToUpdate));
-      jest.spyOn(testFactory.event_service!, 'loadEvent').mockResolvedValue(initialAssetEvent as any);
-
-      return testFactory
-        .event_repository!['processEvent'](AssetPreviewEvent, EventSource.NOTIFICATION_STREAM)
-        .then((updatedEvent: EventRecord) => {
-          expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
-          expect(testFactory.event_service!.replaceEvent).toHaveBeenCalled();
-        });
-    });
-  });
 });
diff --git a/src/script/event/EventRepository.ts b/src/script/event/EventRepository.ts
index 5554f064961..175c18e804b 100644
--- a/src/script/event/EventRepository.ts
+++ b/src/script/event/EventRepository.ts
@@ -23,54 +23,44 @@ import {
   ConversationOtrMessageAddEvent,
   ConversationMLSMessageAddEvent,
 } from '@wireapp/api-client/lib/event';
-import type {BackendEvent} from '@wireapp/api-client/lib/event';
 import {NotificationSource, HandledEventPayload} from '@wireapp/core/lib/notification';
 import {amplify} from 'amplify';
 import ko from 'knockout';
 import {container} from 'tsyringe';
 
 import {Account, ConnectionState, ProcessedEventPayload} from '@wireapp/core';
-import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {getLogger, Logger} from 'Util/Logger';
+import {queue} from 'Util/PromiseQueue';
 import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 
 import {ClientEvent} from './Client';
+import {EventMiddleware, EventProcessor, IncomingEvent} from './EventProcessor';
 import type {EventService} from './EventService';
 import {EventSource} from './EventSource';
 import {EVENT_TYPE} from './EventType';
-import {EventTypeHandling} from './EventTypeHandling';
 import {EventValidation} from './EventValidation';
 import {validateEvent} from './EventValidator';
 import {NOTIFICATION_HANDLING_STATE} from './NotificationHandlingState';
 import type {NotificationService} from './NotificationService';
 
-import {AssetTransferState} from '../assets/AssetTransferState';
-import type {ClientEntity} from '../client/ClientEntity';
-import {AssetAddEvent, ClientConversationEvent, EventBuilder, MessageAddEvent} from '../conversation/EventBuilder';
+import {ClientConversationEvent, EventBuilder} from '../conversation/EventBuilder';
 import {CryptographyMapper} from '../cryptography/CryptographyMapper';
 import {CryptographyError} from '../error/CryptographyError';
 import {EventError} from '../error/EventError';
-import {categoryFromEvent} from '../message/MessageCategorization';
-import {isEventRecordFailed, isEventRecordWithFederationError} from '../message/StatusType';
-import type {EventRecord, StoredEvent} from '../storage';
 import type {ServerTimeHandler} from '../time/serverTimeHandler';
 import {EventName} from '../tracking/EventName';
 import {UserState} from '../user/UserState';
 import {Warnings} from '../view_model/WarningsContainer';
 
-type IncomingEvent = BackendEvent | ClientConversationEvent;
-
 export class EventRepository {
   logger: Logger;
-  currentClient: ko.Observable<ClientEntity> | undefined;
-  notificationHandlingState: ko.Observable<NOTIFICATION_HANDLING_STATE>;
-  previousHandlingState: NOTIFICATION_HANDLING_STATE | undefined;
-  notificationsHandled: number;
-  notificationsTotal: number;
-  lastEventDate: ko.Observable<string | undefined>;
-  eventProcessMiddlewares: Function[];
+  notificationHandlingState = ko.observable(NOTIFICATION_HANDLING_STATE.STREAM);
+  private readonly lastEventDate: ko.Observable<string | undefined> = ko.observable();
+  private eventProcessMiddlewares: EventMiddleware[] = [];
+  /** event processors are classes that are able to react and process an incoming event */
+  private eventProcessors: EventProcessor[] = [];
 
   static get CONFIG() {
     return {
@@ -109,30 +99,29 @@ export class EventRepository {
   ) {
     this.logger = getLogger('EventRepository');
 
-    this.currentClient = undefined;
-
-    this.notificationHandlingState = ko.observable(NOTIFICATION_HANDLING_STATE.STREAM);
     this.notificationHandlingState.subscribe(handling_state => {
       amplify.publish(WebAppEvents.EVENT.NOTIFICATION_HANDLING_STATE, handling_state);
     });
-    this.notificationsHandled = 0;
-    this.notificationsTotal = 0;
-
-    this.lastEventDate = ko.observable();
-
-    this.eventProcessMiddlewares = [];
   }
 
   /**
-   * Will set a middleware to run before the EventRepository actually processes the event.
-   * Middleware is just a function with the following signature (Event) => Promise<Event>.
-   *
-   * @param middlewares middlewares to run when a new event is about to be processed
+   * Will register a pipeline that transforms an event before it is being processed by the EventProcessors.
+   * Those middleware are run sequentially one after the other. Thus the order at which they are defined matters.
+   * When one middleware fails the entire even handling process will stop and no further middleware will be executed.
    */
-  setEventProcessMiddlewares(middlewares: Function[]) {
+  setEventProcessMiddlewares(middlewares: EventMiddleware[]) {
     this.eventProcessMiddlewares = middlewares;
   }
 
+  /**
+   * EventProcessors are classes that are able to react and process an incoming event.
+   * They will all be executed in parallel. If one processor fails the other ones are not impacted
+   * @param processors
+   */
+  setEventProcessors(processors: EventProcessor[]) {
+    this.eventProcessors = processors;
+  }
+
   //##############################################################################
   // WebSocket handling
   //##############################################################################
@@ -166,7 +155,11 @@ export class EventRepository {
     }
   };
 
-  private readonly handleIncomingEvent = async (payload: HandledEventPayload, source: NotificationSource) => {
+  /**
+   * this function will process any incoming event. It is being queued in case 2 events arrive at the same time.
+   * Processing events should happen sequentially (thus the queue)
+   */
+  private readonly handleIncomingEvent = queue(async (payload: HandledEventPayload, source: NotificationSource) => {
     try {
       await this.handleEvent(payload, source);
     } catch (error) {
@@ -176,18 +169,20 @@ export class EventRepository {
         throw error;
       }
     }
-  };
+  });
 
   /**
    * connects to the websocket with the given account
    *
    * @param account the account to connect to
    * @param onNotificationStreamProgress callback when a notification for the notification stream has been processed
+   * @param dryRun when set will not decrypt and not store the last notification ID. This is useful if you only want to subscribe to unencrypted backend events
    * @returns Resolves when the notification stream has fully been processed
    */
   async connectWebSocket(
     account: Account,
     onNotificationStreamProgress: (progress: {done: number; total: number}) => void,
+    dryRun = false,
   ): Promise<void> {
     await this.handleTimeDrift();
     const connect = () => {
@@ -204,6 +199,7 @@ export class EventRepository {
           onEvent: this.handleIncomingEvent,
           onMissedNotifications: this.triggerMissedSystemEventMessageRendering,
           onNotificationStreamProgress: onNotificationStreamProgress,
+          dryRun,
         });
       });
     };
@@ -285,6 +281,12 @@ export class EventRepository {
   // Notification/Event handling
   //##############################################################################
 
+  async injectEvents(events: (ClientConversationEvent | IncomingEvent)[], source: EventSource = EventSource.INJECTED) {
+    for (const event of events) {
+      await this.injectEvent(event, source);
+    }
+  }
+
   /**
    * Inject event into a conversation.
    * @note Don't add unable to decrypt to self conversation
@@ -318,6 +320,8 @@ export class EventRepository {
    * @param source Source of notification
    */
   private async distributeEvent(event: IncomingEvent, source: EventSource) {
+    await Promise.all(this.eventProcessors.map(processor => processor.processEvent(event, source)));
+
     const {type} = event;
     const [category] = type.split('.');
     switch (category) {
@@ -409,13 +413,7 @@ export class EventRepository {
    */
   private async processEvent(event: IncomingEvent | ClientConversationEvent, source: EventSource) {
     for (const eventProcessMiddleware of this.eventProcessMiddlewares) {
-      event = await eventProcessMiddleware(event);
-    }
-
-    const shouldSaveEvent = EventTypeHandling.STORE.includes(event.type as CONVERSATION_EVENT);
-    if (shouldSaveEvent) {
-      const savedEvent = await this.handleEventSaving(event);
-      event = savedEvent ?? event;
+      event = await eventProcessMiddleware.processEvent(event);
     }
 
     return this.handleEventDistribution(event, source);
@@ -445,209 +443,4 @@ export class EventRepository {
     }
     return this.distributeEvent(event, source);
   }
-
-  /**
-   * Handle a mapped event, check for malicious ID use and save it.
-   *
-   * @param event Backend event extracted from notification stream
-   * @returns Resolves with the saved event
-   */
-  private async handleEventSaving(event: IncomingEvent) {
-    const conversationId = 'conversation' in event && event.conversation;
-    const mappedData = ('data' in event && event.data) ?? {};
-
-    // first check if a message that should be replaced exists in DB
-    const eventToReplace = mappedData.replacing_message_id
-      ? await this.eventService.loadEvent(conversationId, mappedData.replacing_message_id)
-      : undefined;
-
-    const hasLinkPreview = mappedData.previews && mappedData.previews.length;
-    const isReplacementWithoutOriginal = !eventToReplace && mappedData.replacing_message_id;
-    if (isReplacementWithoutOriginal && !hasLinkPreview) {
-      // the only valid case of a replacement with no original message is when an edited message gets a link preview
-      this.throwValidationError(event, 'Edit event without original event');
-    }
-
-    const handleEvent = async (newEvent: IncomingEvent) => {
-      // check for duplicates (same id)
-      const storedEvent = 'id' in newEvent ? await this.eventService.loadEvent(conversationId, newEvent.id) : undefined;
-
-      return storedEvent
-        ? this.handleDuplicatedEvent(storedEvent, newEvent)
-        : this.eventService.saveEvent(newEvent as EventRecord);
-    };
-
-    const canReplace =
-      eventToReplace?.type === ClientEvent.CONVERSATION.MESSAGE_ADD &&
-      event.type === ClientEvent.CONVERSATION.MESSAGE_ADD;
-    return canReplace && eventToReplace ? this.handleEventReplacement(eventToReplace, event) : handleEvent(event);
-  }
-
-  private handleEventReplacement(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
-    if (originalEvent.from !== newEvent.from) {
-      const logMessage = `ID previously used by user '${newEvent.from}'`;
-      const errorMessage = 'ID reused by other user';
-      this.throwValidationError(newEvent, errorMessage, logMessage);
-    }
-    const newData = newEvent.data;
-    const primaryKeyUpdate = {primary_key: originalEvent.primary_key};
-    const isLinkPreviewEdit = newData?.previews && !!newData?.previews.length;
-
-    const commonUpdates = EventRepository.getCommonMessageUpdates(originalEvent, newEvent);
-
-    const specificUpdates = isLinkPreviewEdit
-      ? this.getUpdatesForMessage(originalEvent, newEvent)
-      : EventRepository.getUpdatesForEditMessage(originalEvent, newEvent);
-
-    const updates = {...specificUpdates, ...commonUpdates};
-
-    const identifiedUpdates = {...primaryKeyUpdate, ...updates};
-    return this.eventService.replaceEvent(identifiedUpdates);
-  }
-
-  private handleDuplicatedEvent(originalEvent: EventRecord, newEvent: IncomingEvent) {
-    switch (newEvent.type) {
-      case ClientEvent.CONVERSATION.ASSET_ADD:
-        return this.handleAssetUpdate(originalEvent, newEvent);
-
-      case ClientEvent.CONVERSATION.MESSAGE_ADD:
-        return this.handleMessageUpdate(originalEvent, newEvent);
-
-      default:
-        this.throwValidationError(newEvent, `Forbidden type '${newEvent.type}' for duplicate events`);
-    }
-  }
-
-  private async handleAssetUpdate(originalEvent: EventRecord, newEvent: AssetAddEvent) {
-    const newEventData = newEvent.data;
-    // the preview status is not sent by the client so we fake a 'preview' status in order to cleanly handle it in the switch statement
-    const ASSET_PREVIEW = 'preview';
-    // similarly, no status is sent by the client when we retry sending a failed message
-    const RETRY_EVENT = 'retry';
-    const isPreviewEvent = !newEventData.status && !!newEventData.preview_key;
-    const isRetryEvent = !!newEventData.content_length;
-    const handledEvent = isRetryEvent ? RETRY_EVENT : newEventData.status;
-    const previewStatus = isPreviewEvent ? ASSET_PREVIEW : handledEvent;
-
-    const updateEvent = () => {
-      const updatedData = {...originalEvent.data, ...newEventData};
-      const updatedEvent = {...originalEvent, data: updatedData};
-      return this.eventService.replaceEvent(updatedEvent);
-    };
-
-    switch (previewStatus) {
-      case ASSET_PREVIEW:
-      case RETRY_EVENT:
-      case AssetTransferState.UPLOADED: {
-        return updateEvent();
-      }
-
-      case AssetTransferState.UPLOAD_FAILED: {
-        // case of both failed or canceled upload
-        const fromOther = newEvent.from !== this.userState.self().id;
-        const sameSender = newEvent.from === originalEvent.from;
-        const selfCancel = !fromOther && newEvent.data.reason === ProtobufAsset.NotUploaded.CANCELLED;
-        // we want to delete the event in the case of an error from the remote client or a cancel on the user's own client
-        const shouldDeleteEvent = (fromOther || selfCancel) && sameSender;
-        if (shouldDeleteEvent) {
-          await this.eventService.deleteEvent(newEvent.conversation, newEvent.id);
-          return newEvent;
-        }
-        return this.eventService.updateEventAsUploadFailed(originalEvent.primary_key, newEvent.data.reason);
-      }
-
-      default: {
-        this.throwValidationError(newEvent, `Unhandled asset status update '${newEvent.data.status}'`);
-      }
-    }
-  }
-
-  private handleMessageUpdate(originalEvent: EventRecord, newEvent: MessageAddEvent) {
-    const newEventData = newEvent.data;
-    const originalData = originalEvent.data;
-
-    if (originalEvent.from !== newEvent.from) {
-      const logMessage = `ID previously used by user '${newEvent.from}'`;
-      const errorMessage = 'ID reused by other user';
-      return this.throwValidationError(newEvent, errorMessage, logMessage);
-    }
-
-    const containsLinkPreview = newEventData.previews && !!newEventData.previews.length;
-    const isRetryAttempt = isEventRecordFailed(originalEvent) || isEventRecordWithFederationError(originalEvent);
-
-    if (!containsLinkPreview && !isRetryAttempt) {
-      const errorMessage =
-        'Message duplication event invalid: original message did not fail to send and does not contain link preview';
-      return this.throwValidationError(newEvent, errorMessage);
-    }
-
-    const textContentMatches = newEventData.content === originalData.content;
-    if (!textContentMatches) {
-      const errorMessage = 'ID of link preview reused';
-      const logMessage = 'Text content for message duplication not matching';
-      return this.throwValidationError(newEvent, errorMessage, logMessage);
-    }
-
-    const bothAreMessageAddType = newEvent.type === originalEvent.type;
-    if (!bothAreMessageAddType) {
-      return this.throwValidationError(newEvent, 'ID reused by same user');
-    }
-
-    const updates = this.getUpdatesForMessage(originalEvent, newEvent);
-    const identifiedUpdates = {primary_key: originalEvent.primary_key, ...updates};
-    return this.eventService.replaceEvent(identifiedUpdates);
-  }
-
-  private static getCommonMessageUpdates(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
-    return {
-      ...newEvent,
-      data: {...newEvent.data, expects_read_confirmation: originalEvent.data.expects_read_confirmation},
-      edited_time: newEvent.time,
-      read_receipts: !newEvent.read_receipts ? originalEvent.read_receipts : newEvent.read_receipts,
-      status: !newEvent.status || newEvent.status < originalEvent.status ? originalEvent.status : newEvent.status,
-      time: originalEvent.time,
-      version: 1,
-    };
-  }
-
-  private static getUpdatesForEditMessage(originalEvent: EventRecord, newEvent: MessageAddEvent): MessageAddEvent {
-    // Remove reactions, so that likes (hearts) don't stay when a message's text gets edited
-    return {...newEvent, reactions: {}};
-  }
-
-  private getUpdatesForMessage(originalEvent: EventRecord, newEvent: MessageAddEvent) {
-    const newData = newEvent.data;
-    const originalData = originalEvent.data;
-    const updatingLinkPreview = !!originalData.previews.length;
-    if (updatingLinkPreview) {
-      this.throwValidationError(newEvent, 'ID of link preview reused');
-    }
-
-    const textContentMatches = !newData.previews?.length || newData.content === originalData.content;
-    if (!textContentMatches) {
-      const logMessage = 'Text content for message duplication not matching';
-      const errorMessage = 'ID of duplicated message reused';
-      this.throwValidationError(newEvent, errorMessage, logMessage);
-    }
-
-    return {
-      ...newEvent,
-      category: categoryFromEvent(newEvent),
-      ephemeral_expires: originalEvent.ephemeral_expires,
-      ephemeral_started: originalEvent.ephemeral_started,
-      ephemeral_time: originalEvent.ephemeral_time,
-      server_time: newEvent.time,
-      time: originalEvent.time,
-      version: originalEvent.version,
-    };
-  }
-
-  private throwValidationError(event: IncomingEvent, errorMessage: string, logMessage?: string): never {
-    const conversation = 'conversation' in event && event.conversation;
-    const from = 'from' in event && event.from;
-
-    const baseLogMessage = `Ignored '${event.type}' in '${conversation}' from '${from}''`;
-    this.logger.warn(`${baseLogMessage} ${logMessage || errorMessage}`);
-    throw new EventError(EventError.TYPE.VALIDATION_FAILED, `Event validation failed: ${errorMessage}`);
-  }
 }
diff --git a/src/script/event/EventService.ts b/src/script/event/EventService.ts
index f605164846a..171e696043a 100644
--- a/src/script/event/EventService.ts
+++ b/src/script/event/EventService.ts
@@ -24,6 +24,8 @@ import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging';
 
 import {getLogger, Logger} from 'Util/Logger';
 
+import {ClientEvent} from './Client';
+
 import {AssetTransferState} from '../assets/AssetTransferState';
 import {BaseError, BASE_ERROR_TYPE} from '../error/BaseError';
 import {ConversationError} from '../error/ConversationError';
@@ -36,14 +38,14 @@ import {StorageSchemata} from '../storage/StorageSchemata';
 export type Includes = {includeFrom: boolean; includeTo: boolean};
 type DexieCollection = Dexie.Collection<any, any>;
 export type DBEvents = DexieCollection | EventRecord[];
-type IdentifiedUpdatePayload = Partial<EventRecord> & Pick<EventRecord, 'primary_key'>;
+export type IdentifiedUpdatePayload = Partial<EventRecord> & Pick<EventRecord, 'primary_key'>;
 
 export const eventTimeToDate = (time: string) => new Date(time) || new Date(parseInt(time, 10));
 
 export const compareEventsByConversation = (eventA: EventRecord, eventB: EventRecord) =>
   eventA.conversation.localeCompare(eventB.conversation);
 
-export const compareEventsById = (eventA: EventRecord, eventB: EventRecord) => eventA.id.localeCompare(eventB.id);
+const compareEventsById = (eventA: EventRecord, eventB: EventRecord) => eventA.id.localeCompare(eventB.id);
 export const compareEventsByTime = (eventA: EventRecord, eventB: EventRecord) =>
   eventTimeToDate(eventA.time).getTime() - eventTimeToDate(eventB.time).getTime();
 
@@ -153,41 +155,6 @@ export class EventService {
     }
   }
 
-  /**
-   * Load a replacing event from database.
-   * To be used in certain cases (during some cases with quoting) when the original message cannot be found.
-   *
-   * @param conversationId ID of conversation
-   * @param eventId ID of event to retrieve
-   */
-  async loadReplacingEvent(conversationId: string, eventId: string): Promise<EventRecord> {
-    if (!conversationId || !eventId) {
-      this.logger.error(`Cannot get event '${eventId}' in conversation '${conversationId}' without IDs`);
-      throw new ConversationError(BASE_ERROR_TYPE.MISSING_PARAMETER, BaseError.MESSAGE.MISSING_PARAMETER);
-    }
-
-    try {
-      if (this.storageService.db) {
-        return await this.storageService.db
-          .table(StorageSchemata.OBJECT_STORE.EVENTS)
-          .where('id')
-          .equals(eventId)
-          .filter(record => record.conversation === conversationId)
-          .first();
-      }
-
-      const records = (await this.storageService.getAll(StorageSchemata.OBJECT_STORE.EVENTS)) as EventRecord[];
-      return records
-        .filter(record => record.conversation === conversationId && record.data?.replacing_message_id === eventId)
-        .sort(compareEventsById)
-        .shift();
-    } catch (error) {
-      const logMessage = `Failed to get event '${eventId}' for conversation '${conversationId}': ${error.message}`;
-      this.logger.error(logMessage, error);
-      throw error;
-    }
-  }
-
   /**
    * Load all events matching a minimum category from the database.
    *
@@ -239,7 +206,7 @@ export class EventService {
       return events;
     }
 
-    const records = await this.storageService.getAll<EventRecord>(StorageSchemata.OBJECT_STORE.EVENTS);
+    const records = await this.storageService.getAll<any>(StorageSchemata.OBJECT_STORE.EVENTS);
     return records
       .filter(record => {
         return (
@@ -418,7 +385,7 @@ export class EventService {
     reason: ProtobufAsset.NotUploaded | AssetTransferState,
   ): Promise<EventRecord | undefined> {
     const record = await this.storageService.load<EventRecord>(StorageSchemata.OBJECT_STORE.EVENTS, primaryKey);
-    if (!record) {
+    if (!record || record.type !== ClientEvent.CONVERSATION.ASSET_ADD) {
       this.logger.warn('Did not find message to update asset (failed)');
       return undefined;
     }
diff --git a/src/script/event/EventType.ts b/src/script/event/EventType.ts
index e185c6c8092..b5c2c1008cd 100644
--- a/src/script/event/EventType.ts
+++ b/src/script/event/EventType.ts
@@ -21,6 +21,7 @@ export enum EVENT_TYPE {
   CALL = 'call',
   CONVERSATION = 'conversation',
   FEATURE_CONFIG = 'feature-config',
+  FEDERATION = 'federation',
   TEAM = 'team',
   USER = 'user',
 }
diff --git a/src/script/event/EventTypeHandling.ts b/src/script/event/EventTypeHandling.ts
index 64d2c525ab3..89c8ec374c2 100644
--- a/src/script/event/EventTypeHandling.ts
+++ b/src/script/event/EventTypeHandling.ts
@@ -17,10 +17,16 @@
  *
  */
 
-import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
+import {CONVERSATION_EVENT, ConversationEvent} from '@wireapp/api-client/lib/event';
 
 import {ClientEvent} from './Client';
 
+import {ClientConversationEvent} from '../conversation/EventBuilder';
+
+export function eventShouldBeStored(event: {type: any}): event is ClientConversationEvent | ConversationEvent {
+  return EventTypeHandling.STORE.includes(event.type);
+}
+
 export const EventTypeHandling = {
   CONFIRM: [
     ClientEvent.CONVERSATION.ASSET_ADD,
@@ -35,6 +41,7 @@ export const EventTypeHandling = {
     CONVERSATION_EVENT.MESSAGE_TIMER_UPDATE,
     CONVERSATION_EVENT.RECEIPT_MODE_UPDATE,
     CONVERSATION_EVENT.RENAME,
+    ClientEvent.CONVERSATION.FEDERATION_STOP,
     ClientEvent.CONVERSATION.ASSET_ADD,
     ClientEvent.CONVERSATION.COMPOSITE_MESSAGE_ADD,
     ClientEvent.CONVERSATION.DELETE_EVERYWHERE,
@@ -47,6 +54,7 @@ export const EventTypeHandling = {
     ClientEvent.CONVERSATION.LOCATION,
     ClientEvent.CONVERSATION.MESSAGE_ADD,
     ClientEvent.CONVERSATION.MISSED_MESSAGES,
+    ClientEvent.CONVERSATION.MLS_CONVERSATION_RECOVERED,
     ClientEvent.CONVERSATION.ONE2ONE_CREATION,
     ClientEvent.CONVERSATION.TEAM_MEMBER_LEAVE,
     ClientEvent.CONVERSATION.UNABLE_TO_DECRYPT,
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.test.ts b/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.test.ts
new file mode 100644
index 00000000000..60ffc4fb123
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.test.ts
@@ -0,0 +1,353 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging';
+
+import {AssetTransferState} from 'src/script/assets/AssetTransferState';
+import {User} from 'src/script/entity/User';
+import {EventError} from 'src/script/error/EventError';
+import {createAssetAddEvent, createMessageAddEvent, toSavedEvent} from 'test/helper/EventGenerator';
+import {createUuid} from 'Util/uuid';
+
+import {EventStorageMiddleware} from './EventStorageMiddleware';
+
+import {ClientEvent} from '../../Client';
+import {EventService} from '../../EventService';
+
+function buildEventStorageMiddleware() {
+  const eventService = {
+    saveEvent: jest.fn(event => event),
+    loadEvent: jest.fn(),
+    replaceEvent: jest.fn(event => event),
+    deleteEvent: jest.fn(),
+  } as unknown as jest.Mocked<EventService>;
+
+  const selfUser = new User(createUuid());
+  return [new EventStorageMiddleware(eventService, selfUser), {eventService, selfUser}] as const;
+}
+
+describe('EventStorageMiddleware', () => {
+  describe('processEvent', () => {
+    it('ignores unhandled event', async () => {
+      const event = {type: 'other'} as any;
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+
+      await eventStorageMiddleware.processEvent(event);
+      expect(eventService.saveEvent).not.toHaveBeenCalledWith(event);
+    });
+
+    it('saves an event with a new ID', async () => {
+      const event = createMessageAddEvent();
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+
+      await eventStorageMiddleware.processEvent(event);
+      expect(eventService.saveEvent).toHaveBeenCalledWith(event);
+    });
+
+    it('fails for an event with an ID previously used by another user', async () => {
+      const event = createMessageAddEvent();
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const eventWithSameId = {...event, from: createUuid()};
+      eventService.loadEvent.mockResolvedValue({primary_key: '', category: 1, ...eventWithSameId});
+
+      await expect(eventStorageMiddleware.processEvent(event)).rejects.toEqual(
+        new EventError(
+          EventError.TYPE.VALIDATION_FAILED,
+          'Event validation failed: ID previously used by another user',
+        ),
+      );
+    });
+
+    it('fails for a non-"text message" with an ID previously used by the same user', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      eventService.loadEvent.mockResolvedValue(toSavedEvent({...event, type: ClientEvent.CALL.E_CALL} as any));
+
+      await expect(eventStorageMiddleware.processEvent(event)).rejects.toEqual(
+        new EventError(
+          EventError.TYPE.VALIDATION_FAILED,
+          'Event validation failed: ID already used for a different type of message',
+        ),
+      );
+    });
+
+    it('fails for a plain text message with an ID previously used by the same user', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(event));
+
+      await expect(eventStorageMiddleware.processEvent(event)).rejects.toEqual(
+        new EventError(
+          EventError.TYPE.VALIDATION_FAILED,
+          'Event validation failed: ID already used for a successfully sent message',
+        ),
+      );
+    });
+
+    it('fails for a text message with link preview with an ID previously used by the same user for a text message with link preview', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      const storedEvent = {...event, data: {...event.data, previews: ['1']}};
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(storedEvent));
+
+      await expect(eventStorageMiddleware.processEvent(event)).rejects.toEqual(
+        new EventError(
+          EventError.TYPE.VALIDATION_FAILED,
+          'Event validation failed: ID already used for a successfully sent message',
+        ),
+      );
+    });
+
+    it('ignores a text message with link preview with an ID previously used by the same user for a text message different content', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      const storedEvent = {...event, data: {...event.data, previews: [] as any[]}};
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(storedEvent));
+
+      const newEvent = {...event, data: {...event.data, content: 'different content', previews: ['1']}};
+
+      await expect(eventStorageMiddleware.processEvent(newEvent)).rejects.toEqual(
+        new EventError(
+          EventError.TYPE.VALIDATION_FAILED,
+          'Event validation failed: Link preview with different text content',
+        ),
+      );
+    });
+
+    it('saves a text message with link preview with an ID previously used by the same user for a plain text message', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      const storedEvent = JSON.parse(JSON.stringify(event));
+      eventService.loadEvent.mockResolvedValue(storedEvent);
+      eventService.replaceEvent.mockResolvedValue(storedEvent);
+
+      const initial_time = event.time;
+      const changed_time = new Date(new Date(event.time).getTime() + 60 * 1000).toISOString();
+      event.data.previews?.push('1');
+      event.time = changed_time;
+
+      const savedEvent = (await eventStorageMiddleware.processEvent(event)) as any;
+      expect(savedEvent.time).toEqual(initial_time);
+      expect(savedEvent.time).not.toEqual(changed_time);
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+    });
+
+    it('saves a link preview even if the original message is not found', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent({dataOverrides: {previews: ['1']}});
+
+      await eventStorageMiddleware.processEvent(event);
+      expect(eventService.replaceEvent).not.toHaveBeenCalled();
+      expect(eventService.saveEvent).toHaveBeenCalled();
+    });
+
+    it('ignores edit message with missing associated original message', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const linkPreviewEvent = createMessageAddEvent();
+      eventService.loadEvent.mockResolvedValue(undefined);
+
+      linkPreviewEvent.data.replacing_message_id = 'missing';
+
+      await expect(eventStorageMiddleware.processEvent(linkPreviewEvent)).rejects.toEqual(
+        new EventError(EventError.TYPE.VALIDATION_FAILED, 'Event validation failed: Edit event without original event'),
+      );
+    });
+
+    it('updates edited messages when link preview arrives', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const replacingId = 'old-replaced-message-id';
+      const linkPreviewEvent = createMessageAddEvent();
+      const storedEvent = JSON.parse(
+        JSON.stringify({
+          ...linkPreviewEvent,
+          data: {...linkPreviewEvent.data, replacing_message_id: replacingId},
+        }),
+      );
+      eventService.loadEvent.mockResolvedValue(storedEvent);
+
+      linkPreviewEvent.data.replacing_message_id = replacingId;
+      linkPreviewEvent.data.previews = ['preview'];
+
+      const updatedEvent = (await eventStorageMiddleware.processEvent(linkPreviewEvent)) as any;
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+      expect(eventService.saveEvent).not.toHaveBeenCalled();
+      expect(updatedEvent.data.previews[0]).toEqual('preview');
+    });
+
+    it('updates edited messages', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+      const originalEvent = JSON.parse(JSON.stringify(event));
+      originalEvent.reactions = ['user-id'];
+      eventService.loadEvent.mockResolvedValue(originalEvent);
+
+      const initial_time = event.time;
+      const changed_time = new Date(new Date(event.time).getTime() + 60 * 1000).toISOString();
+      originalEvent.primary_key = 12;
+      event.id = createUuid();
+      event.data.content = 'new content';
+      event.data.replacing_message_id = originalEvent.id;
+      event.time = changed_time;
+
+      const updatedEvent = (await eventStorageMiddleware.processEvent(event)) as any;
+      expect(updatedEvent.time).toEqual(initial_time);
+      expect(updatedEvent.time).not.toEqual(changed_time);
+      expect(updatedEvent.data.content).toEqual('new content');
+      expect(updatedEvent.primary_key).toEqual(originalEvent.primary_key);
+      expect(Object.keys(updatedEvent.reactions).length).toEqual(0);
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+    });
+
+    it('updates link preview when edited', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createMessageAddEvent();
+
+      const replacingId = 'replaced-message-id';
+      const storedEvent = {
+        ...event,
+        data: {...event.data, previews: ['preview']},
+      };
+      const editEvent = {...event};
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(storedEvent));
+
+      editEvent.data.replacing_message_id = replacingId;
+
+      const updatedEvent = (await eventStorageMiddleware.processEvent(editEvent)) as any;
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+      expect(eventService.saveEvent).not.toHaveBeenCalled();
+      expect(updatedEvent.data.previews.length).toEqual(0);
+    });
+
+    it('saves a conversation.asset-add event', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const event = createAssetAddEvent();
+
+      const updatedEvent = await eventStorageMiddleware.processEvent(event);
+      expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+      expect(eventService.saveEvent).toHaveBeenCalled();
+    });
+
+    it('deletes cancelled conversation.asset-add event', async () => {
+      const [eventStorageMiddleware, {eventService, selfUser}] = buildEventStorageMiddleware();
+      const fromIds = [
+        // cancel from an other user
+        createUuid(),
+        // cancel from the self user
+        selfUser.id,
+      ];
+
+      for (const fromId of fromIds) {
+        const assetAddEvent = createAssetAddEvent({from: fromId});
+        const assetCancelEvent = {
+          ...assetAddEvent,
+          data: {
+            ...assetAddEvent.data,
+            reason: ProtobufAsset.NotUploaded.CANCELLED,
+            status: AssetTransferState.UPLOAD_FAILED,
+          },
+          time: '2017-09-06T09:43:36.528Z',
+        };
+
+        eventService.loadEvent.mockResolvedValue(toSavedEvent(assetAddEvent));
+        eventService.deleteEvent.mockResolvedValue(1);
+
+        const savedEvent = await eventStorageMiddleware.processEvent(assetCancelEvent);
+        expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+        expect(eventService.deleteEvent).toHaveBeenCalled();
+      }
+    });
+
+    it('deletes other user failed upload for conversation.asset-add event', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const assetAddEvent = createAssetAddEvent();
+      const assetUploadFailedEvent = {
+        ...assetAddEvent,
+        data: {
+          ...assetAddEvent.data,
+          reason: ProtobufAsset.NotUploaded.FAILED,
+          status: AssetTransferState.UPLOAD_FAILED,
+        },
+        time: '2017-09-06T09:43:36.528Z',
+      };
+
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(assetAddEvent));
+      eventService.deleteEvent.mockResolvedValue(1);
+
+      const savedEvent = await eventStorageMiddleware.processEvent(assetUploadFailedEvent);
+      expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+      expect(eventService.deleteEvent).toHaveBeenCalled();
+    });
+
+    it('updates self failed upload for conversation.asset-add event', async () => {
+      const [eventStorageMiddleware, {eventService, selfUser}] = buildEventStorageMiddleware();
+
+      const assetAddEvent = createAssetAddEvent({from: selfUser.id});
+      const assetUploadFailedEvent = {
+        ...assetAddEvent,
+        data: {
+          ...assetAddEvent.data,
+          reason: ProtobufAsset.NotUploaded.FAILED,
+          status: AssetTransferState.UPLOAD_FAILED,
+        },
+        time: '2017-09-06T09:43:36.528Z',
+      } as any;
+
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(assetAddEvent));
+
+      const savedEvent = await eventStorageMiddleware.processEvent(assetUploadFailedEvent);
+      expect(savedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+    });
+
+    it('handles conversation.asset-add state update event', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const initialAssetEvent = createAssetAddEvent({type: ClientEvent.CONVERSATION.ASSET_ADD});
+
+      const updateStatusEvent = {
+        ...initialAssetEvent,
+        data: {...initialAssetEvent.data, status: AssetTransferState.UPLOADED},
+        time: '2017-09-06T09:43:36.528Z',
+      };
+
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(initialAssetEvent));
+
+      const updatedEvent = (await eventStorageMiddleware.processEvent(updateStatusEvent)) as any;
+      expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+      expect(updatedEvent.data.status).toEqual(updateStatusEvent.data.status);
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+    });
+
+    it('updates video when preview is received', async () => {
+      const [eventStorageMiddleware, {eventService}] = buildEventStorageMiddleware();
+      const initialAssetEvent = createAssetAddEvent();
+
+      const AssetPreviewEvent = {
+        ...initialAssetEvent,
+        data: {...initialAssetEvent.data, status: AssetTransferState.UPLOADED},
+        time: '2017-09-06T09:43:36.528Z',
+      };
+
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(initialAssetEvent));
+
+      const updatedEvent = await eventStorageMiddleware.processEvent(AssetPreviewEvent);
+      expect(updatedEvent.type).toEqual(ClientEvent.CONVERSATION.ASSET_ADD);
+      expect(eventService.replaceEvent).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.ts b/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.ts
new file mode 100644
index 00000000000..66aa216cb49
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/EventStorageMiddleware.ts
@@ -0,0 +1,111 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {User} from 'src/script/entity/User';
+
+import {handleLinkPreviewEvent, handleEditEvent, handleAssetEvent} from './eventHandlers';
+import {EventValidationError} from './eventHandlers/EventValidationError';
+import {HandledEvents, DBOperation} from './types';
+
+import {isEventRecordFailed, isEventRecordWithFederationError} from '../../../message/StatusType';
+import type {EventRecord} from '../../../storage';
+import {CONVERSATION} from '../../Client';
+import {EventMiddleware, IncomingEvent} from '../../EventProcessor';
+import {EventService} from '../../EventService';
+import {eventShouldBeStored} from '../../EventTypeHandling';
+
+export class EventStorageMiddleware implements EventMiddleware {
+  constructor(
+    private readonly eventService: EventService,
+    private readonly selfUser: User,
+  ) {}
+
+  async processEvent(event: IncomingEvent) {
+    const shouldSaveEvent = eventShouldBeStored(event);
+    if (!shouldSaveEvent) {
+      return event;
+    }
+    const eventId = 'id' in event && event.id;
+    /* We try to load a potential duplicate of the event (same ID, same conversation in the DB). There are multiple valid cases for duplicates:
+     * - The event is a retry of a previously failed event
+     * - The event is a link preview of a text message previously sent
+     * - The event is an asset upload success of a metadata asset message
+     */
+    const duplicateEvent = eventId ? await this.eventService.loadEvent(event.conversation, eventId) : undefined;
+
+    // We first validate that the event is valid
+    this.validateEvent(event, duplicateEvent);
+    // Then ask the different handlers which DB operations to perform
+    const operation = await this.getDbOperation(event, duplicateEvent);
+    // And finally execute the operation
+    return operation ? this.execDBOperation(operation, event.conversation) : event;
+  }
+
+  private async getDbOperation(event: HandledEvents, duplicateEvent?: HandledEvents): Promise<DBOperation | undefined> {
+    const handlers = [handleEditEvent, handleLinkPreviewEvent, handleAssetEvent];
+    for (const handler of handlers) {
+      const operation = await handler(event, {
+        duplicateEvent,
+        selfUserId: this.selfUser.id,
+        findEvent: eventId => this.eventService.loadEvent(event.conversation, eventId),
+      });
+      if (operation) {
+        return operation;
+      }
+    }
+    return {type: 'insert', event};
+  }
+
+  private validateEvent(event: HandledEvents, duplicateEvent?: EventRecord) {
+    if (!duplicateEvent) {
+      return;
+    }
+    if (duplicateEvent.from !== event.from) {
+      throw new EventValidationError('ID previously used by another user');
+    }
+
+    if (event.type !== duplicateEvent.type) {
+      throw new EventValidationError('ID already used for a different type of message');
+    }
+
+    if (event.type === CONVERSATION.MESSAGE_ADD && duplicateEvent.type === CONVERSATION.MESSAGE_ADD) {
+      const isValidUpdate = !!event.data.previews?.length || event.data.replacing_message_id;
+      const isRetryAttempt = isEventRecordFailed(duplicateEvent) || isEventRecordWithFederationError(duplicateEvent);
+
+      if (!isValidUpdate && !isRetryAttempt) {
+        throw new EventValidationError('ID already used for a successfully sent message');
+      }
+    }
+  }
+
+  private async execDBOperation(operation: DBOperation, conversationId: string) {
+    switch (operation.type) {
+      case 'insert':
+        return this.eventService.saveEvent(operation.event);
+
+      case 'update':
+        await this.eventService.replaceEvent(operation.updates);
+        break;
+
+      case 'delete':
+        await this.eventService.deleteEvent(conversationId, operation.id);
+    }
+    return operation.event;
+  }
+}
diff --git a/src/script/auth/ValidationError.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/EventValidationError.ts
similarity index 68%
rename from src/script/auth/ValidationError.ts
rename to src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/EventValidationError.ts
index d6bd3640bca..68432ec025c 100644
--- a/src/script/auth/ValidationError.ts
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/EventValidationError.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,17 +17,10 @@
  *
  */
 
-export class ValidationError extends Error {
-  types: string | string[];
+import {EventError} from 'src/script/error/EventError';
 
-  constructor(types: string | string[], errorMessage: string) {
-    super();
-
-    if (typeof types === 'string') {
-      types = [types];
-    }
-
-    this.types = types;
-    this.message = errorMessage;
+export class EventValidationError extends EventError {
+  constructor(message: string) {
+    super(EventError.TYPE.VALIDATION_FAILED, `Event validation failed: ${message}`);
   }
 }
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/assetEventHandler.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/assetEventHandler.ts
new file mode 100644
index 00000000000..f18489edd13
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/assetEventHandler.ts
@@ -0,0 +1,108 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Asset as ProtobufAsset} from '@wireapp/protocol-messaging';
+
+import {AssetTransferState} from 'src/script/assets/AssetTransferState';
+import {AssetAddEvent} from 'src/script/conversation/EventBuilder';
+import {StoredEvent} from 'src/script/storage';
+
+import {EventValidationError} from './EventValidationError';
+
+import {CONVERSATION, ClientEvent} from '../../../Client';
+import {DBOperation, EventHandler, HandledEvents} from '../types';
+
+function validateAssetEvent(originalEvent: HandledEvents | undefined): originalEvent is StoredEvent<AssetAddEvent> {
+  if (!originalEvent) {
+    return false;
+  }
+
+  if (originalEvent.type !== ClientEvent.CONVERSATION.ASSET_ADD) {
+    throw new EventValidationError('Trying to update a non-asset message as an asset message');
+  }
+
+  return true;
+}
+
+function computeEventUpdates(
+  originalEvent: StoredEvent<AssetAddEvent>,
+  newEvent: AssetAddEvent,
+  selfUserId: string,
+): DBOperation {
+  const newEventData = newEvent.data;
+  // the preview status is not sent by the client so we fake a 'preview' status in order to cleanly handle it in the switch statement
+  const ASSET_PREVIEW = 'preview';
+  // similarly, no status is sent by the client when we retry sending a failed message
+  const RETRY_EVENT = 'retry';
+  const isPreviewEvent = !newEventData.status && !!newEventData.preview_key;
+  const isRetryEvent = !!newEventData.content_length;
+  const handledEvent = isRetryEvent ? RETRY_EVENT : newEventData.status;
+  const previewStatus = isPreviewEvent ? ASSET_PREVIEW : handledEvent;
+
+  const updateEventData = (newData: Partial<AssetAddEvent['data']>) => {
+    return {
+      ...originalEvent,
+      data: {...originalEvent.data, ...newData},
+    };
+  };
+
+  switch (previewStatus) {
+    case ASSET_PREVIEW:
+    case RETRY_EVENT:
+    case AssetTransferState.UPLOADED: {
+      return {type: 'update', event: newEvent, updates: updateEventData(newEventData)};
+    }
+
+    case AssetTransferState.UPLOAD_FAILED: {
+      // case of both failed or canceled upload
+      const fromOther = newEvent.from !== selfUserId;
+      const sameSender = newEvent.from === originalEvent.from;
+      const selfCancel = !fromOther && newEvent.data.reason === ProtobufAsset.NotUploaded.CANCELLED;
+      // we want to delete the event in the case of an error from the remote client or a cancel on the user's own client
+      const shouldDeleteEvent = (fromOther || selfCancel) && sameSender;
+      if (shouldDeleteEvent) {
+        return {type: 'delete', event: newEvent, id: newEvent.id};
+      }
+
+      const updatedEvent = updateEventData({
+        status: AssetTransferState.UPLOAD_FAILED,
+        reason: newEvent.data.reason ?? ProtobufAsset.NotUploaded.FAILED,
+      });
+      return {
+        type: 'update',
+        event: updatedEvent,
+        updates: updatedEvent,
+      };
+    }
+
+    default: {
+      throw new EventValidationError(`Unhandled asset status update '${newEvent.data.status}'`);
+    }
+  }
+}
+
+export const handleAssetEvent: EventHandler = async (event, {duplicateEvent, selfUserId}) => {
+  if (event.type !== CONVERSATION.ASSET_ADD) {
+    return undefined;
+  }
+  if (validateAssetEvent(duplicateEvent)) {
+    return computeEventUpdates(duplicateEvent, event, selfUserId);
+  }
+  return undefined;
+};
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/editedEventHandler.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/editedEventHandler.ts
new file mode 100644
index 00000000000..80f5f88065f
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/editedEventHandler.ts
@@ -0,0 +1,83 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MessageAddEvent} from 'src/script/conversation/EventBuilder';
+import {EventError} from 'src/script/error/EventError';
+import {StoredEvent} from 'src/script/storage';
+
+import {getCommonMessageUpdates} from './getCommonMessageUpdates';
+
+import {CONVERSATION, ClientEvent} from '../../../Client';
+import {EventHandler, HandledEvents} from '../types';
+
+function throwValidationError(message: string): never {
+  throw new EventError(EventError.TYPE.VALIDATION_FAILED, `Event validation failed: ${message}`);
+}
+
+function validateEditEvent(
+  originalEvent: HandledEvents | undefined,
+  editEvent: MessageAddEvent,
+): originalEvent is StoredEvent<MessageAddEvent> {
+  if (!originalEvent) {
+    throwValidationError('Edit event without original event');
+  }
+
+  if (originalEvent.type !== ClientEvent.CONVERSATION.MESSAGE_ADD) {
+    throwValidationError('Edit event for non-text message');
+  }
+
+  if (originalEvent.from !== editEvent.from) {
+    throwValidationError('ID reused by other user');
+  }
+
+  return true;
+}
+
+function getUpdatesForEditMessage(
+  originalEvent: StoredEvent<MessageAddEvent>,
+  newEvent: MessageAddEvent,
+): MessageAddEvent {
+  // Remove reactions, so that likes (hearts) don't stay when a message's text gets edited
+  const commonUpdates = getCommonMessageUpdates(originalEvent, newEvent);
+
+  return {...newEvent, ...commonUpdates, reactions: {}};
+}
+
+function computeEventUpdates(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
+  const primaryKeyUpdate = {primary_key: originalEvent.primary_key};
+  const updates = getUpdatesForEditMessage(originalEvent, newEvent);
+
+  return {...primaryKeyUpdate, ...updates};
+}
+
+export const handleEditEvent: EventHandler = async (event, {findEvent}) => {
+  if (event.type !== CONVERSATION.MESSAGE_ADD) {
+    return undefined;
+  }
+  const editedEventId = event.data.replacing_message_id;
+  if (!editedEventId) {
+    return undefined;
+  }
+  const originalEvent = await findEvent(editedEventId);
+  if (validateEditEvent(originalEvent, event)) {
+    const updatedEvent = computeEventUpdates(originalEvent, event);
+    return {type: 'update', event: updatedEvent, updates: updatedEvent};
+  }
+  return undefined;
+};
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.test.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.test.ts
new file mode 100644
index 00000000000..ffe78482f6c
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.test.ts
@@ -0,0 +1,48 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {StatusType} from 'src/script/message/StatusType';
+import {createMessageAddEvent, toSavedEvent} from 'test/helper/EventGenerator';
+
+import {getCommonMessageUpdates} from './getCommonMessageUpdates';
+
+describe('getCommonMessageUpdates', () => {
+  /** @see https://wearezeta.atlassian.net/browse/SQCORE-732 */
+  it('does not overwrite the seen status if a message gets edited', () => {
+    const originalEvent = toSavedEvent(createMessageAddEvent({overrides: {status: StatusType.SEEN}}));
+
+    const editedEvent = createMessageAddEvent({
+      text: 'Edited Text Which Replaces The Original Text',
+      overrides: {
+        read_receipts: [
+          {
+            time: '2021-06-10T19:47:19.570Z',
+            userId: 'b661e27f-24c6-4c52-a425-87a7b7f3df61',
+          },
+        ],
+      },
+      dataOverrides: {replacing_message_id: originalEvent.id},
+    });
+
+    const updatedEvent = getCommonMessageUpdates(originalEvent, editedEvent) as any;
+    expect(updatedEvent.data.content).toBe('Edited Text Which Replaces The Original Text');
+    expect(updatedEvent.status).toBe(StatusType.SEEN);
+    expect(Object.keys(updatedEvent.read_receipts).length).toBe(1);
+  });
+});
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.ts
new file mode 100644
index 00000000000..776a890cefc
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/getCommonMessageUpdates.ts
@@ -0,0 +1,32 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MessageAddEvent} from 'src/script/conversation/EventBuilder';
+import {StoredEvent} from 'src/script/storage';
+
+export function getCommonMessageUpdates(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
+  return {
+    ...newEvent,
+    data: {...newEvent.data, expects_read_confirmation: originalEvent.data.expects_read_confirmation},
+    edited_time: newEvent.time,
+    read_receipts: !newEvent.read_receipts ? originalEvent.read_receipts : newEvent.read_receipts,
+    status: !newEvent.status || newEvent.status < originalEvent.status ? originalEvent.status : newEvent.status,
+    time: originalEvent.time,
+  };
+}
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/index.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/index.ts
new file mode 100644
index 00000000000..469bf765b44
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/index.ts
@@ -0,0 +1,22 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './editedEventHandler';
+export * from './linkPreviewEventHandler';
+export * from './assetEventHandler';
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/linkPreviewEventHandler.ts b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/linkPreviewEventHandler.ts
new file mode 100644
index 00000000000..040aa14e07a
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/eventHandlers/linkPreviewEventHandler.ts
@@ -0,0 +1,88 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {MessageAddEvent} from 'src/script/conversation/EventBuilder';
+import {categoryFromEvent} from 'src/script/message/MessageCategorization';
+import {StoredEvent} from 'src/script/storage';
+
+import {EventValidationError} from './EventValidationError';
+import {getCommonMessageUpdates} from './getCommonMessageUpdates';
+
+import {CONVERSATION, ClientEvent} from '../../../Client';
+import {EventHandler, HandledEvents} from '../types';
+
+function getLinkPreviewUpdates(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
+  const commonUpdates = getCommonMessageUpdates(originalEvent, newEvent);
+
+  return {
+    ...newEvent,
+    ...commonUpdates,
+    category: categoryFromEvent(newEvent),
+    ephemeral_expires: originalEvent.ephemeral_expires,
+    ephemeral_started: originalEvent.ephemeral_started,
+    ephemeral_time: originalEvent.ephemeral_time,
+    server_time: newEvent.time,
+    version: originalEvent.version,
+  };
+}
+
+function validateLinkPreviewEvent(
+  originalEvent: HandledEvents | undefined,
+  editEvent: MessageAddEvent,
+): originalEvent is StoredEvent<MessageAddEvent> {
+  const {previews, content} = editEvent.data;
+  if (!previews?.length) {
+    return false;
+  }
+  if (!originalEvent) {
+    // It is fine to receive a linkPreview message without the original event
+    return false;
+  }
+  if (originalEvent.type !== ClientEvent.CONVERSATION.MESSAGE_ADD) {
+    throw new EventValidationError('Link preview event for non-text message');
+  }
+
+  const {previews: originalPreviews, content: originalContent} = originalEvent.data;
+  if (!!originalPreviews?.length) {
+    throw new EventValidationError('Link preview already existing on original message');
+  }
+
+  if (content !== originalContent) {
+    throw new EventValidationError('Link preview with different text content');
+  }
+  return true;
+}
+
+function computeEventUpdates(originalEvent: StoredEvent<MessageAddEvent>, newEvent: MessageAddEvent) {
+  const primaryKeyUpdate = {primary_key: originalEvent.primary_key};
+  const updates = getLinkPreviewUpdates(originalEvent, newEvent);
+
+  return {...primaryKeyUpdate, ...updates};
+}
+
+export const handleLinkPreviewEvent: EventHandler = async (event, {duplicateEvent}) => {
+  if (event.type !== CONVERSATION.MESSAGE_ADD) {
+    return undefined;
+  }
+  if (validateLinkPreviewEvent(duplicateEvent, event)) {
+    const updatedEvent = computeEventUpdates(duplicateEvent, event);
+    return {type: 'update', event: updatedEvent, updates: updatedEvent};
+  }
+  return undefined;
+};
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/index.ts b/src/script/event/preprocessor/EventStorageMiddleware/index.ts
new file mode 100644
index 00000000000..0154fc9a98c
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './EventStorageMiddleware';
diff --git a/src/script/event/preprocessor/EventStorageMiddleware/types.ts b/src/script/event/preprocessor/EventStorageMiddleware/types.ts
new file mode 100644
index 00000000000..66a79d03ef1
--- /dev/null
+++ b/src/script/event/preprocessor/EventStorageMiddleware/types.ts
@@ -0,0 +1,40 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationEvent} from '@wireapp/api-client/lib/event';
+
+import {EventRecord} from 'src/script/storage';
+
+import {ClientConversationEvent} from '../../../conversation/EventBuilder';
+import {IdentifiedUpdatePayload} from '../../EventService';
+
+export type HandledEvents = ClientConversationEvent | ConversationEvent;
+export type DBOperation =
+  | {type: 'update'; event: HandledEvents; updates: IdentifiedUpdatePayload}
+  | {type: 'delete'; event: HandledEvents; id: string}
+  | {type: 'insert'; event: HandledEvents};
+
+export type EventHandler = (
+  event: HandledEvents,
+  optionals: {
+    selfUserId: string;
+    duplicateEvent: HandledEvents | undefined;
+    findEvent: (eventId: string) => Promise<EventRecord | undefined>;
+  },
+) => Promise<DBOperation | undefined>;
diff --git a/src/script/event/preprocessor/QuotedMessageMiddleware.test.ts b/src/script/event/preprocessor/QuotedMessageMiddleware.test.ts
new file mode 100644
index 00000000000..0ec426f2d58
--- /dev/null
+++ b/src/script/event/preprocessor/QuotedMessageMiddleware.test.ts
@@ -0,0 +1,157 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Quote} from '@wireapp/protocol-messaging';
+
+import {Conversation} from 'src/script/entity/Conversation';
+import {User} from 'src/script/entity/User';
+import {ClientEvent} from 'src/script/event/Client';
+import {MessageHasher} from 'src/script/message/MessageHasher';
+import {QuoteEntity} from 'src/script/message/QuoteEntity';
+import {createMessageAddEvent, toSavedEvent} from 'test/helper/EventGenerator';
+import {arrayToBase64} from 'Util/util';
+import {createUuid} from 'Util/uuid';
+
+import {QuotedMessageMiddleware} from './QuotedMessageMiddleware';
+
+import {EventService} from '../EventService';
+
+function buildQuotedMessageMiddleware() {
+  const eventService = {
+    loadEvent: jest.fn(() => []),
+    loadEventsReplyingToMessage: jest.fn(),
+    loadReplacingEvent: jest.fn(),
+    replaceEvent: jest.fn(),
+  } as unknown as jest.Mocked<EventService>;
+
+  return [new QuotedMessageMiddleware(eventService), {eventService}] as const;
+}
+
+describe('QuotedMessageMiddleware', () => {
+  const conversation = new Conversation(createUuid());
+  conversation.selfUser(new User());
+
+  describe('processEvent', () => {
+    it('ignores messages that do not have quotes', async () => {
+      const [quotedMessageMiddleware] = buildQuotedMessageMiddleware();
+      const event = createMessageAddEvent();
+
+      const decoratedEvent = await quotedMessageMiddleware.processEvent(event);
+      expect(decoratedEvent).toEqual(event);
+    });
+
+    it('adds an error if quoted message is not found', async () => {
+      const [quotedMessageMiddleware, {eventService}] = buildQuotedMessageMiddleware();
+      eventService.loadEvent.mockResolvedValue(undefined);
+
+      const expectedError = {
+        type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND,
+      };
+
+      const quote = new Quote({
+        quotedMessageId: 'invalid-message-uuid',
+        quotedMessageSha256: new Uint8Array(),
+      });
+
+      const base64Quote = arrayToBase64(Quote.encode(quote).finish());
+
+      const event = createMessageAddEvent();
+      event.data.quote = base64Quote;
+
+      const parsedEvent: any = await quotedMessageMiddleware.processEvent(event);
+
+      expect(parsedEvent.data.quote.quotedMessageId).toBeUndefined();
+      expect(parsedEvent.data.quote.error).toEqual(expectedError);
+    });
+
+    it('decorates event with the quote metadata if validation is successful', async () => {
+      const [quotedMessageMiddleware, {eventService}] = buildQuotedMessageMiddleware();
+      const quotedMessage = createMessageAddEvent();
+      jest.spyOn(MessageHasher, 'validateHash').mockResolvedValue(true);
+      eventService.loadEvent.mockResolvedValue(toSavedEvent(quotedMessage));
+
+      const quote = new Quote({
+        quotedMessageId: quotedMessage.id,
+        quotedMessageSha256: new Uint8Array(),
+      });
+
+      const base64Quote = arrayToBase64(Quote.encode(quote).finish());
+
+      const event = createMessageAddEvent();
+      event.data.quote = base64Quote;
+
+      const parsedEvent: any = await quotedMessageMiddleware.processEvent(event);
+
+      expect(parsedEvent.data.quote.message_id).toEqual(quotedMessage.id);
+      expect(parsedEvent.data.quote.user_id).toEqual(quotedMessage.from);
+    });
+
+    it('updates quotes in DB when a message is edited', async () => {
+      const [quotedMessageMiddleware, {eventService}] = buildQuotedMessageMiddleware();
+      const originalMessage = toSavedEvent(createMessageAddEvent());
+      const replies = [
+        createMessageAddEvent({dataOverrides: {quote: {message_id: originalMessage.id} as any}}),
+        createMessageAddEvent({dataOverrides: {quote: {message_id: originalMessage.id} as any}}),
+      ];
+      eventService.loadEvent.mockResolvedValue(originalMessage);
+      eventService.loadEventsReplyingToMessage.mockResolvedValue(replies);
+
+      const event = createMessageAddEvent({dataOverrides: {replacing_message_id: originalMessage.id}});
+
+      jest.useFakeTimers();
+
+      await quotedMessageMiddleware.processEvent(event);
+      jest.advanceTimersByTime(1);
+
+      expect(eventService.replaceEvent).toHaveBeenCalledWith(
+        jasmine.objectContaining({data: jasmine.objectContaining({quote: {message_id: event.id}})}),
+      );
+      jest.useRealTimers();
+    });
+
+    it('invalidates quotes in DB when a message is deleted', () => {
+      const [quotedMessageMiddleware, {eventService}] = buildQuotedMessageMiddleware();
+      const originalMessage = toSavedEvent(createMessageAddEvent());
+      const replies = [
+        createMessageAddEvent({dataOverrides: {quote: {message_id: originalMessage.id} as any}}),
+        createMessageAddEvent({dataOverrides: {quote: {message_id: originalMessage.id} as any}}),
+      ];
+      spyOn(eventService, 'loadEvent').and.returnValue(Promise.resolve(originalMessage));
+      spyOn(eventService, 'loadEventsReplyingToMessage').and.returnValue(Promise.resolve(replies));
+      spyOn(eventService, 'replaceEvent').and.returnValue(Promise.resolve());
+
+      const event = {
+        conversation: 'conversation-uuid',
+        data: {
+          replacing_message_id: 'original-id',
+        },
+        id: 'new-id',
+        type: ClientEvent.CONVERSATION.MESSAGE_DELETE,
+      } as any;
+
+      return quotedMessageMiddleware.processEvent(event).then(() => {
+        expect(eventService.replaceEvent).toHaveBeenCalledWith(
+          jasmine.objectContaining({
+            data: jasmine.objectContaining({quote: {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}}}),
+          }),
+        );
+      });
+    });
+  });
+});
diff --git a/src/script/event/preprocessor/QuotedMessageMiddleware.ts b/src/script/event/preprocessor/QuotedMessageMiddleware.ts
index d51ac61cfea..8c1652b5d8b 100644
--- a/src/script/event/preprocessor/QuotedMessageMiddleware.ts
+++ b/src/script/event/preprocessor/QuotedMessageMiddleware.ts
@@ -19,20 +19,20 @@
 
 import {Quote} from '@wireapp/protocol-messaging';
 
+import {DeleteEvent, MessageAddEvent} from 'src/script/conversation/EventBuilder';
 import {getLogger, Logger} from 'Util/Logger';
 import {base64ToArray} from 'Util/util';
 
 import {QuoteEntity} from '../../message/QuoteEntity';
-import {EventRecord} from '../../storage/record/EventRecord';
+import {StoredEvent} from '../../storage/record/EventRecord';
 import {ClientEvent} from '../Client';
+import {EventMiddleware, IncomingEvent} from '../EventProcessor';
 import type {EventService} from '../EventService';
 
-export class QuotedMessageMiddleware {
-  private readonly eventService: EventService;
+export class QuotedMessageMiddleware implements EventMiddleware {
   private readonly logger: Logger;
 
-  constructor(eventService: EventService) {
-    this.eventService = eventService;
+  constructor(private readonly eventService: EventService) {
     this.logger = getLogger('QuotedMessageMiddleware');
   }
 
@@ -43,17 +43,15 @@ export class QuotedMessageMiddleware {
    * @param event event in the DB format
    * @returns the original event if no quote is found (or does not validate). The decorated event if the quote is valid
    */
-  async processEvent(event: EventRecord): Promise<EventRecord> {
+  async processEvent(event: IncomingEvent): Promise<IncomingEvent> {
     switch (event.type) {
       case ClientEvent.CONVERSATION.MESSAGE_ADD: {
-        if (event.data.replacing_message_id) {
-          return this._handleEditEvent(event);
-        }
-        return this._handleAddEvent(event);
+        const originalMessageId = event.data.replacing_message_id;
+        return originalMessageId ? this.handleEditEvent(event, originalMessageId) : this.handleAddEvent(event);
       }
 
       case ClientEvent.CONVERSATION.MESSAGE_DELETE: {
-        return this._handleDeleteEvent(event);
+        return this.handleDeleteEvent(event);
       }
 
       default: {
@@ -62,9 +60,9 @@ export class QuotedMessageMiddleware {
     }
   }
 
-  private async _handleDeleteEvent(event: EventRecord): Promise<EventRecord> {
+  private async handleDeleteEvent(event: DeleteEvent): Promise<DeleteEvent> {
     const originalMessageId = event.data.message_id;
-    const {replies} = await this._findRepliesToMessage(event.conversation, originalMessageId);
+    const {replies} = await this.findRepliesToMessage(event.conversation, originalMessageId);
     this.logger.info(`Invalidating '${replies.length}' replies to deleted message '${originalMessageId}'`);
     replies.forEach(reply => {
       reply.data.quote = {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}};
@@ -73,16 +71,18 @@ export class QuotedMessageMiddleware {
     return event;
   }
 
-  private async _handleEditEvent(event: EventRecord): Promise<EventRecord> {
-    const originalMessageId = event.data.replacing_message_id;
-    const {originalEvent, replies} = await this._findRepliesToMessage(event.conversation, originalMessageId);
+  private async handleEditEvent(event: MessageAddEvent, originalMessageId: string): Promise<MessageAddEvent> {
+    const {originalEvent, replies} = await this.findRepliesToMessage(event.conversation, originalMessageId);
     if (!originalEvent) {
       return event;
     }
 
     this.logger.info(`Updating '${replies.length}' replies to updated message '${originalMessageId}'`);
     replies.forEach(reply => {
-      reply.data.quote.message_id = event.id;
+      const quote = reply.data.quote;
+      if (quote && typeof quote !== 'string' && 'message_id' in quote && 'id' in event) {
+        quote.message_id = event.id as string;
+      }
       // we want to update the messages quoting the original message later, thus the timeout
       setTimeout(() => this.eventService.replaceEvent(reply));
     });
@@ -90,10 +90,10 @@ export class QuotedMessageMiddleware {
     return {...event, data: decoratedData};
   }
 
-  private async _handleAddEvent(event: EventRecord): Promise<EventRecord> {
-    const rawQuote = event.data && event.data.quote;
+  private async handleAddEvent(event: MessageAddEvent): Promise<MessageAddEvent> {
+    const rawQuote = event.data.quote;
 
-    if (!rawQuote) {
+    if (!rawQuote || typeof rawQuote !== 'string') {
       return event;
     }
 
@@ -103,23 +103,17 @@ export class QuotedMessageMiddleware {
 
     const messageId = quote.quotedMessageId;
 
-    let quotedMessage =
-      (await this.eventService.loadEvent(event.conversation, messageId)) ??
-      (await this.eventService.loadReplacingEvent(event.conversation, messageId));
+    const quotedMessage = await this.eventService.loadEvent(event.conversation, messageId);
     if (!quotedMessage) {
-      const replacedMessage = await this.eventService.loadReplacingEvent(event.conversation, messageId);
-      if (!replacedMessage) {
-        this.logger.warn(`Quoted message with ID "${messageId}" not found.`);
-        const quoteData = {
-          error: {
-            type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND,
-          },
-        };
-
-        const decoratedData = {...event.data, quote: quoteData};
-        return {...event, data: decoratedData};
-      }
-      quotedMessage = replacedMessage;
+      this.logger.warn(`Quoted message with ID "${messageId}" not found.`);
+      const quoteData = {
+        error: {
+          type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND,
+        },
+      };
+
+      const decoratedData = {...event.data, quote: quoteData};
+      return {...event, data: decoratedData};
     }
 
     const quoteData = {
@@ -132,13 +126,13 @@ export class QuotedMessageMiddleware {
     return {...event, data: decoratedData};
   }
 
-  private async _findRepliesToMessage(
+  private async findRepliesToMessage(
     conversationId: string,
     messageId: string,
-  ): Promise<{originalEvent?: EventRecord; replies: EventRecord[]}> {
+  ): Promise<{originalEvent?: MessageAddEvent; replies: StoredEvent<MessageAddEvent>[]}> {
     const originalEvent = await this.eventService.loadEvent(conversationId, messageId);
 
-    if (!originalEvent) {
+    if (!originalEvent || originalEvent.type !== ClientEvent.CONVERSATION.MESSAGE_ADD) {
       return {
         replies: [],
       };
diff --git a/src/script/event/preprocessor/ReceiptsMiddleware.test.ts b/src/script/event/preprocessor/ReceiptsMiddleware.test.ts
new file mode 100644
index 00000000000..688e9559b07
--- /dev/null
+++ b/src/script/event/preprocessor/ReceiptsMiddleware.test.ts
@@ -0,0 +1,124 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConfirmationEvent} from 'src/script/conversation/EventBuilder';
+import {User} from 'src/script/entity/User';
+import {ClientEvent} from 'src/script/event/Client';
+import {StatusType} from 'src/script/message/StatusType';
+import {createUuid} from 'Util/uuid';
+
+import {ReceiptsMiddleware} from './ReceiptsMiddleware';
+
+function buildReadReceiptMiddleware() {
+  const selfUser = new User(createUuid());
+  const eventService = {loadEvents: jest.fn(() => []), replaceEvent: jest.fn()} as any;
+
+  return [new ReceiptsMiddleware(eventService, {} as any, selfUser), {eventService, selfUser}] as const;
+}
+
+describe('ReceiptsMiddleware', () => {
+  describe('processEvent', () => {
+    it('ignores read receipt for which original message is not found', async () => {
+      const event = createConfirmationEvent(3);
+      const [readReceiptMiddleware, {eventService}] = buildReadReceiptMiddleware();
+
+      await readReceiptMiddleware.processEvent(event);
+
+      expect(eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [event.data.message_id]);
+      expect(eventService.replaceEvent).not.toHaveBeenCalled();
+    });
+
+    it('ignores read receipt from user who already has read the message', async () => {
+      const event = createConfirmationEvent(4);
+      const [readReceiptMiddleware, {eventService, selfUser}] = buildReadReceiptMiddleware();
+
+      const originalEvent = {from: selfUser.id, read_receipts: [{time: '', userId: event.from}]};
+      eventService.loadEvents.mockResolvedValue([originalEvent]);
+
+      await readReceiptMiddleware.processEvent(event);
+
+      expect(eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [event.data.message_id]);
+      expect(eventService.replaceEvent).not.toHaveBeenCalled();
+    });
+
+    it('ignores read receipts for messages that are not mine', async () => {
+      const event = createConfirmationEvent(StatusType.SEEN);
+      const [readReceiptMiddleware, {eventService}] = buildReadReceiptMiddleware();
+      const originaleEvent = {from: createUuid()};
+      eventService.loadEvents.mockResolvedValue([originaleEvent]);
+
+      await readReceiptMiddleware.processEvent(event);
+
+      expect(eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [event.data.message_id]);
+      expect(eventService.replaceEvent).not.toHaveBeenCalled();
+    });
+
+    it('updates original message when read confirmation is received', async () => {
+      const [readReceiptMiddleware, {eventService, selfUser}] = buildReadReceiptMiddleware();
+      const originalEvent = {from: selfUser.id};
+
+      eventService.loadEvents.mockResolvedValue([originalEvent]);
+      eventService.replaceEvent.mockResolvedValue(originalEvent);
+
+      const event = createConfirmationEvent(StatusType.SEEN, selfUser.id);
+
+      await readReceiptMiddleware.processEvent(event);
+
+      expect(eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [event.data.message_id]);
+      expect(eventService.replaceEvent).toHaveBeenCalledWith({
+        from: selfUser.id,
+        read_receipts: [{time: event.time, userId: event.from}],
+        status: event.data.status,
+      });
+    });
+
+    it('updates original message when delivered confirmation is received', async () => {
+      const [readReceiptMiddleware, {eventService, selfUser}] = buildReadReceiptMiddleware();
+      const originalEvent = {from: selfUser.id};
+
+      eventService.loadEvents.mockResolvedValue([originalEvent]);
+      eventService.replaceEvent.mockResolvedValue(originalEvent);
+
+      const event = createConfirmationEvent(StatusType.DELIVERED, selfUser.id);
+
+      await readReceiptMiddleware.processEvent(event);
+
+      expect(eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [event.data.message_id]);
+      expect(eventService.replaceEvent).toHaveBeenCalledWith({
+        from: selfUser.id,
+        status: event.data.status,
+      });
+    });
+  });
+});
+
+function createConfirmationEvent(status: StatusType, fromId = createUuid()): ConfirmationEvent {
+  return {
+    id: createUuid(),
+    conversation: createUuid(),
+    data: {
+      message_id: createUuid(),
+      more_message_ids: [],
+      status,
+    },
+    from: fromId,
+    time: '12-12-12',
+    type: ClientEvent.CONVERSATION.CONFIRMATION,
+  };
+}
diff --git a/src/script/event/preprocessor/ReceiptsMiddleware.ts b/src/script/event/preprocessor/ReceiptsMiddleware.ts
index 44ccb5394eb..4ca7f07b504 100644
--- a/src/script/event/preprocessor/ReceiptsMiddleware.ts
+++ b/src/script/event/preprocessor/ReceiptsMiddleware.ts
@@ -18,36 +18,33 @@
  */
 
 import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data';
-import {container} from 'tsyringe';
 
+import {ConfirmationEvent} from 'src/script/conversation/EventBuilder';
+import {User} from 'src/script/entity/User';
 import {getLogger, Logger} from 'Util/Logger';
 
 import type {ConversationRepository} from '../../conversation/ConversationRepository';
 import {StatusType} from '../../message/StatusType';
 import type {EventRecord} from '../../storage/record/EventRecord';
-import {UserState} from '../../user/UserState';
 import {ClientEvent} from '../Client';
+import {EventMiddleware, IncomingEvent} from '../EventProcessor';
 import type {EventService} from '../EventService';
 
-export class ReceiptsMiddleware {
-  private readonly eventService: EventService;
-  private readonly conversationRepository: ConversationRepository;
+export class ReceiptsMiddleware implements EventMiddleware {
   private readonly logger: Logger;
 
   constructor(
-    eventService: EventService,
-    conversationRepository: ConversationRepository,
-    private readonly userState = container.resolve(UserState),
+    private readonly eventService: EventService,
+    private readonly conversationRepository: ConversationRepository,
+    private readonly selfUser: User,
   ) {
-    this.eventService = eventService;
-    this.conversationRepository = conversationRepository;
     this.logger = getLogger('ReceiptsMiddleware');
   }
 
   /**
    * Handles incoming (and injected outgoing) events.
    */
-  async processEvent(event: EventRecord): Promise<EventRecord> {
+  async processEvent(event: IncomingEvent): Promise<IncomingEvent> {
     switch (event.type) {
       case ClientEvent.CONVERSATION.ASSET_ADD:
       case ClientEvent.CONVERSATION.KNOCK:
@@ -77,13 +74,13 @@ export class ReceiptsMiddleware {
     }
   }
 
-  isMyMessage(originalEvent: EventRecord): boolean {
-    return this.userState.self() && this.userState.self().id === originalEvent.from;
+  private isMyMessage(originalEvent: EventRecord): boolean {
+    return this.selfUser.id === originalEvent.from;
   }
 
   private updateConfirmationStatus(
     originalEvent: EventRecord,
-    confirmationEvent: EventRecord,
+    confirmationEvent: ConfirmationEvent,
   ): Promise<EventRecord | void> {
     const status = confirmationEvent.data.status;
     const currentReceipts = ('read_receipts' in originalEvent && originalEvent.read_receipts) || [];
diff --git a/src/script/event/preprocessor/ServiceMiddleware.test.ts b/src/script/event/preprocessor/ServiceMiddleware.test.ts
new file mode 100644
index 00000000000..0c126c97f62
--- /dev/null
+++ b/src/script/event/preprocessor/ServiceMiddleware.test.ts
@@ -0,0 +1,134 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationRepository} from 'src/script/conversation/ConversationRepository';
+import {EventBuilder} from 'src/script/conversation/EventBuilder';
+import {Conversation} from 'src/script/entity/Conversation';
+import {User} from 'src/script/entity/User';
+import {UserRepository} from 'src/script/user/UserRepository';
+import {createUuid} from 'Util/uuid';
+
+import {ServiceMiddleware} from './ServiceMiddleware';
+
+function buildServiceMiddleware() {
+  const selfUser = new User(createUuid());
+  const conversationRepository = {getConversationById: jest.fn()} as unknown as jest.Mocked<ConversationRepository>;
+  const userRepository = {getUsersById: jest.fn()} as unknown as jest.Mocked<UserRepository>;
+
+  return [
+    new ServiceMiddleware(conversationRepository, userRepository, selfUser),
+    {conversationRepository, userRepository, selfUser},
+  ] as const;
+}
+
+describe('ServiceMiddleware', () => {
+  const conversation = new Conversation(createUuid());
+
+  describe('processEvent', () => {
+    describe('conversation.member-join events', () => {
+      it('adds meta when services are present in the event', async () => {
+        const [serviceMiddleware, {userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, []);
+
+        const service = new User();
+        service.isService = true;
+        const userEntities = [new User(), service];
+        userRepository.getUsersById.mockResolvedValue(userEntities);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).toBe(true);
+      });
+
+      it('adds meta if I was added to a conversation including a service', async () => {
+        const [serviceMiddleware, {conversationRepository, userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, [selfUser.qualifiedId]);
+
+        conversationRepository.getConversationById.mockResolvedValue(conversation);
+        const service = new User();
+        service.isService = true;
+        const userEntities = [new User(), service];
+
+        userRepository.getUsersById.mockResolvedValue(userEntities);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).toBe(true);
+      });
+
+      it('does not modify events not containing any service', async () => {
+        const [serviceMiddleware, {userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, []);
+        userRepository.getUsersById.mockResolvedValue([new User(), new User()]);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).not.toBeDefined();
+      });
+
+      it('adds meta when services are present in the event with qualified user ids', async () => {
+        const [serviceMiddleware, {userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, []);
+
+        const service = new User();
+        service.isService = true;
+        const userEntities = [new User(), service];
+        userRepository.getUsersById.mockResolvedValue(userEntities);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).toBe(true);
+      });
+    });
+
+    describe('conversation.one2one-creation events', () => {
+      it('adds meta when services are present in the event', async () => {
+        const [serviceMiddleware, {userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, []);
+
+        const service = new User();
+        service.isService = true;
+        const userEntities = [new User(), service];
+        userRepository.getUsersById.mockResolvedValue(userEntities);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).toBe(true);
+      });
+
+      it('does not modify events not containing any service', async () => {
+        const [serviceMiddleware, {userRepository, selfUser}] = buildServiceMiddleware();
+        const event = EventBuilder.buildMemberJoin(conversation, selfUser.qualifiedId, []);
+
+        userRepository.getUsersById.mockResolvedValue([]);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).not.toBeDefined();
+      });
+
+      it('adds meta when services are present in the event with qualified user ids', async () => {
+        const [serviceMiddleware, {userRepository}] = buildServiceMiddleware();
+        const event = EventBuilder.build1to1Creation(conversation);
+
+        const service = new User();
+        service.isService = true;
+        const userEntities = [new User(), service];
+        userRepository.getUsersById.mockResolvedValue(userEntities);
+
+        const decoratedEvent: any = await serviceMiddleware.processEvent(event);
+        expect(decoratedEvent.data.has_service).toBe(true);
+      });
+    });
+  });
+});
diff --git a/src/script/event/preprocessor/ServiceMiddleware.ts b/src/script/event/preprocessor/ServiceMiddleware.ts
index f068f2e8b45..ac6554d3c90 100644
--- a/src/script/event/preprocessor/ServiceMiddleware.ts
+++ b/src/script/event/preprocessor/ServiceMiddleware.ts
@@ -17,71 +17,53 @@
  *
  */
 
-import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
+import {CONVERSATION_EVENT, ConversationMemberJoinEvent} from '@wireapp/api-client/lib/event/';
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
-import {container} from 'tsyringe';
-
-import {QualifiedUserId} from '@wireapp/protocol-messaging';
 
+import {MemberJoinEvent, OneToOneCreationEvent} from 'src/script/conversation/EventBuilder';
+import {User} from 'src/script/entity/User';
 import {getLogger, Logger} from 'Util/Logger';
 import {matchQualifiedIds} from 'Util/QualifiedId';
 
 import type {ConversationRepository} from '../../conversation/ConversationRepository';
-import {LegacyEventRecord} from '../../storage/record/EventRecord';
 import type {UserRepository} from '../../user/UserRepository';
-import {UserState} from '../../user/UserState';
 import {ClientEvent} from '../Client';
+import {EventMiddleware, IncomingEvent} from '../EventProcessor';
 
-interface MemberJoinEvent {
-  user_ids: string[];
-  users: {
-    conversation_role: string;
-    id: string;
-    qualified_id?: QualifiedUserId;
-  }[];
-}
-
-interface One2OneCreationEvent {
-  userIds: QualifiedId[];
-}
-type HandledEvents = MemberJoinEvent | One2OneCreationEvent;
-
-export class ServiceMiddleware {
-  private readonly userRepository: UserRepository;
-  private readonly conversationRepository: ConversationRepository;
+/**
+ * will detect member join event that contain a service and add a flag to it
+ */
+export class ServiceMiddleware implements EventMiddleware {
   private readonly logger: Logger;
 
   constructor(
-    conversationRepository: ConversationRepository,
-    userRepository: UserRepository,
-    private readonly userState = container.resolve(UserState),
+    private readonly conversationRepository: ConversationRepository,
+    private readonly userRepository: UserRepository,
+    private readonly selfUser: User,
   ) {
-    this.userRepository = userRepository;
-    this.conversationRepository = conversationRepository;
     this.logger = getLogger('ServiceMiddleware');
   }
 
-  processEvent(event: LegacyEventRecord<HandledEvents>): Promise<LegacyEventRecord> {
+  processEvent(event: IncomingEvent) {
     switch (event.type) {
       case ClientEvent.CONVERSATION.ONE2ONE_CREATION:
-        return this._process1To1ConversationCreationEvent(event as LegacyEventRecord<One2OneCreationEvent>);
+        return this.process1To1ConversationCreationEvent(event);
 
       case CONVERSATION_EVENT.MEMBER_JOIN:
-        return this._processMemberJoinEvent(event as LegacyEventRecord<MemberJoinEvent>);
+        return this.processMemberJoinEvent(event);
 
       default:
         return Promise.resolve(event);
     }
   }
 
-  private async _processMemberJoinEvent(event: LegacyEventRecord<MemberJoinEvent>) {
+  private async processMemberJoinEvent(event: MemberJoinEvent | ConversationMemberJoinEvent) {
     this.logger.info(`Preprocessing event of type ${event.type}`);
 
     const {conversation: conversationId, qualified_conversation, data: eventData} = event;
     const qualifiedConversation = qualified_conversation || {domain: '', id: conversationId};
     const userQualifiedIds = this.extractQualifiedUserIds(eventData);
-    const selfUser = this.userState.self();
-    const containsSelfUser = userQualifiedIds.find((user: QualifiedId) => matchQualifiedIds(user, selfUser));
+    const containsSelfUser = userQualifiedIds.find((user: QualifiedId) => matchQualifiedIds(user, this.selfUser));
 
     const userIds: QualifiedId[] = containsSelfUser
       ? await this.conversationRepository
@@ -89,30 +71,31 @@ export class ServiceMiddleware {
           .then(conversationEntity => conversationEntity.participating_user_ids())
       : userQualifiedIds;
 
-    const hasService = await this._containsService(userIds);
-    return hasService ? this._decorateWithHasServiceFlag(event) : event;
+    const hasService = await this.containsService(userIds);
+    return hasService ? this.decorateWithHasServiceFlag(event) : event;
   }
 
-  private extractQualifiedUserIds(data: MemberJoinEvent): QualifiedId[] {
-    const userIds = data.users
-      ? data.users.map(user => user.qualified_id || {domain: '', id: user.id})
+  private extractQualifiedUserIds(data: MemberJoinEvent['data'] | ConversationMemberJoinEvent['data']): QualifiedId[] {
+    const users = 'users' in data ? data.users : undefined;
+    const userIds = users
+      ? users.map(user => user.qualified_id || {domain: '', id: user.id})
       : data.user_ids.map(id => ({domain: '', id}));
     return userIds;
   }
 
-  private async _process1To1ConversationCreationEvent(event: LegacyEventRecord<One2OneCreationEvent>) {
+  private async process1To1ConversationCreationEvent(event: OneToOneCreationEvent) {
     this.logger.info(`Preprocessing event of type ${event.type}`);
-    const hasService = await this._containsService(event.data.userIds);
-    return hasService ? this._decorateWithHasServiceFlag(event) : event;
+    const hasService = await this.containsService(event.data.userIds);
+    return hasService ? this.decorateWithHasServiceFlag(event) : event;
   }
 
-  private async _containsService(users: QualifiedId[]) {
+  private async containsService(users: QualifiedId[]) {
     const userEntities = await this.userRepository.getUsersById(users);
     return userEntities.some(userEntity => userEntity.isService);
   }
 
-  private _decorateWithHasServiceFlag(event: LegacyEventRecord) {
+  private decorateWithHasServiceFlag(event: MemberJoinEvent | ConversationMemberJoinEvent | OneToOneCreationEvent) {
     const updatedData = {...event.data, has_service: true};
-    return {...event, data: updatedData};
+    return {...event, data: updatedData} as IncomingEvent;
   }
 }
diff --git a/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.test.ts b/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.test.ts
new file mode 100644
index 00000000000..bbc27636a3e
--- /dev/null
+++ b/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.test.ts
@@ -0,0 +1,401 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation/';
+
+import {generateConversation} from 'test/helper/ConversationGenerator';
+import {generateUser} from 'test/helper/UserGenerator';
+
+import {
+  getFederationDeleteEventUpdates,
+  FederationDeleteResult,
+  getUsersToDeleteFromFederatedConversations,
+  FederationConnectionRemovedResult,
+} from './ConversationFederationUtils';
+
+import {Conversation} from '../../../entity/Conversation';
+
+describe('ConversationFederationUtils', () => {
+  describe('getFederationDeleteEventUpdates', () => {
+    it('correctly categorizes conversations for deletion', () => {
+      const deletedDomain = 'deleted.wire.link';
+
+      const user1 = generateUser();
+      const user2 = generateUser();
+      const userFromDeletedDomain = generateUser({domain: deletedDomain, id: 'test-id'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: 'test.wire.link',
+          },
+        }),
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: 'test.wire.link',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            id: 'test-1',
+            domain: deletedDomain,
+          },
+          users: [userFromDeletedDomain],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: 'test.wire.link',
+          },
+          users: [user2],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: 'test.wire.link',
+          },
+          users: [userFromDeletedDomain],
+        }),
+      ];
+
+      const result: FederationDeleteResult = getFederationDeleteEventUpdates(deletedDomain, conversations);
+
+      expect(result.conversationsToLeave).toHaveLength(0);
+      expect(result.conversationsToDisable).toHaveLength(1);
+      expect(result.conversationsToDeleteUsers).toHaveLength(1);
+
+      expect(result.conversationsToDeleteUsers[0].conversation).toBe(conversations[4]);
+      expect(result.conversationsToDeleteUsers[0].users).toContainEqual(userFromDeletedDomain);
+    });
+
+    it('finds connection requests to delete', () => {
+      const deletedDomain = 'deleted.wire.link';
+
+      const user1 = generateUser();
+      const userFromDeletedDomain = generateUser({domain: deletedDomain, id: 'test-id'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          type: CONVERSATION_TYPE.CONNECT,
+          id: {
+            id: 'test-2',
+            domain: 'wire.link',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.CONNECT,
+          id: {
+            id: 'test-3',
+            domain: deletedDomain,
+          },
+          users: [userFromDeletedDomain],
+        }),
+      ];
+
+      const result: FederationDeleteResult = getFederationDeleteEventUpdates(deletedDomain, conversations);
+
+      expect(result.conversationsToLeave).toHaveLength(0);
+      expect(result.conversationsToDisable).toHaveLength(0);
+      expect(result.conversationsToDeleteUsers).toHaveLength(0);
+      expect(result.connectionRequestsToDelete).toHaveLength(1);
+
+      expect(result.connectionRequestsToDelete[0]).toBe(conversations[1]);
+    });
+
+    it('correctly finds one to one conversations to disable', () => {
+      const deletedDomain = 'deleted.wire.link';
+
+      const user1 = generateUser();
+      const user2 = generateUser();
+      const userFromDeletedDomain = generateUser({domain: deletedDomain, id: 'test-id'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            id: 'test-1',
+            domain: 'wire.link',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            id: 'test-2',
+            domain: 'wire.link',
+          },
+          users: [user2],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            id: 'test-3',
+            domain: deletedDomain,
+          },
+          users: [userFromDeletedDomain],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            id: 'test-4',
+            domain: deletedDomain,
+          },
+          users: [userFromDeletedDomain],
+        }),
+      ];
+
+      const result: FederationDeleteResult = getFederationDeleteEventUpdates(deletedDomain, conversations);
+
+      expect(result.conversationsToLeave).toHaveLength(0);
+      expect(result.conversationsToDisable).toHaveLength(2);
+      expect(result.conversationsToDeleteUsers).toHaveLength(0);
+
+      expect(result.conversationsToDisable[0]).toBe(conversations[2]);
+      expect(result.conversationsToDisable[1]).toBe(conversations[3]);
+    });
+
+    it('correctly handles multiple conversations with the same domain', () => {
+      const deletedDomain = 'deleted.wire.link';
+
+      const user1 = generateUser();
+      const user2 = generateUser({id: 'test-user-id-1', domain: deletedDomain});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            domain: deletedDomain,
+            id: 'test-id-1',
+          },
+        }),
+        generateConversation({
+          id: {
+            domain: deletedDomain,
+            id: 'test-id-2',
+          },
+        }),
+        generateConversation({
+          id: {
+            domain: 'other.wire.link',
+            id: 'test-id-other-1',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          id: {
+            domain: 'other.wire.link',
+            id: 'test-id-other-2',
+          },
+          users: [user2],
+        }),
+      ];
+
+      const result: FederationDeleteResult = getFederationDeleteEventUpdates(deletedDomain, conversations);
+
+      expect(result.conversationsToLeave).toHaveLength(2);
+      expect(result.conversationsToDisable).toHaveLength(0);
+      expect(result.conversationsToDeleteUsers).toHaveLength(1);
+
+      expect(result.conversationsToLeave).toContainEqual(conversations[0]);
+      expect(result.conversationsToLeave).toContainEqual(conversations[1]);
+      expect(result.conversationsToDeleteUsers[0].conversation).toBe(conversations[3]);
+      expect(result.conversationsToDeleteUsers[0].users).toContainEqual(user2);
+    });
+
+    it('handles conversations with no matching criteria', () => {
+      const deletedDomain = 'deleted.wire.link';
+      const user1 = generateUser();
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            domain: 'other.wire.link',
+            id: 'test-id-other-1',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          id: {
+            domain: 'other.wire.link',
+            id: 'test-id-other-1',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          type: CONVERSATION_TYPE.ONE_TO_ONE,
+          id: {
+            domain: 'other.wire.link',
+            id: 'test-id-other-1',
+          },
+          users: [user1],
+        }),
+      ];
+
+      const result: FederationDeleteResult = getFederationDeleteEventUpdates(deletedDomain, conversations);
+
+      expect(result.conversationsToLeave).toHaveLength(0);
+      expect(result.conversationsToDisable).toHaveLength(0);
+      expect(result.conversationsToDeleteUsers).toHaveLength(0);
+    });
+  });
+
+  describe('getUsersToDeleteFromFederatedConversations', () => {
+    it('correctly identifies and categorizes conversations to remove users from', () => {
+      const selfDomain = 'webapp.wire.link';
+      const deletedDomains = ['deleted-1.wire.link', 'deleted-2.wire.link'];
+      const selfUser = generateUser({id: 'self-user-id', domain: selfDomain});
+
+      const user1 = generateUser();
+      const user2 = generateUser();
+      const userFromDeletedDomain1 = generateUser({domain: deletedDomains[0], id: 'userFromDeletedDomain1'});
+      const userFromDeletedDomain2 = generateUser({domain: deletedDomains[1], id: 'userFromDeletedDomain2'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: selfDomain,
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-2',
+            domain: deletedDomains[0],
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-3',
+            domain: deletedDomains[1],
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2],
+        }),
+      ];
+
+      const result: FederationConnectionRemovedResult = getUsersToDeleteFromFederatedConversations(
+        deletedDomains,
+        conversations,
+      );
+
+      expect(result).toHaveLength(3);
+      expect(result[0].usersToRemove[0].domain).toBe(deletedDomains[1]);
+      expect(result[1].usersToRemove[0].domain).toBe(deletedDomains[0]);
+      expect(result[2].usersToRemove).toHaveLength(2);
+    });
+
+    it('correctly identifies and categorizes conversations to remove users from, handling unrelated domains', () => {
+      const selfDomain = 'webapp.wire.link';
+      const unrelatedDomain = 'unrelated.wire.link';
+      const deletedDomains = ['deleted-1.wire.link', 'deleted-2.wire.link'];
+      const selfUser = generateUser({id: 'self-user-id', domain: selfDomain});
+
+      const user1 = generateUser();
+      const user2 = generateUser();
+      const userFromUnrelatedDomain = generateUser({domain: unrelatedDomain, id: 'userFromUnrelatedDomain'});
+      const userFromDeletedDomain1 = generateUser({domain: deletedDomains[0], id: 'userFromDeletedDomain1'});
+      const userFromDeletedDomain2 = generateUser({domain: deletedDomains[1], id: 'userFromDeletedDomain2'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: selfDomain,
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2, userFromUnrelatedDomain],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-2',
+            domain: deletedDomains[0],
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2, userFromUnrelatedDomain],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-3',
+            domain: deletedDomains[1],
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2, userFromUnrelatedDomain],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-3',
+            domain: unrelatedDomain,
+          },
+          users: [selfUser, user1, user2, userFromDeletedDomain1, userFromDeletedDomain2, userFromUnrelatedDomain],
+        }),
+      ];
+
+      const result: FederationConnectionRemovedResult = getUsersToDeleteFromFederatedConversations(
+        deletedDomains,
+        conversations,
+      );
+
+      expect(result).toHaveLength(4);
+      expect(result[0].usersToRemove[0].domain).toBe(deletedDomains[1]);
+      expect(result[1].usersToRemove[0].domain).toBe(deletedDomains[0]);
+      expect(result[2].usersToRemove).toHaveLength(2);
+      expect(result[3].usersToRemove).toHaveLength(2);
+    });
+
+    it('handles conversations with no users to remove due to domain criteria', () => {
+      const deletedDomains = ['deleted-1.wire.link', 'deleted-2.wire.link'];
+
+      const user1 = generateUser();
+      const user2 = generateUser({domain: 'other-domain-1', id: 'user2'});
+
+      const conversations: Conversation[] = [
+        generateConversation({
+          id: {
+            id: 'test-1',
+            domain: 'test-domain-1',
+          },
+          users: [user1],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-2',
+            domain: 'test-domain-2',
+          },
+          users: [user2],
+        }),
+        generateConversation({
+          id: {
+            id: 'test-3',
+            domain: 'test-domain-3',
+          },
+          users: [user1],
+        }),
+      ];
+
+      const result: FederationConnectionRemovedResult = getUsersToDeleteFromFederatedConversations(
+        deletedDomains,
+        conversations,
+      );
+
+      expect(result).toHaveLength(0);
+    });
+  });
+});
diff --git a/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.ts b/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.ts
new file mode 100644
index 00000000000..56f7268923f
--- /dev/null
+++ b/src/script/event/processor/FederationEventProcessor/ConversationFederationUtils.ts
@@ -0,0 +1,115 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {Conversation} from '../../../entity/Conversation';
+import {User} from '../../../entity/User';
+
+export interface FederationDeleteResult {
+  /**
+   * Conversations the self user is part of that are hosted on the deleted domain
+   */
+  conversationsToLeave: Conversation[];
+
+  /**
+   * One to One conversations that must be marked as disabled
+   * and the connection to their user must be deleted
+   */
+  conversationsToDisable: Conversation[];
+
+  /**
+   * Conversations that contain users from the deleted domain
+   */
+  conversationsToDeleteUsers: {conversation: Conversation; users: User[]}[];
+
+  connectionRequestsToDelete: Conversation[];
+}
+
+export function getFederationDeleteEventUpdates(
+  deletedDomain: string,
+  conversations: Conversation[],
+): FederationDeleteResult {
+  const result: FederationDeleteResult = {
+    conversationsToLeave: [],
+    conversationsToDisable: [],
+    conversationsToDeleteUsers: [],
+    connectionRequestsToDelete: [],
+  };
+
+  conversations.forEach(conversation => {
+    const is1to1 = conversation.is1to1();
+    const isConnectionRequest = conversation.isRequest();
+    const firstUserEntity = conversation.firstUserEntity();
+    const allUserEntities = conversation.allUserEntities();
+
+    if (conversation.domain === deletedDomain && !is1to1 && !isConnectionRequest) {
+      result.conversationsToLeave.push(conversation);
+    } else if (isConnectionRequest && firstUserEntity?.qualifiedId.domain === deletedDomain) {
+      result.connectionRequestsToDelete.push(conversation);
+    } else if (is1to1 && firstUserEntity?.qualifiedId.domain === deletedDomain) {
+      result.conversationsToDisable.push(conversation);
+    } else {
+      const usersToDelete = allUserEntities.filter(user => user.domain === deletedDomain);
+      if (usersToDelete.length > 0) {
+        result.conversationsToDeleteUsers.push({conversation, users: usersToDelete});
+      }
+    }
+  });
+
+  return result;
+}
+
+export type FederationConnectionRemovedResult = {conversation: Conversation; usersToRemove: User[]}[];
+
+export function getUsersToDeleteFromFederatedConversations(
+  deletedDomains: string[],
+  conversations: Conversation[],
+): FederationConnectionRemovedResult {
+  const result: FederationConnectionRemovedResult = [];
+
+  const [domainOne, domainTwo] = deletedDomains;
+
+  conversations.forEach(conversation => {
+    if (conversation.domain === domainOne || conversation.domain === domainTwo) {
+      const targetDomain = conversation.domain === domainOne ? domainTwo : domainOne;
+      const usersToDelete = conversation.allUserEntities().filter(user => user.domain === targetDomain);
+
+      if (usersToDelete.length > 0) {
+        result.push({conversation, usersToRemove: usersToDelete});
+      }
+    }
+  });
+
+  conversations.forEach(conversation => {
+    if (deletedDomains.includes(conversation.domain)) {
+      return;
+    }
+
+    const allUserEntities = conversation.allUserEntities();
+    const userDomains = new Set(allUserEntities.map(user => user.qualifiedId.domain));
+
+    if (userDomains.has(domainOne) && userDomains.has(domainTwo)) {
+      const usersToDelete = allUserEntities.filter(user => [domainOne, domainTwo].includes(user.domain));
+      if (usersToDelete.length > 0) {
+        result.push({conversation, usersToRemove: usersToDelete});
+      }
+    }
+  });
+
+  return result;
+}
diff --git a/src/script/event/processor/FederationEventProcessor/FederationEventProcessor.ts b/src/script/event/processor/FederationEventProcessor/FederationEventProcessor.ts
new file mode 100644
index 00000000000..30930899328
--- /dev/null
+++ b/src/script/event/processor/FederationEventProcessor/FederationEventProcessor.ts
@@ -0,0 +1,154 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FEDERATION_EVENT} from '@wireapp/api-client/lib/event';
+import {container} from 'tsyringe';
+import {debounce} from 'underscore';
+
+import {ConversationState} from 'src/script/conversation/ConversationState';
+import {ConversationStatus} from 'src/script/conversation/ConversationStatus';
+import {EventBuilder} from 'src/script/conversation/EventBuilder';
+import {Conversation} from 'src/script/entity/Conversation';
+import {User} from 'src/script/entity/User';
+import {ServerTimeHandler} from 'src/script/time/serverTimeHandler';
+
+import {
+  getUsersToDeleteFromFederatedConversations,
+  getFederationDeleteEventUpdates,
+} from './ConversationFederationUtils';
+
+import {EventProcessor, IncomingEvent} from '../../EventProcessor';
+import {EventRepository} from '../../EventRepository';
+
+export class FederationEventProcessor implements EventProcessor {
+  constructor(
+    private eventRepository: EventRepository,
+    private serverTimeHandler: ServerTimeHandler,
+    private selfUser: User,
+    private conversationState: ConversationState = container.resolve(ConversationState),
+  ) {}
+
+  async processEvent(event: IncomingEvent) {
+    const {type} = event;
+
+    switch (type) {
+      case FEDERATION_EVENT.FEDERATION_DELETE:
+        const {domain: deletedDomain} = event;
+        await this.onFederationDelete(deletedDomain);
+        break;
+
+      case FEDERATION_EVENT.FEDERATION_CONNECTION_REMOVED:
+        const {domains: deletedDomains} = event;
+        await this.onFederationConnectionRemove(deletedDomains);
+        break;
+    }
+  }
+
+  /**
+   * For the `federation.delete` event: (Backend A has stopped federating with us)
+      - receive the event from backend
+      - leave the conversations locally that are owned by the backend A which was deleted.
+      - remove the deleted backend A users locally from our own conversations.
+      - insert system message to the affected conversations about federation termination.
+   * @param deletedDomain the domain that stopped federating
+   */
+  private onFederationDelete = debounce(async (deletedDomain: string) => {
+    const allConversations = this.conversationState
+      .conversations()
+      .filter(conversation => !this.conversationState.isSelfConversation(conversation));
+
+    const {conversationsToDeleteUsers, conversationsToLeave, connectionRequestsToDelete, conversationsToDisable} =
+      getFederationDeleteEventUpdates(deletedDomain, allConversations);
+
+    conversationsToLeave.forEach(async conversation => {
+      await this.insertFederationStopSystemMessage(conversation, [deletedDomain]);
+      await this.removeMembers(conversation, [this.selfUser]);
+    });
+
+    connectionRequestsToDelete.forEach(conversation => {
+      this.conversationState.conversations.remove(conversation);
+    });
+
+    conversationsToDisable.forEach(async conversation => {
+      conversation.status(ConversationStatus.PAST_MEMBER);
+      conversation.firstUserEntity()?.markConnectionAsUnknown();
+      await this.insertFederationStopSystemMessage(conversation, [deletedDomain]);
+    });
+
+    conversationsToDeleteUsers.forEach(async ({conversation, users}) => {
+      await this.insertFederationStopSystemMessage(conversation, [deletedDomain]);
+      await this.removeDeletedFederationUsers(conversation, users);
+    });
+  }, 1000);
+
+  /**
+   * For the `federation.connectionRemoved` event: (Backend A & B stopped federating, user is on C)
+    - receive the event from backend
+    - Identify all conversations that are not owned from A or B domain and that contain users from A and B
+      - remove users from A and B from those conversations
+      - insert system message in those conversations about backend A and B stopping to federate
+    - identify all conversations owned by domain A that contains users from B
+      - remove users from B from those conversations
+      - insert system message in those conversations about backend A and B stopping to federate
+    - Identify all conversations owned by domain B that contains users from A
+      - remove users from A from those conversations
+      - insert system message in those conversations about backend A and B stopping to federate
+   * @param domains The domains that stopped federating with each other
+   */
+  private readonly onFederationConnectionRemove = debounce(async (domains: string[]) => {
+    const allConversations = this.conversationState.conversations();
+
+    const result = getUsersToDeleteFromFederatedConversations(domains, allConversations);
+
+    for (const {conversation, usersToRemove} of result) {
+      await this.insertFederationStopSystemMessage(conversation, domains);
+      await this.removeDeletedFederationUsers(conversation, usersToRemove);
+    }
+  }, 1000);
+
+  private async removeDeletedFederationUsers(conversation: Conversation, users: User[]) {
+    if (users.length === 0) {
+      return;
+    }
+    await this.removeMembers(conversation, users);
+  }
+
+  private async insertFederationStopSystemMessage(conversation: Conversation, domains: string[]) {
+    const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
+    const event = EventBuilder.buildFederationStop(conversation, this.selfUser, domains, currentTimestamp);
+    await this.eventRepository.injectEvent(event, EventRepository.SOURCE.INJECTED);
+  }
+
+  /**
+   * Will inject a `member-leave` that will then trigger the local removal of the user in the conversation
+   * @param conversation the conversation in which we want to remove users
+   * @param users the users to remove from the conversation
+   */
+  private async removeMembers(conversation: Conversation, users: User[]) {
+    const currentTimestamp = this.serverTimeHandler.toServerTimestamp();
+    const event = EventBuilder.buildMemberLeave(
+      conversation,
+      users.map(user => user.qualifiedId),
+      '',
+      currentTimestamp,
+    );
+    // Injecting the event will trigger all the handlers that will then actually remove the users from the conversation
+    await this.eventRepository.injectEvent(event);
+  }
+}
diff --git a/src/script/event/processor/FederationEventProcessor/index.ts b/src/script/event/processor/FederationEventProcessor/index.ts
new file mode 100644
index 00000000000..499d137f670
--- /dev/null
+++ b/src/script/event/processor/FederationEventProcessor/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './FederationEventProcessor';
diff --git a/src/script/extension/GiphyRepository.test.ts b/src/script/extension/GiphyRepository.test.ts
new file mode 100644
index 00000000000..d8ba95a9169
--- /dev/null
+++ b/src/script/extension/GiphyRepository.test.ts
@@ -0,0 +1,206 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {GiphyResult} from '@wireapp/api-client/lib/giphy/GiphyResult';
+import {container} from 'tsyringe';
+
+import {GiphyRepository} from 'src/script/extension/GiphyRepository';
+import {GiphyService} from 'src/script/extension/GiphyService';
+import {APIClient} from 'src/script/service/APIClientSingleton';
+
+const randomFooGiphyResponse = {
+  data: {
+    fixed_height_downsampled_height: '200',
+    fixed_height_downsampled_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/200_d.gif',
+    fixed_height_downsampled_width: '262',
+    fixed_height_small_height: '100',
+    fixed_height_small_still_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100_s.gif',
+    fixed_height_small_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100.gif',
+    fixed_height_small_width: '131',
+    fixed_width_downsampled_height: '153',
+    fixed_width_downsampled_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/200w_d.gif',
+    fixed_width_downsampled_width: '200',
+    fixed_width_small_height: '76',
+    fixed_width_small_still_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100w_s.gif',
+    fixed_width_small_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100w.gif',
+    fixed_width_small_width: '100',
+    id: 'GKLmFicoabZrW',
+    image_frames: '10',
+    image_height: '244',
+    image_mp4_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.mp4',
+    image_original_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.gif',
+    image_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.gif',
+    image_width: '320',
+    type: 'gif',
+    url: 'http://giphy.com/gifs/big-thank-indulging-GKLmFicoabZrW',
+  },
+  meta: {},
+} as unknown as GiphyResult;
+
+const getByIdResponse = {
+  data: {
+    bitly_gif_url: 'http://gph.is/1Q95Wje',
+    bitly_url: 'http://gph.is/1Q95Wje',
+    caption: '',
+    content_url: '',
+    embed_url: 'https://giphy.com/embed/GKLmFicoabZrW',
+    id: 'GKLmFicoabZrW',
+    images: {
+      downsized: {
+        height: '244',
+        size: '514699',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.gif',
+        width: '320',
+      },
+      downsized_large: {
+        height: '0',
+        size: '0',
+        url: '',
+        width: '0',
+      },
+      downsized_still: {
+        height: '244',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy_s.gif',
+        width: '320',
+      },
+      fixed_height: {
+        height: '200',
+        mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.mp4',
+        mp4_size: '178927',
+        size: '0',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.webp',
+        webp_size: '88838',
+        width: '262',
+      },
+      fixed_height_downsampled: {
+        height: '200',
+        size: '149525',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_d.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_d.webp',
+        webp_size: '53016',
+        width: '262',
+      },
+      fixed_height_small: {
+        height: '100',
+        mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.mp4',
+        mp4_size: '66464',
+        size: '0',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.webp',
+        webp_size: '32982',
+        width: '131',
+      },
+      fixed_height_small_still: {
+        height: '100',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100_s.gif',
+        width: '131',
+      },
+      fixed_height_still: {
+        height: '200',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_s.gif',
+        width: '262',
+      },
+      fixed_width: {
+        height: '153',
+        mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.mp4',
+        mp4_size: '120356',
+        size: '0',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.webp',
+        webp_size: '57810',
+        width: '200',
+      },
+      fixed_width_downsampled: {
+        height: '153',
+        size: '227351',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_d.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_d.webp',
+        webp_size: '34448',
+        width: '200',
+      },
+      fixed_width_small: {
+        height: '76',
+        mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.mp4',
+        mp4_size: '46951',
+        size: '0',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.webp',
+        webp_size: '23174',
+        width: '100',
+      },
+      fixed_width_small_still: {
+        height: '76',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w_s.gif',
+        width: '100',
+      },
+      fixed_width_still: {
+        height: '153',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_s.gif',
+        width: '200',
+      },
+      original: {
+        frames: '10',
+        height: '244',
+        mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.mp4',
+        mp4_size: '710329',
+        size: '514699',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.gif',
+        webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.webp',
+        webp_size: '116528',
+        width: '320',
+      },
+      original_still: {
+        height: '244',
+        url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy_s.gif',
+        width: '320',
+      },
+    },
+    import_datetime: '2015-05-02 00:11:31',
+    rating: 'pg',
+    source: 'http://jezebel.com/big-sean-is-indulging-in-some-me-time-thank-you-1701548048',
+    trending_datetime: '2015-05-04 20:01:25',
+    type: 'gif',
+    url: 'https://giphy.com/gifs/big-thank-indulging-GKLmFicoabZrW',
+    username: '',
+  },
+} as unknown as GiphyResult;
+
+describe('Giphy Repository', () => {
+  describe('getRandomGif', () => {
+    it('can receive a random gif', async () => {
+      const apiClient = container.resolve(APIClient);
+
+      const giphyService = new GiphyService(container.resolve(APIClient));
+      const giphyRepository = new GiphyRepository(giphyService);
+
+      jest.spyOn(giphyService, 'getRandom');
+      jest.spyOn(giphyService, 'getById');
+
+      jest.spyOn(apiClient.api.giphy, 'getGiphyRandom').mockResolvedValueOnce(randomFooGiphyResponse);
+      jest.spyOn(apiClient.api.giphy, 'getGiphyById').mockResolvedValueOnce(getByIdResponse);
+
+      const tag = 'foo';
+      await giphyRepository.getRandomGif({tag});
+
+      expect(giphyService.getRandom).toHaveBeenCalledWith(tag);
+      expect(giphyService.getById).toHaveBeenCalledWith(randomFooGiphyResponse.data.id);
+    });
+  });
+});
diff --git a/src/script/externalRoute.ts b/src/script/externalRoute.ts
index d0856f440a6..e391e909bcb 100644
--- a/src/script/externalRoute.ts
+++ b/src/script/externalRoute.ts
@@ -64,7 +64,8 @@ export const getWebsiteUrl = (path: string = '', pkCampaign?: string): string |
   }
   return undefined;
 };
-export const getHelpCenterUrl = (path: (typeof URL_PATH)[keyof typeof URL_PATH]) => {
+
+const getHelpCenterUrl = (path: (typeof URL_PATH)[keyof typeof URL_PATH]) => {
   if (URL.SUPPORT) {
     const helpcenterUrl = `${URL.SUPPORT}${path}`;
     return addLocaleToHelpCenterUrl(URL.SUPPORT ? helpcenterUrl : undefined);
@@ -88,10 +89,8 @@ export const getManageTeamUrl = (utmSource?: string): string => getTeamSettingsU
 export const getCreateTeamUrl = (): string =>
   Config.getConfig().FEATURE.ENABLE_ACCOUNT_REGISTRATION && `${Config.getConfig().URL.TEAMS_BASE}/register/email`;
 export const getDecryptErrorUrl = (): string => getHelpCenterUrl(URL_PATH.DECRYPT_ERROR_1);
-export const getPrivacyHowUrl = (): string => getWebsiteUrl(URL_PATH.PRIVACY_HOW);
 export const getPrivacyUnverifiedUsersUrl = (): string => getHelpCenterUrl(URL_PATH.PRIVACY_UNVERIFIED_USERS);
 export const getPrivacyWhyUrl = (): string => getHelpCenterUrl(URL_PATH.PRIVACY_WHY);
-export const getSupportUsernameUrl = (): string => getWebsiteUrl(URL_PATH.SUPPORT_USERNAME);
 
 export const addLocaleToUrl = (url?: string): string => {
   if (!url) {
diff --git a/src/script/guards/Event.ts b/src/script/guards/Event.ts
index ba2690a69f3..2c71f9081f2 100644
--- a/src/script/guards/Event.ts
+++ b/src/script/guards/Event.ts
@@ -17,5 +17,4 @@
  *
  */
 
-export const isDragEvent = (event: Event): event is DragEvent => 'dataTransfer' in event;
 export const isKeyDownEvent = (event: Event): event is KeyboardEvent => event.type === 'keydown';
diff --git a/bin/translations_upload.ts b/src/script/guards/MediaDevice.ts
old mode 100755
new mode 100644
similarity index 65%
rename from bin/translations_upload.ts
rename to src/script/guards/MediaDevice.ts
index 75bc75b1f54..ce949c26563
--- a/bin/translations_upload.ts
+++ b/src/script/guards/MediaDevice.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2020 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
  *
  */
 
-import path from 'path';
-import {execSync} from 'child_process';
+import {ElectronDesktopCapturerSource} from '../media/MediaDevicesHandler';
 
-const root = path.resolve(__dirname, '..');
-const config = path.join(root, 'crowdin.yaml');
-const identity = path.join(root, 'keys/crowdin.yaml');
-execSync(`crowdin upload sources --config="${config}" --identity="${identity}"`, {stdio: [0, 1]});
+export const isMediaDevice = (
+  device: MediaDeviceInfo | ElectronDesktopCapturerSource | undefined,
+): device is MediaDeviceInfo => {
+  return (device as MediaDeviceInfo)?.deviceId !== undefined;
+};
diff --git a/src/script/guards/Message.ts b/src/script/guards/Message.ts
index 43fbffc1973..6aea925ffe0 100644
--- a/src/script/guards/Message.ts
+++ b/src/script/guards/Message.ts
@@ -17,9 +17,8 @@
  *
  */
 
-import {Draft} from 'Util/DraftStateUtil';
-
 import {ContentMessage} from '../entity/message/ContentMessage';
+import {DeleteMessage} from '../entity/message/DeleteMessage';
 import {MemberMessage} from '../entity/message/MemberMessage';
 import {SuperType} from '../message/SuperType';
 
@@ -31,8 +30,8 @@ export const isReadableMessage = (message: any): message is ContentMessage =>
 export const isContentMessage = (message: any): message is ContentMessage =>
   message && 'super_type' in message && message.super_type === SuperType.CONTENT;
 
+export const isDeleteMessage = (message: any): message is DeleteMessage =>
+  message && 'super_type' in message && message.super_type === SuperType.DELETE;
+
 export const isMemberMessage = (message: any | undefined | null): message is MemberMessage =>
   message && 'super_type' in message && message.super_type === SuperType.MEMBER;
-
-export const isDraftMessageWithReplyId = (message: any | undefined | null): message is Draft =>
-  message && 'reply' in message && 'messageId' in message.reply;
diff --git a/src/script/hooks/useClickOutside.tsx b/src/script/hooks/useClickOutside.tsx
new file mode 100644
index 00000000000..3c38e4debd9
--- /dev/null
+++ b/src/script/hooks/useClickOutside.tsx
@@ -0,0 +1,41 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect, RefObject} from 'react';
+
+export const useClickOutside = (
+  ref: RefObject<Element>,
+  onClick: (e: MouseEvent) => void,
+  exclude?: RefObject<Element>,
+) => {
+  useEffect(() => {
+    const handleClick = (event: MouseEvent) => {
+      const isOutsideClick = ref.current && ref.current !== event.target && !ref.current.contains(event.target as Node);
+      if (isOutsideClick) {
+        const isNonExcludedAreaClicked = exclude && exclude.current && !exclude.current.contains(event.target as Node);
+        if (isNonExcludedAreaClicked || !exclude) {
+          onClick(event);
+        }
+      }
+    };
+    document.addEventListener('click', handleClick);
+
+    return () => document.removeEventListener('click', handleClick);
+  }, [onClick]);
+};
diff --git a/src/script/hooks/usePausableTimeout.ts b/src/script/hooks/usePausableTimeout.ts
deleted file mode 100644
index 9a81ee8341f..00000000000
--- a/src/script/hooks/usePausableTimeout.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {useRef, useEffect, useState} from 'react';
-
-export const usePausableTimeout = (callback: () => void, timer: number) => {
-  const timeoutIdRef = useRef<() => void>();
-  const totalTimeRun = useRef<number>(0);
-  const timeoutId = useRef<number>();
-  const startTime = useRef<number>(new Date().getTime());
-  const [pause, setPause] = useState(true);
-
-  const pauseTimeout = () => setPause(true);
-  const startTimeout = () => setPause(false);
-  const clearTimeout = () => window.clearTimeout(timeoutId.current);
-
-  useEffect(() => {
-    timeoutIdRef.current = callback;
-  }, [callback]);
-
-  useEffect(() => {
-    const fn = () => {
-      timeoutIdRef.current();
-    };
-
-    if (timer !== null) {
-      if (pause == false) {
-        startTime.current = new Date().getTime();
-        timeoutId.current = window.setTimeout(fn, timer - totalTimeRun.current);
-      }
-      if (pause === true) {
-        totalTimeRun.current = new Date().getTime() - startTime.current + totalTimeRun.current;
-        clearTimeout();
-      }
-    }
-  }, [timer, pause]);
-  return {clearTimeout, pauseTimeout, startTimeout};
-};
diff --git a/src/script/hooks/useUserProperty.ts b/src/script/hooks/useUserProperty.ts
new file mode 100644
index 00000000000..236f5aa3553
--- /dev/null
+++ b/src/script/hooks/useUserProperty.ts
@@ -0,0 +1,55 @@
+/*
+ * Wire
+ * Copyright (C) 2021 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect, useCallback, useState} from 'react';
+
+import {amplify} from 'amplify';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+/**
+ * This hook is used to subscribe to a property of the user and update the state of the component when the property changes.
+ * @param getProperty a function that will get the property value when called
+ * @param updateEvent the event that will trigger the update of the property
+ */
+export const useUserPropertyChange = <T>(
+  getProperty: () => T,
+  updateEvent: string,
+  onChange: (value: T) => void,
+): void => {
+  const updateProperty = useCallback(() => {
+    onChange(getProperty());
+  }, [getProperty, onChange]);
+
+  useEffect(() => {
+    const listenedEvents = [updateEvent, WebAppEvents.PROPERTIES.UPDATED];
+    listenedEvents.forEach(event => amplify.subscribe(event, updateProperty));
+    return () => {
+      listenedEvents.forEach(event => amplify.unsubscribe(event, updateProperty));
+    };
+  }, [updateEvent, updateProperty]);
+};
+
+export const useUserPropertyValue = <T>(getProperty: () => T, updateEvent: string): T => {
+  const [propertyValue, setPropertyValue] = useState(getProperty());
+
+  useUserPropertyChange(getProperty, updateEvent, setPropertyValue);
+
+  return propertyValue;
+};
diff --git a/src/script/legal-hold/LegalHoldEvaluator.test.ts b/src/script/legal-hold/LegalHoldEvaluator.test.ts
index 9d3d014a18c..7d334e538e4 100644
--- a/src/script/legal-hold/LegalHoldEvaluator.test.ts
+++ b/src/script/legal-hold/LegalHoldEvaluator.test.ts
@@ -21,13 +21,12 @@ import {GenericMessageType} from '@wireapp/core/lib/conversation';
 
 import {GenericMessage, LegalHoldStatus, Text} from '@wireapp/protocol-messaging';
 
+import {createMessageAddEvent} from 'test/helper/EventGenerator';
 import {createUuid} from 'Util/uuid';
 
 import * as LegalHoldEvaluator from './LegalHoldEvaluator';
 
 import {CryptographyMapper} from '../cryptography/CryptographyMapper';
-import {ClientEvent} from '../event/Client';
-import {StatusType} from '../message/StatusType';
 
 describe('LegalHoldEvaluator', () => {
   describe('hasMessageLegalHoldFlag', () => {
@@ -47,17 +46,7 @@ describe('LegalHoldEvaluator', () => {
         messageId: createUuid(),
       });
 
-      const event: any = {
-        conversation: createUuid(),
-        data: {
-          recipient: 'd4c1a1838944deb1',
-          sender: '494fd7d7613e0358',
-          text: 'something-secure',
-        },
-        from: createUuid(),
-        time: new Date().toISOString(),
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
+      const event = createMessageAddEvent();
 
       const mappedEvent = await cryptographyMapper.mapGenericMessage(legalHoldFlagOn, event);
 
@@ -74,17 +63,7 @@ describe('LegalHoldEvaluator', () => {
         messageId: createUuid(),
       });
 
-      const event: any = {
-        conversation: createUuid(),
-        data: {
-          recipient: 'd4c1a1838944deb1',
-          sender: '494fd7d7613e0358',
-          text: 'something-secure',
-        },
-        from: createUuid(),
-        time: new Date().toISOString(),
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
+      const event = createMessageAddEvent();
 
       const mappedEvent = await cryptographyMapper.mapGenericMessage(legalHoldFlagOff, event);
 
@@ -100,17 +79,7 @@ describe('LegalHoldEvaluator', () => {
         messageId: createUuid(),
       });
 
-      const event: any = {
-        conversation: createUuid(),
-        data: {
-          recipient: 'd4c1a1838944deb1',
-          sender: '494fd7d7613e0358',
-          text: 'something-secure',
-        },
-        from: createUuid(),
-        time: new Date().toISOString(),
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
+      const event = createMessageAddEvent();
 
       const mappedEvent = await cryptographyMapper.mapGenericMessage(legalHoldFlagMissing, event);
 
@@ -132,14 +101,7 @@ describe('LegalHoldEvaluator', () => {
         },
       };
 
-      const mappedEvent: LegalHoldEvaluator.MappedEvent = {
-        conversation: createUuid(),
-        from: createUuid(),
-        id: createUuid(),
-        status: StatusType.SENDING,
-        time: new Date().toISOString(),
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
+      const mappedEvent = createMessageAddEvent();
 
       expect(
         LegalHoldEvaluator.renderLegalHoldMessage({...mappedEvent, ...enabledOnMessage}, LegalHoldStatus.ENABLED),
diff --git a/src/script/main/app.ts b/src/script/main/app.ts
index 33d037cf397..04d930ba563 100644
--- a/src/script/main/app.ts
+++ b/src/script/main/app.ts
@@ -60,6 +60,7 @@ import {ConversationRepository} from '../conversation/ConversationRepository';
 import {ConversationService} from '../conversation/ConversationService';
 import {MessageRepository} from '../conversation/MessageRepository';
 import {CryptographyRepository} from '../cryptography/CryptographyRepository';
+import {User} from '../entity/User';
 import {AccessTokenError} from '../error/AccessTokenError';
 import {AuthError} from '../error/AuthError';
 import {BaseError} from '../error/BaseError';
@@ -69,9 +70,11 @@ import {EventRepository} from '../event/EventRepository';
 import {EventService} from '../event/EventService';
 import {EventServiceNoCompound} from '../event/EventServiceNoCompound';
 import {NotificationService} from '../event/NotificationService';
+import {EventStorageMiddleware} from '../event/preprocessor/EventStorageMiddleware';
 import {QuotedMessageMiddleware} from '../event/preprocessor/QuotedMessageMiddleware';
 import {ReceiptsMiddleware} from '../event/preprocessor/ReceiptsMiddleware';
 import {ServiceMiddleware} from '../event/preprocessor/ServiceMiddleware';
+import {FederationEventProcessor} from '../event/processor/FederationEventProcessor';
 import {GiphyRepository} from '../extension/GiphyRepository';
 import {GiphyService} from '../extension/GiphyService';
 import {getWebsiteUrl} from '../externalRoute';
@@ -87,12 +90,12 @@ import {PropertiesRepository} from '../properties/PropertiesRepository';
 import {PropertiesService} from '../properties/PropertiesService';
 import {SearchRepository} from '../search/SearchRepository';
 import {SearchService} from '../search/SearchService';
+import {SelfRepository} from '../self/SelfRepository';
 import {SelfService} from '../self/SelfService';
 import {APIClient} from '../service/APIClientSingleton';
 import {Core} from '../service/CoreSingleton';
 import {StorageKey, StorageRepository, StorageService} from '../storage';
 import {TeamRepository} from '../team/TeamRepository';
-import {TeamService} from '../team/TeamService';
 import {AppInitStatisticsValue} from '../telemetry/app_init/AppInitStatisticsValue';
 import {AppInitTelemetry} from '../telemetry/app_init/AppInitTelemetry';
 import {AppInitTimingsStep} from '../telemetry/app_init/AppInitTimingsStep';
@@ -102,7 +105,6 @@ import {WindowHandler} from '../ui/WindowHandler';
 import {UserRepository} from '../user/UserRepository';
 import {UserService} from '../user/UserService';
 import {ViewModelRepositories} from '../view_model/MainViewModel';
-import {ThemeViewModel} from '../view_model/ThemeViewModel';
 import {Warnings} from '../view_model/WarningsContainer';
 
 export function doRedirect(signOutReason: SIGN_OUT_REASON) {
@@ -224,7 +226,7 @@ export class App {
     repositories.connection = new ConnectionRepository(new ConnectionService(), repositories.user);
     repositories.event = new EventRepository(this.service.event, this.service.notification, serverTimeHandler);
     repositories.search = new SearchRepository(new SearchService(), repositories.user);
-    repositories.team = new TeamRepository(new TeamService(), repositories.user, repositories.asset);
+    repositories.team = new TeamRepository(repositories.user, repositories.asset);
 
     repositories.message = new MessageRepository(
       /*
@@ -241,6 +243,15 @@ export class App {
       repositories.asset,
     );
 
+    repositories.calling = new CallingRepository(
+      repositories.message,
+      repositories.event,
+      repositories.user,
+      repositories.media.streamHandler,
+      repositories.media.devicesHandler,
+      serverTimeHandler,
+    );
+
     repositories.conversation = new ConversationRepository(
       this.service.conversation,
       repositories.message,
@@ -249,30 +260,16 @@ export class App {
       repositories.team,
       repositories.user,
       repositories.properties,
+      repositories.calling,
       serverTimeHandler,
     );
 
-    repositories.eventTracker = new EventTrackingRepository(repositories.message);
-
-    const serviceMiddleware = new ServiceMiddleware(repositories.conversation, repositories.user);
-    const quotedMessageMiddleware = new QuotedMessageMiddleware(this.service.event);
+    repositories.self = new SelfRepository(selfService, repositories.user, repositories.team, repositories.client);
 
-    const readReceiptMiddleware = new ReceiptsMiddleware(this.service.event, repositories.conversation);
+    repositories.eventTracker = new EventTrackingRepository(repositories.message);
 
-    repositories.event.setEventProcessMiddlewares([
-      serviceMiddleware.processEvent.bind(serviceMiddleware),
-      quotedMessageMiddleware.processEvent.bind(quotedMessageMiddleware),
-      readReceiptMiddleware.processEvent.bind(readReceiptMiddleware),
-    ]);
     repositories.backup = new BackupRepository(new BackupService(), repositories.conversation);
-    repositories.calling = new CallingRepository(
-      repositories.message,
-      repositories.event,
-      repositories.user,
-      repositories.media.streamHandler,
-      repositories.media.devicesHandler,
-      serverTimeHandler,
-    );
+
     repositories.integration = new IntegrationRepository(
       this.service.integration,
       repositories.conversation,
@@ -282,7 +279,6 @@ export class App {
     repositories.notification = new NotificationRepository(repositories.conversation, repositories.permission);
     repositories.preferenceNotification = new PreferenceNotificationRepository(repositories.user['userState'].self);
 
-    repositories.conversation.leaveCall = repositories.calling.leaveCall;
     return repositories;
   }
 
@@ -342,7 +338,6 @@ export class App {
     const platformCssClass = Runtime.isDesktopApp() ? 'platform-electron' : 'platform-web';
     document.body.classList.add(osCssClass, platformCssClass);
 
-    new ThemeViewModel(this.repository.properties);
     const telemetry = new AppInitTelemetry();
 
     try {
@@ -357,6 +352,7 @@ export class App {
         properties: propertiesRepository,
         team: teamRepository,
         user: userRepository,
+        self: selfRepository,
       } = this.repository;
       await checkIndexedDb();
       onProgress(2.5);
@@ -380,15 +376,32 @@ export class App {
       });
 
       const selfUser = await this.initiateSelfUser();
+
       await initializeDataDog(this.config, selfUser.qualifiedId);
 
+      // Setup all event middleware
+      const eventStorageMiddleware = new EventStorageMiddleware(this.service.event, selfUser);
+      const serviceMiddleware = new ServiceMiddleware(conversationRepository, userRepository, selfUser);
+      const quotedMessageMiddleware = new QuotedMessageMiddleware(this.service.event);
+      const readReceiptMiddleware = new ReceiptsMiddleware(this.service.event, conversationRepository, selfUser);
+
+      eventRepository.setEventProcessMiddlewares([
+        serviceMiddleware,
+        quotedMessageMiddleware,
+        readReceiptMiddleware,
+        eventStorageMiddleware,
+      ]);
+      // Setup all the event processors
+      const federationEventProcessor = new FederationEventProcessor(eventRepository, serverTimeHandler, selfUser);
+      eventRepository.setEventProcessors([federationEventProcessor]);
+
       onProgress(5, t('initReceivedSelfUser', selfUser.name()));
       telemetry.timeStep(AppInitTimingsStep.RECEIVED_SELF_USER);
-      const clientEntity = await this._initiateSelfUserClients();
-      callingRepository.initAvs(selfUser, clientEntity().id);
+      const clientEntity = await this._initiateSelfUserClients(selfUser, clientRepository);
+      callingRepository.initAvs(selfUser, clientEntity.id);
       onProgress(7.5, t('initValidatedClient'));
       telemetry.timeStep(AppInitTimingsStep.VALIDATED_CLIENT);
-      telemetry.addStatistic(AppInitStatisticsValue.CLIENT_TYPE, clientEntity().type ?? clientType);
+      telemetry.addStatistic(AppInitStatisticsValue.CLIENT_TYPE, clientEntity.type ?? clientType);
 
       onProgress(10);
       telemetry.timeStep(AppInitTimingsStep.INITIALIZED_CRYPTOGRAPHY);
@@ -406,6 +419,7 @@ export class App {
       if (supportsMLS()) {
         //if mls is supported, we need to initialize the callbacks (they are used when decrypting messages)
         await initMLSCallbacks(this.core, this.repository.conversation);
+        conversationRepository.initMLSConversationRecoveredListener();
       }
 
       if (connections.length) {
@@ -414,32 +428,33 @@ export class App {
 
       onProgress(25, t('initReceivedUserData'));
       telemetry.addStatistic(AppInitStatisticsValue.CONVERSATIONS, conversations.length, 50);
-      this._subscribeToUnloadEvents();
+      this._subscribeToUnloadEvents(selfUser);
 
       await conversationRepository.conversationRoleRepository.loadTeamRoles();
 
+      let totalNotifications = 0;
       await eventRepository.connectWebSocket(this.core, ({done, total}) => {
         const baseMessage = t('initDecryption');
         const extraInfo = this.config.FEATURE.SHOW_LOADING_INFORMATION
           ? ` ${t('initProgress', {number1: done.toString(), number2: total.toString()})}`
           : '';
 
+        totalNotifications = total;
         onProgress(25 + 50 * (done / total), `${baseMessage}${extraInfo}`);
       });
-      const notificationsCount = eventRepository.notificationsTotal;
 
       if (supportsMLS()) {
         // Once all the messages have been processed and the message sending queue freed we can now:
 
+        //add the potential `self` and `team` conversations
+        await registerUninitializedSelfAndTeamConversations(conversations, selfUser, clientEntity.id, this.core);
+
         //join all the mls groups we're member of and have not yet joined (eg. we were not send welcome message)
         await initMLSConversations(conversations, this.core);
-
-        //add the potential `self` and `team` conversations
-        await registerUninitializedSelfAndTeamConversations(conversations, selfUser, clientEntity().id, this.core);
       }
 
       telemetry.timeStep(AppInitTimingsStep.UPDATED_FROM_NOTIFICATIONS);
-      telemetry.addStatistic(AppInitStatisticsValue.NOTIFICATIONS, notificationsCount, 100);
+      telemetry.addStatistic(AppInitStatisticsValue.NOTIFICATIONS, totalNotifications, 100);
 
       eventTrackerRepository.init(propertiesRepository.properties.settings.privacy.telemetry_sharing);
       onProgress(97.5, t('initUpdatedFromNotifications', this.config.BRAND_NAME));
@@ -451,15 +466,18 @@ export class App {
       telemetry.addStatistic(AppInitStatisticsValue.CLIENTS, clientEntities.length);
       telemetry.timeStep(AppInitTimingsStep.APP_PRE_LOADED);
 
-      userRepository['userState'].self().devices(clientEntities);
+      selfUser.devices(clientEntities);
+
       this._handleUrlParams();
       await conversationRepository.updateConversationsOnAppInit();
       await conversationRepository.conversationLabelRepository.loadLabels();
 
+      await selfRepository.initialisePeriodicSelfSupportedProtocolsCheck();
+
       amplify.publish(WebAppEvents.LIFECYCLE.LOADED);
 
       telemetry.timeStep(AppInitTimingsStep.UPDATED_CONVERSATIONS);
-      if (userRepository['userState'].isActivatedAccount()) {
+      if (selfUser.isActivatedAccount()) {
         // start regularly polling the server to check if there is a new version of Wire
         startNewVersionPolling(Environment.version(false), this.update);
       }
@@ -575,14 +593,11 @@ export class App {
    * Initiate the current client of the self user.
    * @returns Resolves with the local client entity
    */
-  private _initiateSelfUserClients() {
-    return this.repository.client
-      .getValidLocalClient()
-      .then(clientObservable => {
-        this.repository.event.currentClient = clientObservable;
-        return this.repository.client.getClientsForSelf();
-      })
-      .then(() => this.repository.client['clientState'].currentClient);
+  private async _initiateSelfUserClients(selfUser: User, clientRepository: ClientRepository) {
+    // Add the local client to the user
+    selfUser.localClient = await clientRepository.getValidLocalClient();
+    await this.repository.client.getClientsForSelf();
+    return selfUser.localClient;
   }
 
   /**
@@ -603,13 +618,13 @@ export class App {
   /**
    * Subscribe to 'beforeunload' to stop calls and disconnect the WebSocket.
    */
-  private _subscribeToUnloadEvents(): void {
+  private _subscribeToUnloadEvents(selfUser: User): void {
     window.addEventListener('unload', () => {
       this.logger.info("'window.onunload' was triggered, so we will disconnect from the backend.");
       this.repository.event.disconnectWebSocket();
       this.repository.calling.destroy();
 
-      if (this.repository.user['userState'].isActivatedAccount()) {
+      if (selfUser.isActivatedAccount()) {
         if (this.service.storage.isTemporaryAndNonPersistent) {
           this.logout(SIGN_OUT_REASON.CLIENT_REMOVED, true);
         } else {
@@ -764,7 +779,7 @@ export class App {
   redirectToLogin(signOutReason: SIGN_OUT_REASON): void {
     this.logger.info(`Redirecting to login after connectivity verification. Reason: ${signOutReason}`);
     const isTemporaryGuestReason = App.CONFIG.SIGN_OUT_REASONS.TEMPORARY_GUEST.includes(signOutReason);
-    const isLeavingGuestRoom = isTemporaryGuestReason && this.repository.user['userState'].isTemporaryGuest();
+    const isLeavingGuestRoom = isTemporaryGuestReason && this.repository.user['userState'].self()?.isTemporaryGuest();
 
     if (isLeavingGuestRoom) {
       const websiteUrl = getWebsiteUrl();
diff --git a/src/script/media/MediaConstraintsHandler.test.ts b/src/script/media/MediaConstraintsHandler.test.ts
index 9467c12cd4a..cde610467e8 100644
--- a/src/script/media/MediaConstraintsHandler.test.ts
+++ b/src/script/media/MediaConstraintsHandler.test.ts
@@ -29,10 +29,10 @@ import {UserState} from '../user/UserState';
 
 describe('MediaConstraintsHandler', () => {
   const createAvailableDevices = (deviceId?: string): CurrentAvailableDeviceId => ({
-    audioInput: ko.pureComputed(() => deviceId ?? 'mic'),
-    audioOutput: ko.pureComputed(() => deviceId ?? 'speaker'),
-    screenInput: ko.pureComputed(() => deviceId ?? 'camera'),
-    videoInput: ko.pureComputed(() => deviceId ?? 'screen1'),
+    audioinput: ko.pureComputed(() => deviceId ?? 'mic'),
+    audiooutput: ko.pureComputed(() => deviceId ?? 'speaker'),
+    screeninput: ko.pureComputed(() => deviceId ?? 'camera'),
+    videoinput: ko.pureComputed(() => deviceId ?? 'screen1'),
   });
 
   const createConstraintsHandler = ({
@@ -43,7 +43,7 @@ describe('MediaConstraintsHandler', () => {
     selfUserId?: string;
   } = {}) => {
     const userState: Partial<UserState> = {
-      self: ko.pureComputed(() => new User(selfUserId, '')),
+      self: ko.observable<User | undefined>(new User(selfUserId, '')),
     };
     return new MediaConstraintsHandler(availableDevices, userState as UserState);
   };
@@ -54,8 +54,8 @@ describe('MediaConstraintsHandler', () => {
       const constraintsHandler = createConstraintsHandler({availableDevices});
       const constraints = constraintsHandler.getMediaStreamConstraints(true, true, false) as any;
 
-      expect(constraints.audio.deviceId.exact).toBe(availableDevices.audioInput());
-      expect(constraints.video.deviceId.exact).toBe(availableDevices.videoInput());
+      expect(constraints.audio.deviceId.exact).toBe(availableDevices.audioinput());
+      expect(constraints.video.deviceId.exact).toBe(availableDevices.videoinput());
     });
 
     it('returns default constraints when current devices are not defined', () => {
diff --git a/src/script/media/MediaConstraintsHandler.ts b/src/script/media/MediaConstraintsHandler.ts
index cfa19260ff0..1db4f53cdd4 100644
--- a/src/script/media/MediaConstraintsHandler.ts
+++ b/src/script/media/MediaConstraintsHandler.ts
@@ -62,37 +62,38 @@ export class MediaConstraintsHandler {
             },
           },
           DISPLAY_MEDIA: {
+            frameRate: 5,
             height: {
               ideal: 1080,
               max: 1080,
             },
           },
           USER_MEDIA: {
-            frameRate: 30,
+            frameRate: 5,
             height: {exact: 720},
             mediaSource: 'screen',
           },
         },
         VIDEO: {
           [VIDEO_QUALITY_MODE.FULL_HD]: {
-            frameRate: 30,
+            frameRate: 15,
             height: 1080,
             width: 1920,
           },
           [VIDEO_QUALITY_MODE.GROUP]: {
-            frameRate: 30,
-            height: 240,
-            width: 320,
+            frameRate: 15,
+            height: 720,
+            width: 1280,
           },
           [VIDEO_QUALITY_MODE.HD]: {
-            frameRate: 30,
+            frameRate: 15,
             height: 720,
             width: 1280,
           },
           [VIDEO_QUALITY_MODE.MOBILE]: {
-            frameRate: 30,
-            height: 480,
-            width: 640,
+            frameRate: 15,
+            height: 720,
+            width: 1280,
           },
           PREFERRED_FACING_MODE: 'user',
         },
@@ -130,8 +131,8 @@ export class MediaConstraintsHandler {
     const mode = isGroup ? VIDEO_QUALITY_MODE.GROUP : VIDEO_QUALITY_MODE.MOBILE;
 
     return {
-      audio: requestAudio ? this.getAudioStreamConstraints(currentDeviceId.audioInput()) : undefined,
-      video: requestVideo ? this.getVideoStreamConstraints(currentDeviceId.videoInput(), mode) : undefined,
+      audio: requestAudio ? this.getAudioStreamConstraints(currentDeviceId.audioinput()) : undefined,
+      video: requestVideo ? this.getVideoStreamConstraints(currentDeviceId.videoinput(), mode) : undefined,
     };
   }
 
@@ -145,7 +146,7 @@ export class MediaConstraintsHandler {
           video: MediaConstraintsHandler.CONFIG.CONSTRAINTS.SCREEN.DESKTOP_CAPTURER,
         };
 
-        const chromeMediaSourceId = this.currentDeviceId.screenInput();
+        const chromeMediaSourceId = this.currentDeviceId.screeninput();
         streamConstraints.video.mandatory = {...streamConstraints.video.mandatory, chromeMediaSourceId};
 
         return streamConstraints;
diff --git a/src/script/media/MediaDevicesHandler.test.ts b/src/script/media/MediaDevicesHandler.test.ts
new file mode 100644
index 00000000000..077bdfa1d26
--- /dev/null
+++ b/src/script/media/MediaDevicesHandler.test.ts
@@ -0,0 +1,275 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+/* eslint-disable */
+import {MediaDeviceType} from './MediaDeviceType';
+import {MediaDevicesHandler} from './MediaDevicesHandler';
+
+/* yarn test:app --specs media/MediaDevicesHandler --nolegacy */
+describe('MediaDevicesHandler', () => {
+  /**
+   * Test data from a real-world scenario:
+   * - Laptop webcam (Lenovo EasyCamera)
+   * - Laptop microphone (Realtek High Definition Audio)
+   * - USB webcam (Logitech HD Webcam C270)
+   * - Bluetooth Headset (Bose QuietComfort)
+   * - Two external monitors (DELL U2713HM)
+   *
+   * In total:
+   * - 2 cameras
+   * - 3 microphones
+   * - 4 speakers
+   */
+  const realWorldTestSetup = {
+    microphones: [
+      {
+        deviceId: 'default',
+        groupId: '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
+        kind: MediaDeviceType.AUDIO_INPUT,
+        label: 'Default - Microphone (HD Webcam C270) (046d:0825)',
+      },
+      {
+        deviceId: 'communications',
+        groupId: 'af428bcaa9e9900c935395d334818e98062dd4e49f3eec6443ba1f0a09461132',
+        kind: MediaDeviceType.AUDIO_INPUT,
+        label: 'Communications - Headset (Bose QuietComfort Hands-Free) (Bluetooth)',
+      },
+      {
+        deviceId: '38b330ab6fd0091eaca57eb00f4231418393d8e71ff8e55fb228dc218773f2bc',
+        groupId: 'af428bcaa9e9900c935395d334818e98062dd4e49f3eec6443ba1f0a09461132',
+        kind: MediaDeviceType.AUDIO_INPUT,
+        label: 'Headset (Bose QuietComfort Hands-Free) (Bluetooth)',
+      },
+      {
+        deviceId: '2a6eb6f699bffde4cb8eb3c0249b398fe6314669ab19b81e6993d232fcfd9b81',
+        groupId: 'ea09ec3f5571b2b2268e8c6f9b98120a8a43bf29f3c38b344a96a23e8382b3f3',
+        kind: MediaDeviceType.AUDIO_INPUT,
+        label: 'Microphonearray (Realtek High Definition Audio)',
+      },
+      {
+        deviceId: 'bf3908cde3bb950469ff594c76d0896beed01a2d670549549327e3f8f33d4f47',
+        groupId: '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
+        kind: MediaDeviceType.AUDIO_INPUT,
+        label: 'Microphone (HD Webcam C270) (046d:0825)',
+      },
+    ],
+    cameras: [
+      {
+        deviceId: '22aed33748e8832f9010ae0ae97b56dfda51ef42784dd354d11e068a14452d91',
+        groupId: 'f07604beddf27565f236bf93eb2ab713db2ec2df03278d8c1eb14f4f1ce841d8',
+        kind: MediaDeviceType.VIDEO_INPUT,
+        label: 'Lenovo EasyCamera (5986:068c)',
+      },
+      {
+        deviceId: 'd52247ce9f08ada2109f11906f00992f27f964ce850793460d34ed7981348c47',
+        groupId: '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
+        kind: MediaDeviceType.VIDEO_INPUT,
+        label: 'Logitech HD Webcam C270 (046d:0825)',
+      },
+    ],
+    speakers: [
+      {
+        deviceId: 'default',
+        groupId: 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'Default - Headset (Bose QuietComfort Stereo) (Bluetooth)',
+      },
+      {
+        deviceId: 'communications',
+        groupId: 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'Communications - Headset (Bose QuietComfort Stereo) (Bluetooth)',
+      },
+      {
+        deviceId: 'bb00aceb5a214799cca4d11f10827d60a3462069cd227f8c7874ef60c1401ef0',
+        groupId: 'd16c859ff680089ca8e155e5ecae18aa2582f0ee4a53d02ca3ab1708fe5fb4d0',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'DELL U2713HM (Intel(R) Display-Audio)',
+      },
+      {
+        deviceId: 'e6bc5cff184fcf11c10a1800c5079c24da038461facd73122e9bc9158afded26',
+        groupId: 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'Headset (Bose QuietComfort Stereo) (Bluetooth)',
+      },
+      {
+        deviceId: 'af7da4f952304dfeec3aa5a77141decb309f3e8a1f8e94834e9ec746205bf049',
+        groupId: 'ea09ec3f5571b2b2268e8c6f9b98120a8a43bf29f3c38b344a96a23e8382b3f3',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'Speaker (Realtek High Definition Audio)',
+      },
+      {
+        deviceId: '2bc694541adf32e336123e5027d991200d939209a13080818132409279b95afb',
+        groupId: '3a7a22368d6425475421fc42cd9052bf3297b53d65e6b7b329f180a9cc90ae99',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'DELL U2713HM (Intel(R) Display-Audio)',
+      },
+      {
+        deviceId: '1c8c3b8d8e33dc9cc2ea9dc3bc5144f717e2bc45d7d52a22a4148830ca44b7f9',
+        groupId: 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
+        kind: MediaDeviceType.AUDIO_OUTPUT,
+        label: 'Headset (Bose QuietComfort Stereo) (Bluetooth)',
+      },
+    ],
+  };
+
+  const fakeWorldTestSetup = {
+    cameras: [
+      {deviceId: 'camera1', kind: MediaDeviceType.VIDEO_INPUT, label: 'Camera 1', groupId: '1'},
+      {deviceId: 'camera2', kind: MediaDeviceType.VIDEO_INPUT, label: 'Camera 2', groupId: '2'},
+    ],
+    speakers: [
+      {deviceId: 'speaker1', kind: MediaDeviceType.AUDIO_OUTPUT, label: 'Speaker 1', groupId: '1'},
+      {deviceId: 'speaker2', kind: MediaDeviceType.AUDIO_OUTPUT, label: 'Speaker 2', groupId: '2'},
+    ],
+    microphones: [
+      {deviceId: 'mic1', kind: MediaDeviceType.AUDIO_INPUT, label: 'Mic 1', groupId: '1'},
+      {deviceId: 'mic2', kind: MediaDeviceType.AUDIO_INPUT, label: 'Mic 2', groupId: '2'},
+    ],
+  };
+
+  describe('refreshMediaDevices', () => {
+    it('filters duplicate microphones and keeps the ones marked with "communications"', () => {
+      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
+        Promise.resolve([
+          {
+            deviceId: 'default',
+            groupId: 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
+            kind: MediaDeviceType.AUDIO_INPUT,
+            label: 'Default - Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
+          },
+          {
+            deviceId: 'communications',
+            groupId: 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
+            kind: MediaDeviceType.AUDIO_INPUT,
+            label: 'Communications - Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
+          },
+          {
+            deviceId: 'c2f7f56ce1d142a4fe13d5bb42e355b7a0ed7de88d1aa93e196ab0b011a183cd',
+            groupId: 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
+            kind: MediaDeviceType.AUDIO_INPUT,
+            label: 'Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
+          },
+        ]),
+      );
+
+      const devicesHandler = new MediaDevicesHandler();
+
+      setTimeout(() => {
+        expect(devicesHandler.availableDevices.audioinput().length).toEqual(1);
+      });
+    });
+
+    it('filters duplicate speakers', () => {
+      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
+        Promise.resolve([
+          ...realWorldTestSetup.cameras,
+          ...realWorldTestSetup.microphones,
+          ...realWorldTestSetup.speakers,
+        ]),
+      );
+
+      const devicesHandler = new MediaDevicesHandler();
+
+      expect(realWorldTestSetup.cameras.length).toEqual(2);
+      expect(realWorldTestSetup.microphones.length).toEqual(5);
+      expect(realWorldTestSetup.speakers.length).toEqual(7);
+
+      setTimeout(() => {
+        expect(devicesHandler.availableDevices.videoinput().length).toEqual(2);
+        expect(devicesHandler.availableDevices.audioinput().length).toEqual(3);
+        expect(devicesHandler.availableDevices.audiooutput().length).toEqual(4);
+      });
+    });
+  });
+
+  describe('constructor', () => {
+    it('loads available devices and listens to input devices changes', done => {
+      const enumerateDevicesSpy = spyOn(navigator.mediaDevices, 'enumerateDevices');
+      enumerateDevicesSpy.and.returnValue(
+        Promise.resolve([
+          ...fakeWorldTestSetup.cameras,
+          ...fakeWorldTestSetup.microphones,
+          ...fakeWorldTestSetup.speakers,
+        ]),
+      );
+
+      const devicesHandler = new MediaDevicesHandler();
+      setTimeout(() => {
+        expect(navigator.mediaDevices.enumerateDevices).toHaveBeenCalledTimes(1);
+        expect(devicesHandler.availableDevices.videoinput()).toEqual(fakeWorldTestSetup.cameras);
+        expect(devicesHandler.availableDevices.audiooutput()).toEqual(fakeWorldTestSetup.speakers);
+
+        const newCameras = [{deviceId: 'newcamera', kind: MediaDeviceType.VIDEO_INPUT}];
+        enumerateDevicesSpy.and.returnValue(Promise.resolve(newCameras));
+        navigator.mediaDevices!.ondevicechange?.(Event.prototype);
+
+        setTimeout(() => {
+          expect(navigator.mediaDevices.enumerateDevices).toHaveBeenCalledTimes(2);
+          expect(devicesHandler.availableDevices.videoinput()).toEqual(newCameras);
+          expect(devicesHandler.availableDevices.audiooutput()).toEqual([]);
+          done();
+        });
+      });
+    });
+  });
+
+  describe('currentAvailableDeviceId', () => {
+    it('only exposes available device', done => {
+      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
+        Promise.resolve([
+          ...fakeWorldTestSetup.cameras,
+          ...fakeWorldTestSetup.microphones,
+          ...fakeWorldTestSetup.speakers,
+        ]),
+      );
+
+      const devicesHandler = new MediaDevicesHandler();
+      setTimeout(() => {
+        devicesHandler.currentDeviceId.videoinput(fakeWorldTestSetup.cameras[0].deviceId);
+
+        expect(devicesHandler.currentAvailableDeviceId.videoinput()).toBe(fakeWorldTestSetup.cameras[0].deviceId);
+
+        devicesHandler.currentDeviceId.videoinput('not-existing-id');
+        expect(devicesHandler.currentAvailableDeviceId.videoinput()).toBe(
+          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.videoinput,
+        );
+
+        devicesHandler.currentDeviceId.audioinput(fakeWorldTestSetup.microphones[0].deviceId);
+
+        expect(devicesHandler.currentAvailableDeviceId.audioinput()).toBe(fakeWorldTestSetup.microphones[0].deviceId);
+
+        devicesHandler.currentDeviceId.audioinput('not-existing-id');
+        expect(devicesHandler.currentAvailableDeviceId.audioinput()).toBe(
+          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.audioinput,
+        );
+
+        devicesHandler.currentDeviceId.audiooutput(fakeWorldTestSetup.speakers[0].deviceId);
+
+        expect(devicesHandler.currentAvailableDeviceId.audiooutput()).toBe(fakeWorldTestSetup.speakers[0].deviceId);
+
+        devicesHandler.currentDeviceId.audiooutput('inexistant-id');
+        expect(devicesHandler.currentAvailableDeviceId.audiooutput()).toBe(
+          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.audiooutput,
+        );
+        done();
+      });
+    });
+  });
+});
diff --git a/src/script/media/MediaDevicesHandler.ts b/src/script/media/MediaDevicesHandler.ts
index e56606ac4b3..ade3ccfc108 100644
--- a/src/script/media/MediaDevicesHandler.ts
+++ b/src/script/media/MediaDevicesHandler.ts
@@ -26,6 +26,8 @@ import {loadValue, storeValue} from 'Util/StorageUtil';
 
 import {MediaDeviceType} from './MediaDeviceType';
 
+import {isMediaDevice} from '../guards/MediaDevice';
+
 declare global {
   interface Window {
     desktopCapturer?: {
@@ -38,17 +40,19 @@ declare global {
   }
 }
 
-export type CurrentAvailableDeviceId = Record<DeviceTypes, ko.PureComputed<string>>;
-export type DeviceSupport = Record<DeviceTypes, ko.PureComputed<boolean>>;
+export type CurrentAvailableDeviceId = Record<MediaDeviceType, ko.PureComputed<string>>;
+export type DeviceSupport = Record<MediaDeviceType, ko.PureComputed<boolean>>;
+export type PreviousDeviceSupport = Partial<Record<MediaDeviceType, number>>;
 
-export enum DeviceTypes {
-  AUDIO_INPUT = 'audioInput',
-  AUDIO_OUTPUT = 'audioOutput',
-  SCREEN_INPUT = 'screenInput',
-  VIDEO_INPUT = 'videoInput',
+export enum FavoriteDeviceTypes {
+  AUDIO_INPUT = 'audioinput-fave',
+  AUDIO_OUTPUT = 'audiooutput-fave',
+  VIDEO_INPUT = 'videoinput-fave',
+  SCREEN_INPUT = 'screeninput-fave',
 }
-export type Devices = Record<DeviceTypes, ko.ObservableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>>;
-export type DeviceIds = Record<DeviceTypes, ko.Observable<string>>;
+
+export type Devices = Record<MediaDeviceType, ko.ObservableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>>;
+export type DeviceIds = Record<MediaDeviceType, ko.Observable<string>>;
 type ElectronDesktopCapturerCallback = (error: Error | null, screenSources: ElectronDesktopCapturerSource[]) => void;
 
 interface ElectronGetSourcesOptions {
@@ -73,15 +77,16 @@ export class MediaDevicesHandler {
   public currentDeviceId: DeviceIds;
   public currentAvailableDeviceId: CurrentAvailableDeviceId;
   public deviceSupport: DeviceSupport;
+  private previousDeviceSupport: PreviousDeviceSupport;
 
   static get CONFIG() {
     return {
       DEFAULT_DEVICE: {
-        audioInput: 'default',
-        audioOutput: 'default',
-        screenInput: 'screen',
-        videoInput: 'default',
-        windowInput: 'window',
+        audioinput: 'default',
+        audiooutput: 'default',
+        screeninput: 'screen',
+        videoinput: 'default',
+        windowinput: 'window',
       },
     };
   }
@@ -93,46 +98,58 @@ export class MediaDevicesHandler {
     this.logger = getLogger('MediaDevicesHandler');
 
     this.availableDevices = {
-      audioInput: ko.observableArray([]),
-      audioOutput: ko.observableArray([]),
-      screenInput: ko.observableArray([]),
-      videoInput: ko.observableArray([]),
+      audioinput: ko.observableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>([]),
+      audiooutput: ko.observableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>([]),
+      screeninput: ko.observableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>([]),
+      videoinput: ko.observableArray<ElectronDesktopCapturerSource | MediaDeviceInfo>([]),
     };
 
     this.currentDeviceId = {
-      audioInput: ko.observable(loadValue(MediaDeviceType.AUDIO_INPUT)),
-      audioOutput: ko.observable(loadValue(MediaDeviceType.AUDIO_OUTPUT)),
-      screenInput: ko.observable(loadValue(MediaDeviceType.SCREEN_INPUT)),
-      videoInput: ko.observable(loadValue(MediaDeviceType.VIDEO_INPUT)),
+      audioinput: ko.observable(loadValue(MediaDeviceType.AUDIO_INPUT) ?? 'default'),
+      audiooutput: ko.observable(loadValue(MediaDeviceType.AUDIO_OUTPUT) ?? 'default'),
+      screeninput: ko.observable(loadValue(MediaDeviceType.SCREEN_INPUT) ?? 'screen'),
+      videoinput: ko.observable(loadValue(MediaDeviceType.VIDEO_INPUT) ?? 'default'),
     };
 
-    const getCurrentAvailableDeviceId = (deviceType: DeviceTypes): string => {
+    const getCurrentAvailableDeviceId = (deviceType: MediaDeviceType): string => {
       const currentDeviceId = this.currentDeviceId[deviceType]();
       if (this.availableDevices[deviceType]().length === 0) {
         return '';
       }
-      const isAvailable = this.availableDevices[deviceType]().find(
-        device =>
-          ((device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id) === currentDeviceId,
-      );
-      if (isAvailable) {
+      const isAvailable = this.availableDevices[deviceType]().find(device => {
+        return (
+          ((device as MediaDeviceInfo).deviceId || (device as ElectronDesktopCapturerSource).id) === currentDeviceId
+        );
+      });
+
+      const favoriteDeviceId = loadValue<String[]>(`${deviceType}-fave`)?.find(id => id === currentDeviceId);
+
+      if (favoriteDeviceId && isAvailable) {
         return currentDeviceId;
       }
-      return MediaDevicesHandler.CONFIG.DEFAULT_DEVICE[deviceType];
+      return isMediaDevice(isAvailable)
+        ? isAvailable.deviceId
+        : isAvailable?.id ?? MediaDevicesHandler.CONFIG.DEFAULT_DEVICE[deviceType];
     };
 
     this.currentAvailableDeviceId = {
-      audioInput: ko.pureComputed(() => getCurrentAvailableDeviceId(DeviceTypes.AUDIO_INPUT)),
-      audioOutput: ko.pureComputed(() => getCurrentAvailableDeviceId(DeviceTypes.AUDIO_OUTPUT)),
-      screenInput: ko.pureComputed(() => getCurrentAvailableDeviceId(DeviceTypes.SCREEN_INPUT)),
-      videoInput: ko.pureComputed(() => getCurrentAvailableDeviceId(DeviceTypes.VIDEO_INPUT)),
+      audioinput: ko.pureComputed(() => getCurrentAvailableDeviceId(MediaDeviceType.AUDIO_INPUT)),
+      audiooutput: ko.pureComputed(() => getCurrentAvailableDeviceId(MediaDeviceType.AUDIO_OUTPUT)),
+      screeninput: ko.pureComputed(() => getCurrentAvailableDeviceId(MediaDeviceType.SCREEN_INPUT)),
+      videoinput: ko.pureComputed(() => getCurrentAvailableDeviceId(MediaDeviceType.VIDEO_INPUT)),
     };
 
     this.deviceSupport = {
-      audioInput: ko.pureComputed(() => !!this.availableDevices.audioInput().length),
-      audioOutput: ko.pureComputed(() => !!this.availableDevices.audioOutput().length),
-      screenInput: ko.pureComputed(() => !!this.availableDevices.screenInput().length),
-      videoInput: ko.pureComputed(() => !!this.availableDevices.videoInput().length),
+      audioinput: ko.pureComputed(() => !!this.availableDevices.audioinput().length),
+      audiooutput: ko.pureComputed(() => !!this.availableDevices.audiooutput().length),
+      screeninput: ko.pureComputed(() => !!this.availableDevices.screeninput().length),
+      videoinput: ko.pureComputed(() => !!this.availableDevices.videoinput().length),
+    };
+
+    this.previousDeviceSupport = {
+      audioinput: this.availableDevices.audioinput().length,
+      audiooutput: this.availableDevices.audiooutput().length,
+      videoinput: this.availableDevices.videoinput().length,
     };
 
     this.initializeMediaDevices();
@@ -160,23 +177,34 @@ export class MediaDevicesHandler {
     };
   }
 
+  private subscribeToDevice(deviceType: MediaDeviceType) {
+    this.currentDeviceId[deviceType].subscribe(mediaDeviceId => {
+      const deviceKey = Object.keys(MediaDeviceType)[
+        Object.values(MediaDeviceType).indexOf(deviceType as MediaDeviceType)
+      ] as keyof typeof MediaDeviceType;
+
+      const faveDevices = loadValue<string[]>(`${deviceType}-fave`) ?? [];
+      const disconnected = (this.previousDeviceSupport[deviceType] ?? 0) > this.availableDevices[deviceType]().length;
+      const newFaveDevices = this.orderFavoriteDevices(mediaDeviceId, faveDevices, disconnected);
+
+      storeValue(MediaDeviceType[deviceKey], mediaDeviceId);
+      storeValue(FavoriteDeviceTypes[deviceKey], newFaveDevices);
+    });
+  }
+
   /**
    * Subscribe to Knockout observables.
    */
   private subscribeToObservables(): void {
-    this.currentDeviceId.audioInput.subscribe(mediaDeviceId => {
-      storeValue(MediaDeviceType.AUDIO_INPUT, mediaDeviceId);
-    });
-
-    this.currentDeviceId.audioOutput.subscribe(mediaDeviceId => {
-      storeValue(MediaDeviceType.AUDIO_OUTPUT, mediaDeviceId);
-    });
-
-    this.currentDeviceId.videoInput.subscribe(mediaDeviceId => {
-      storeValue(MediaDeviceType.VIDEO_INPUT, mediaDeviceId);
+    Object.values(MediaDeviceType).forEach(deviceType => {
+      this.subscribeToDevice(deviceType);
     });
   }
 
+  private orderFavoriteDevices = (mediaDevice: string, favoriteDevices: string[], disconnected: boolean): string[] => {
+    return disconnected ? favoriteDevices : [mediaDevice, ...favoriteDevices.filter(id => id !== mediaDevice)];
+  };
+
   private filterMediaDevices(mediaDevices: MediaDeviceInfo[]): {
     cameras: MediaDeviceInfo[];
     microphones: MediaDeviceInfo[];
@@ -192,7 +220,7 @@ export class MediaDevicesHandler {
      */
     const microphones = mediaDevices.filter(device => device.kind === MediaDeviceType.AUDIO_INPUT);
     const dedupedMicrophones = microphones.reduce<Record<string, MediaDeviceInfo>>((microphoneList, microphone) => {
-      if (!microphoneList.hasOwnProperty(microphone.groupId) || microphone.deviceId === 'communications') {
+      if (!microphoneList.hasOwnProperty(microphone.deviceId) || microphone.deviceId === 'communications') {
         microphoneList[microphone.groupId] = microphone;
       }
       return microphoneList;
@@ -200,7 +228,7 @@ export class MediaDevicesHandler {
 
     const speakers = mediaDevices.filter(device => device.kind === MediaDeviceType.AUDIO_OUTPUT);
     const dedupedSpeakers = speakers.reduce<Record<string, MediaDeviceInfo>>((speakerList, speaker) => {
-      if (!speakerList.hasOwnProperty(speaker.groupId) || speaker.deviceId === 'communications') {
+      if (!speakerList.hasOwnProperty(speaker.deviceId) || speaker.deviceId === 'communications') {
         speakerList[speaker.groupId] = speaker;
       }
       return speakerList;
@@ -218,11 +246,22 @@ export class MediaDevicesHandler {
    * @returns Resolves with all MediaDevices when the list has been updated
    */
   refreshMediaDevices(): Promise<MediaDeviceInfo[]> {
-    const setDevices = (type: DeviceTypes, devices: MediaDeviceInfo[]): void => {
+    const setDevices = (type: MediaDeviceType, devices: MediaDeviceInfo[]): void => {
       this.availableDevices[type](devices);
       const currentId = this.currentDeviceId[type];
-      if (!devices.some(d => d.deviceId === currentId())) {
-        currentId(devices[0]?.deviceId);
+      const firstDeviceId = devices[0]?.deviceId;
+
+      const favorites = loadValue<string[]>(`${type}-fave`) ?? [];
+      const favoriteDeviceId = favorites.map(favorite => devices.some(d => d.deviceId === favorite));
+
+      if (favoriteDeviceId.some(favorite => favorite)) {
+        const faveIndex = favoriteDeviceId.findIndex(favorite => favorite);
+        currentId(
+          devices.find(d => d.deviceId === favorites[faveIndex] || d.deviceId === favorites[faveIndex])?.deviceId ??
+            firstDeviceId,
+        );
+      } else if (!devices.some(d => d.deviceId === currentId())) {
+        currentId(firstDeviceId);
       }
     };
 
@@ -238,10 +277,14 @@ export class MediaDevicesHandler {
         if (mediaDevices) {
           const filteredDevices = this.filterMediaDevices(mediaDevices);
 
-          setDevices(DeviceTypes.AUDIO_INPUT, filteredDevices.microphones);
-          setDevices(DeviceTypes.AUDIO_OUTPUT, filteredDevices.speakers);
-          setDevices(DeviceTypes.VIDEO_INPUT, filteredDevices.cameras);
-
+          setDevices(MediaDeviceType.AUDIO_INPUT, filteredDevices.microphones);
+          setDevices(MediaDeviceType.AUDIO_OUTPUT, filteredDevices.speakers);
+          setDevices(MediaDeviceType.VIDEO_INPUT, filteredDevices.cameras);
+          this.previousDeviceSupport = {
+            audioinput: filteredDevices.microphones.length,
+            audiooutput: filteredDevices.speakers.length,
+            videoinput: filteredDevices.cameras.length,
+          };
           return mediaDevices;
         }
 
@@ -260,8 +303,8 @@ export class MediaDevicesHandler {
         width: 312,
       },
       types: [
-        MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.screenInput,
-        MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.windowInput,
+        MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.screeninput,
+        MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.windowinput,
       ],
     };
 
@@ -279,17 +322,18 @@ export class MediaDevicesHandler {
         return window.desktopCapturer.getSources(options);
       }
       // Electron <= 4
-      return new Promise((resolve, reject) =>
-        window.desktopCapturer?.getSources(options, (error, screenSources) =>
-          error ? reject(error) : resolve(screenSources),
-        ),
+      return new Promise(
+        (resolve, reject) =>
+          window.desktopCapturer?.getSources(options, (error, screenSources) =>
+            error ? reject(error) : resolve(screenSources),
+          ),
       );
     };
 
     const screenSources = await getSourcesWrapper(options);
 
     this.logger.info(`Detected '${screenSources.length}' sources for screen sharing from Electron`);
-    this.availableDevices.screenInput(screenSources);
+    this.availableDevices.screeninput(screenSources);
     return screenSources;
   }
 
@@ -297,8 +341,8 @@ export class MediaDevicesHandler {
    * Remove all known MediaDevices from the lists.
    */
   private removeAllDevices(): void {
-    this.availableDevices.audioInput.removeAll();
-    this.availableDevices.audioOutput.removeAll();
-    this.availableDevices.videoInput.removeAll();
+    this.availableDevices.audioinput.removeAll();
+    this.availableDevices.audiooutput.removeAll();
+    this.availableDevices.videoinput.removeAll();
   }
 }
diff --git a/test/unit_tests/media/MediaStreamHandlerSpec.js b/src/script/media/MediaStreamHandler.test.ts
similarity index 89%
rename from test/unit_tests/media/MediaStreamHandlerSpec.js
rename to src/script/media/MediaStreamHandler.test.ts
index dcdc22cbf53..187e7b7273e 100644
--- a/test/unit_tests/media/MediaStreamHandlerSpec.js
+++ b/src/script/media/MediaStreamHandler.test.ts
@@ -21,18 +21,24 @@ import {MediaConstraintsHandler} from 'src/script/media/MediaConstraintsHandler'
 import {MediaStreamHandler} from 'src/script/media/MediaStreamHandler';
 import {PermissionRepository} from 'src/script/permission/PermissionRepository';
 
+import {CurrentAvailableDeviceId} from './MediaDevicesHandler';
+
+import {UserState} from '../user/UserState';
+
 describe('MediaStreamHandler', () => {
-  let streamHandler;
+  let streamHandler: MediaStreamHandler;
 
   const availableDevices = {
-    audioInput: () => {},
-    audioOutput: () => {},
-    screenInput: () => {},
-    videoInput: () => {},
-  };
+    audioinput: () => {},
+    audiooutput: () => {},
+    screeninput: () => {},
+    videoinput: () => {},
+  } as CurrentAvailableDeviceId;
+
   const userState = {
     self: () => ({id: ''}),
-  };
+  } as UserState;
+
   const mediaConstraintsHandler = new MediaConstraintsHandler(availableDevices, userState);
 
   beforeEach(() => {
diff --git a/src/script/message/SuperType.ts b/src/script/message/SuperType.ts
index fe1f11584b0..0a7f6504372 100644
--- a/src/script/message/SuperType.ts
+++ b/src/script/message/SuperType.ts
@@ -25,6 +25,7 @@ export enum SuperType {
   CONTENT = 'normal',
   DELETE = 'delete',
   DEVICE = 'device',
+  FEDERATION_STOP = 'federation-stop',
   FILE_TYPE_RESTRICTED = 'file-type-restricted',
   LEGALHOLD = 'legal-hold',
   LOCATION = 'location',
diff --git a/src/script/message/SystemMessageType.ts b/src/script/message/SystemMessageType.ts
index adea6201ce9..8a638ea4148 100644
--- a/src/script/message/SystemMessageType.ts
+++ b/src/script/message/SystemMessageType.ts
@@ -33,4 +33,5 @@ export enum SystemMessageType {
   MEMBER_JOIN = 'join',
   MEMBER_LEAVE = 'leave',
   NORMAL = 'normal',
+  MLS_CONVERSATION_RECOVERED = 'mls-conversation-recovered',
 }
diff --git a/src/script/mls/MLSConversations.test.ts b/src/script/mls/MLSConversations.test.ts
index f558e40f014..2ef3bbdacaa 100644
--- a/src/script/mls/MLSConversations.test.ts
+++ b/src/script/mls/MLSConversations.test.ts
@@ -24,7 +24,6 @@ import {randomUUID} from 'crypto';
 import {Account} from '@wireapp/core';
 
 import {initMLSConversations, registerUninitializedSelfAndTeamConversations} from './MLSConversations';
-import {useMLSConversationState} from './mlsConversationState';
 
 import {Conversation} from '../entity/Conversation';
 import {User} from '../entity/User';
@@ -50,12 +49,9 @@ function createConversations(
 }
 
 describe('MLSConversations', () => {
-  beforeEach(() => {
-    jest.spyOn(useMLSConversationState.getState(), 'sendExternalToPendingJoin').mockReturnValue(undefined);
-  });
-
   describe('initMLSConversations', () => {
-    it('joins all the MLS conversations', async () => {
+    it('joins all the unestablished MLS groups', async () => {
+      const core = new Account();
       const nbProteusConversations = 5 + Math.ceil(Math.random() * 10);
       const nbMLSConversations = 5 + Math.ceil(Math.random() * 10);
 
@@ -63,26 +59,30 @@ describe('MLSConversations', () => {
       const mlsConversations = createConversations(nbMLSConversations);
       const conversations = [...proteusConversations, ...mlsConversations];
 
-      await initMLSConversations(conversations, new Account());
+      jest.spyOn(core.service!.conversation, 'mlsGroupExistsLocally').mockResolvedValue(false);
+      jest.spyOn(core.service!.conversation, 'joinByExternalCommit');
 
-      expect(useMLSConversationState.getState().sendExternalToPendingJoin).toHaveBeenCalledWith(
-        mlsConversations,
-        expect.any(Function),
-        expect.any(Function),
-      );
+      await initMLSConversations(conversations, core);
+
+      for (const conversation of mlsConversations) {
+        expect(core.service?.conversation.joinByExternalCommit).toHaveBeenCalledWith(conversation.qualifiedId);
+      }
     });
 
-    it('schedules key renewal intervals for all the mls groups', async () => {
+    it('schedules key renewal intervals for all already established mls groups', async () => {
       const core = new Account();
       const nbMLSConversations = 5 + Math.ceil(Math.random() * 10);
 
       const mlsConversations = createConversations(nbMLSConversations);
 
+      jest.spyOn(core.service!.conversation!, 'mlsGroupExistsLocally').mockResolvedValue(true);
+      jest.spyOn(core.service!.mls!, 'scheduleKeyMaterialRenewal');
+
       await initMLSConversations(mlsConversations, core);
 
-      expect(core.service!.mls!.schedulePeriodicKeyMaterialRenewals).toHaveBeenCalledWith(
-        mlsConversations.map(c => c.groupId),
-      );
+      for (const conversation of mlsConversations) {
+        expect(core.service!.mls!.scheduleKeyMaterialRenewal).toHaveBeenCalledWith(conversation.groupId);
+      }
     });
 
     it('register all uninitiated conversations', async () => {
@@ -100,7 +100,7 @@ describe('MLSConversations', () => {
 
       await registerUninitializedSelfAndTeamConversations(conversations, new User(), 'client-1', core);
 
-      expect(core.service!.mls.registerConversation).toHaveBeenCalledTimes(2);
+      expect(core.service!.mls!.registerConversation).toHaveBeenCalledTimes(2);
     });
 
     it('does not register self and team conversation that have epoch > 0', async () => {
@@ -122,7 +122,7 @@ describe('MLSConversations', () => {
 
       await initMLSConversations(conversations, core);
 
-      expect(core.service!.mls.registerConversation).toHaveBeenCalledTimes(0);
+      expect(core.service!.mls!.registerConversation).toHaveBeenCalledTimes(0);
     });
   });
 });
diff --git a/src/script/mls/MLSConversations.ts b/src/script/mls/MLSConversations.ts
index 704ad3bb7c9..c3c1f26fd4d 100644
--- a/src/script/mls/MLSConversations.ts
+++ b/src/script/mls/MLSConversations.ts
@@ -22,8 +22,6 @@ import {KeyPackageClaimUser} from '@wireapp/core/lib/conversation';
 
 import {Account} from '@wireapp/core';
 
-import {useMLSConversationState} from './mlsConversationState';
-
 import {ConversationRepository} from '../conversation/ConversationRepository';
 import {
   isMLSConversation,
@@ -46,15 +44,28 @@ type MLSConversationRepository = Pick<
  * @param core - the instance of the core
  */
 export async function initMLSConversations(conversations: Conversation[], core: Account): Promise<void> {
-  const mlsService = core.service?.mls;
-  if (!mlsService) {
-    throw new Error('MLS service not available');
+  const {mls: mlsService, conversation: conversationService} = core.service || {};
+  if (!mlsService || !conversationService) {
+    throw new Error('MLS or Conversation service is not available!');
   }
 
   const mlsConversations = conversations.filter(isMLSConversation);
-  await joinNewConversations(mlsConversations, core);
 
-  return mlsService.schedulePeriodicKeyMaterialRenewals(mlsConversations.map(({groupId}) => groupId));
+  await Promise.allSettled(
+    mlsConversations.map(async mlsConversation => {
+      const {groupId, qualifiedId} = mlsConversation;
+
+      const doesMLSGroupExist = await conversationService.mlsGroupExistsLocally(groupId);
+
+      //if group is already established, we just schedule periodic key material updates
+      if (doesMLSGroupExist) {
+        return mlsService.scheduleKeyMaterialRenewal(groupId);
+      }
+
+      //otherwise we should try joining via external commit
+      return conversationService.joinByExternalCommit(qualifiedId);
+    }),
+  );
 }
 
 /**
@@ -79,21 +90,6 @@ export async function initMLSCallbacks(
   });
 }
 
-/**
- * Will join all the conversation that the current user is part of but that are not joined by the current user's device
- *
- * @param conversations - all the conversations that the user is part of
- * @param core - the instance of the core
- */
-async function joinNewConversations(conversations: MLSConversation[], core: Account): Promise<void> {
-  // We send external proposal to all the MLS conversations that are in an unknown state (not established nor pendingWelcome)
-  await useMLSConversationState.getState().sendExternalToPendingJoin(
-    conversations,
-    groupId => core.service!.conversation.isMLSConversationEstablished(groupId),
-    conversationId => core.service!.conversation.joinByExternalCommit(conversationId),
-  );
-}
-
 /**
  * Will register self and team MLS conversations.
  * The self conversation and the team conversation are special conversations created by noone and, thus, need to be manually created by the first device that detects them
@@ -107,6 +103,12 @@ export async function registerUninitializedSelfAndTeamConversations(
   selfClientId: string,
   core: Account,
 ): Promise<void> {
+  const mlsService = core.service?.mls;
+
+  if (!mlsService) {
+    throw new Error('MLS service not available');
+  }
+
   const uninitializedConversations = conversations.filter(
     (conversation): conversation is MLSConversation =>
       isMLSConversation(conversation) &&
@@ -116,7 +118,7 @@ export async function registerUninitializedSelfAndTeamConversations(
 
   await Promise.all(
     uninitializedConversations.map(conversation =>
-      core.service?.mls.registerConversation(conversation.groupId, [selfUser.qualifiedId], {
+      mlsService.registerConversation(conversation.groupId, [selfUser.qualifiedId], {
         user: selfUser,
         client: selfClientId,
       }),
diff --git a/src/script/mls/MLSMigration/migrationStatus.ts b/src/script/mls/MLSMigration/migrationStatus.ts
new file mode 100644
index 00000000000..fbd2546bf3a
--- /dev/null
+++ b/src/script/mls/MLSMigration/migrationStatus.ts
@@ -0,0 +1,68 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FeatureMLSMigration, FeatureStatus} from '@wireapp/api-client/lib/team';
+
+const hasMigrationStartTimeArrived = (mlsMigrationFeature: FeatureMLSMigration): boolean => {
+  if (mlsMigrationFeature.status === FeatureStatus.DISABLED) {
+    return false;
+  }
+
+  const startDateISO = mlsMigrationFeature.config.startTime;
+  const startTime = startDateISO ? Date.parse(startDateISO) : Infinity;
+
+  return Date.now() >= startTime;
+};
+
+const hasMigrationFinaliseRegardlessAfterDateArrived = (mlsMigrationFeature: FeatureMLSMigration): boolean => {
+  if (mlsMigrationFeature.status === FeatureStatus.DISABLED) {
+    return false;
+  }
+
+  const finaliseDateISO = mlsMigrationFeature.config.finaliseRegardlessAfter;
+  const finaliseTime = finaliseDateISO ? Date.parse(finaliseDateISO) : Infinity;
+
+  return Date.now() >= finaliseTime;
+};
+
+export enum MLSMigrationStatus {
+  DISABLED = 'DISABLED', //migration feature is disabled
+  NOT_STARTED = 'NOT_STARTED', //migration feature is enabled but startTime has not arrived
+  ONGOING = 'ONGOING', //migration feature is enabled and startTime has arrived, but finaliseRegardlessAfter has not arrived
+  FINALISED = 'FINALISED', //migration feature is enabled and finaliseRegardlessAfter has arrived
+}
+
+export const getMLSMigrationStatus = (mlsMigrationFeature?: FeatureMLSMigration): MLSMigrationStatus => {
+  if (!mlsMigrationFeature || mlsMigrationFeature.status === FeatureStatus.DISABLED) {
+    return MLSMigrationStatus.DISABLED;
+  }
+
+  const hasMigrationStarted = hasMigrationStartTimeArrived(mlsMigrationFeature);
+  const hasMigrationEnded = hasMigrationFinaliseRegardlessAfterDateArrived(mlsMigrationFeature);
+
+  if (hasMigrationStarted && !hasMigrationEnded) {
+    return MLSMigrationStatus.ONGOING;
+  }
+
+  if (hasMigrationEnded) {
+    return MLSMigrationStatus.FINALISED;
+  }
+
+  return MLSMigrationStatus.NOT_STARTED;
+};
diff --git a/src/script/mls/index.ts b/src/script/mls/index.ts
index 674d64da769..f0ac9579493 100644
--- a/src/script/mls/index.ts
+++ b/src/script/mls/index.ts
@@ -18,4 +18,3 @@
  */
 
 export * from './MLSConversations';
-export * from './mlsConversationState';
diff --git a/src/script/mls/isMLSSupportedByEnvironment.ts b/src/script/mls/isMLSSupportedByEnvironment.ts
new file mode 100644
index 00000000000..4a2df21e2db
--- /dev/null
+++ b/src/script/mls/isMLSSupportedByEnvironment.ts
@@ -0,0 +1,50 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {container} from 'tsyringe';
+
+import {supportsMLS} from 'Util/util';
+
+import {APIClient} from '../service/APIClientSingleton';
+
+/**
+ * Will check if MLS is supported by client (whether MLS feature is enabled and secret store is supported) and backend (whether used api version supports MLS and backend removal key is present).
+ */
+export const isMLSSupportedByEnvironment = async () => {
+  const isMLSSupportedByClient = supportsMLS();
+
+  if (!isMLSSupportedByClient) {
+    return false;
+  }
+
+  const apiClient = container.resolve(APIClient);
+  const isMLSEnabledOnBackend = apiClient.backendFeatures.supportsMLS;
+
+  if (!isMLSEnabledOnBackend) {
+    return false;
+  }
+
+  let isBackendRemovalKeyPresent = false;
+  try {
+    const backendRemovalKey = (await apiClient.api.client.getPublicKeys()).removal;
+    isBackendRemovalKeyPresent = !!backendRemovalKey;
+  } catch {}
+
+  return isBackendRemovalKeyPresent;
+};
diff --git a/src/script/mls/mlsConversationState/conversationStateStorage.ts b/src/script/mls/mlsConversationState/conversationStateStorage.ts
deleted file mode 100644
index 8a80d7cdbc7..00000000000
--- a/src/script/mls/mlsConversationState/conversationStateStorage.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {getStorage} from 'Util/localStorage';
-
-import {MLSConversationState} from './mlsConversationState';
-
-const storageKey = 'mlsConversationsState';
-const storage = getStorage();
-
-export const loadState = (): MLSConversationState => {
-  const storedState = storage?.getItem(storageKey);
-  if (!storedState) {
-    return {
-      established: new Set(),
-      pendingWelcome: new Set(),
-    };
-  }
-  const parsedState = JSON.parse(storedState);
-  return {
-    established: new Set(parsedState.established),
-    pendingWelcome: new Set(parsedState.pendingWelcome),
-  };
-};
-
-export const saveState = ({established, pendingWelcome}: MLSConversationState) => {
-  storage?.setItem(storageKey, JSON.stringify({established: [...established], pendingWelcome: [...pendingWelcome]}));
-};
diff --git a/src/script/mls/mlsConversationState/mlsConversationState.test.ts b/src/script/mls/mlsConversationState/mlsConversationState.test.ts
deleted file mode 100644
index 8f325a5c7e1..00000000000
--- a/src/script/mls/mlsConversationState/mlsConversationState.test.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
-
-import {createUuid} from 'Util/uuid';
-
-import {useMLSConversationState} from './mlsConversationState';
-
-import {Conversation} from '../../entity/Conversation';
-
-describe('mlsPendingStateUtil', () => {
-  const createConversation = (protocol: ConversationProtocol) => {
-    const conversation = new Conversation(createUuid(), '', protocol);
-    if (protocol === ConversationProtocol.MLS) {
-      conversation.groupId = createUuid();
-    }
-    return conversation;
-  };
-  const createConversations = (
-    nb: number,
-  ): {
-    nbMlsConversations: number;
-    nbProteusConversations: number;
-    conversations: Conversation[];
-  } => {
-    const result = {conversations: [] as Conversation[], nbMlsConversations: 0, nbProteusConversations: 0};
-
-    for (let i = 0; i < nb; i++) {
-      const isMsl = Math.random() >= 0.5;
-      const conversation = createConversation(isMsl ? ConversationProtocol.MLS : ConversationProtocol.PROTEUS);
-      if (isMsl) {
-        result.nbMlsConversations++;
-      } else {
-        result.nbProteusConversations++;
-      }
-      result.conversations.push(conversation);
-    }
-    return result;
-  };
-
-  beforeEach(() => {
-    localStorage.clear();
-  });
-
-  it('load initial state from localStorage when imported', async () => {
-    const conversationId = 'conversation-id';
-    useMLSConversationState.getState().markAsEstablished(conversationId);
-
-    const loadedMlsConversationState = await import('./mlsConversationState');
-
-    expect(loadedMlsConversationState.useMLSConversationState.getState().isEstablished(conversationId)).toBeTruthy();
-  });
-
-  it('sends external proposal to mls conversations that the device is not part of', async () => {
-    const {conversations, nbMlsConversations} = createConversations(100);
-    const sendExternalProposal = jest.fn();
-    await useMLSConversationState
-      .getState()
-      .sendExternalToPendingJoin(conversations, () => Promise.resolve(false), sendExternalProposal);
-
-    expect(sendExternalProposal).toHaveBeenCalledTimes(nbMlsConversations);
-
-    const sendExternalProposal2 = jest.fn();
-    await useMLSConversationState
-      .getState()
-      .sendExternalToPendingJoin(conversations, () => Promise.resolve(false), sendExternalProposal2);
-    expect(sendExternalProposal2).not.toHaveBeenCalled();
-  });
-
-  it('marks conversation as established if they are already known', async () => {
-    const conversations = [
-      createConversation(ConversationProtocol.MLS),
-      createConversation(ConversationProtocol.MLS),
-      createConversation(ConversationProtocol.MLS),
-    ];
-    const sendExternalProposal = jest.fn();
-    const currentSize = useMLSConversationState.getState().established.size;
-    await useMLSConversationState
-      .getState()
-      .sendExternalToPendingJoin(conversations, () => Promise.resolve(true), sendExternalProposal);
-
-    expect(sendExternalProposal).not.toHaveBeenCalled();
-    expect(useMLSConversationState.getState().established.size).toBe(currentSize + conversations.length);
-  });
-
-  it('sends external proposal only to conversations that are not pending and not established', async () => {
-    const conversations = [
-      createConversation(ConversationProtocol.MLS),
-      createConversation(ConversationProtocol.MLS),
-      createConversation(ConversationProtocol.MLS),
-      createConversation(ConversationProtocol.PROTEUS),
-    ];
-
-    useMLSConversationState.getState().markAsEstablished(conversations[1].groupId!);
-    useMLSConversationState.getState().markAsPendingWelcome(conversations[2].groupId!);
-
-    const sendExternalProposal = jest.fn();
-    await useMLSConversationState
-      .getState()
-      .sendExternalToPendingJoin(conversations, () => Promise.resolve(false), sendExternalProposal);
-
-    expect(sendExternalProposal).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/src/script/mls/mlsConversationState/mlsConversationState.ts b/src/script/mls/mlsConversationState/mlsConversationState.ts
deleted file mode 100644
index 43f1f833a22..00000000000
--- a/src/script/mls/mlsConversationState/mlsConversationState.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {QualifiedId} from '@wireapp/api-client/lib/user';
-import {create} from 'zustand';
-
-import {loadState, saveState} from './conversationStateStorage';
-
-import {Conversation} from '../../entity/Conversation';
-
-export interface MLSConversationState {
-  /** list of conversations that are fully joined */
-  established: Set<string>;
-  /** list of conversations that are waiting for a welcome */
-  pendingWelcome: Set<string>;
-}
-
-const initialState = loadState();
-
-type StoreState = MLSConversationState & {
-  isEstablished: (groupId: string) => boolean;
-  isPendingWelcome: (groupId: string) => boolean;
-  filterEstablishedConversations: (conversations: Conversation[]) => Conversation[];
-  markAsEstablished: (groupId: string) => void;
-  markAsPendingWelcome: (groupId: string) => void;
-  wipeConversationState: (groupId: string) => void;
-  /**
-   * Will send external proposal for all the conversations that are not pendingWelcome or established
-   * @param conversations The conversations that we want to process (only the mls conversations will be considered)
-   * @param sendExternalProposal Callback that will be called with every conversation that needs an external proposal
-   */
-  sendExternalToPendingJoin(
-    conversations: Conversation[],
-    isEstablishedConversation: (groupId: string) => Promise<boolean>,
-    sendExternalProposal: (conversationId: QualifiedId) => Promise<unknown>,
-  ): Promise<void>;
-};
-
-export const useMLSConversationState = create<StoreState>((set, get) => {
-  return {
-    established: initialState.established,
-    filterEstablishedConversations: conversations =>
-      conversations.filter(conversation => !conversation.groupId || get().isEstablished(conversation.groupId)),
-
-    isEstablished: groupId => get().established.has(groupId),
-
-    isPendingWelcome: groupId => get().pendingWelcome.has(groupId),
-
-    markAsEstablished: groupId =>
-      set(state => {
-        const established = new Set(state.established);
-        established.add(groupId);
-
-        const pendingWelcome = new Set(state.pendingWelcome);
-        pendingWelcome.delete(groupId);
-
-        return {
-          established,
-          pendingWelcome,
-        };
-      }),
-
-    markAsPendingWelcome: groupId =>
-      set(state => {
-        const pendingWelcome = new Set(state.pendingWelcome);
-        pendingWelcome.add(groupId);
-        return {
-          ...state,
-          pendingWelcome,
-        };
-      }),
-
-    pendingWelcome: initialState.pendingWelcome,
-
-    async sendExternalToPendingJoin(conversations, isAlreadyEstablished, sendExternalCommit): Promise<void> {
-      const currentState = get();
-      const conversationsToJoin: {groupId: string; conversationId: QualifiedId}[] = [];
-      const pendingConversations: string[] = [];
-      const alreadyEstablishedConversations: string[] = [];
-
-      for (const conversation of conversations) {
-        const groupId = conversation.groupId;
-        if (!conversation.isUsingMLSProtocol || !groupId) {
-          continue;
-        }
-        if (!currentState.isEstablished(groupId) && !currentState.isPendingWelcome(groupId)) {
-          if (await isAlreadyEstablished(groupId)) {
-            // check is the conversation is not actually already established
-            alreadyEstablishedConversations.push(groupId);
-          } else {
-            conversationsToJoin.push({conversationId: conversation.qualifiedId, groupId});
-          }
-        }
-      }
-
-      await Promise.all(
-        conversationsToJoin.map(async ({conversationId, groupId}) => {
-          try {
-            await sendExternalCommit(conversationId);
-            alreadyEstablishedConversations.push(groupId);
-          } catch {
-            pendingConversations.push(groupId);
-          }
-        }),
-      );
-
-      set({
-        ...currentState,
-        established: new Set([...currentState.established, ...alreadyEstablishedConversations]),
-        pendingWelcome: new Set([...currentState.pendingWelcome, ...pendingConversations]),
-      });
-    },
-
-    wipeConversationState: groupId =>
-      set(state => {
-        const established = new Set(state.established);
-        established.delete(groupId);
-        const pendingWelcome = new Set(state.pendingWelcome);
-        pendingWelcome.delete(groupId);
-        return {
-          ...state,
-          established,
-          pendingWelcome,
-        };
-      }),
-  };
-});
-
-useMLSConversationState.subscribe(saveState);
diff --git a/src/script/notification/NotificationRepository.test.ts b/src/script/notification/NotificationRepository.test.ts
index 970e17e9060..5380a4c88ae 100644
--- a/src/script/notification/NotificationRepository.test.ts
+++ b/src/script/notification/NotificationRepository.test.ts
@@ -93,6 +93,8 @@ describe('NotificationRepository', () => {
   let verifyNotificationEphemeral: (...args: any[]) => void;
   let verifyNotificationObfuscated: (...args: any[]) => void;
   let verifyNotificationSystem: (...args: any[]) => void;
+  let createTruncatedTitle: (name: string, conversationName: string) => string;
+  let calculateTitleLength: (sectionString: string) => number;
 
   let notification_content: any;
   const contentViewModelState: any = {};
@@ -108,7 +110,7 @@ describe('NotificationRepository', () => {
     selfUserEntity.isMe = true;
     selfUserEntity.inTeam(true);
     conversation.selfUser(selfUserEntity);
-    userState.users([selfUserEntity]);
+    userState.self(selfUserEntity);
 
     // Notification
     const title = conversation.display_name();
@@ -123,7 +125,7 @@ describe('NotificationRepository', () => {
         tag: conversation.id,
       },
       timeout: NotificationRepository.CONFIG.TIMEOUT,
-      title: truncate(title, NotificationRepository.CONFIG.TITLE_LENGTH, false),
+      title: truncate(title, NotificationRepository.CONFIG.TITLE_MAX_LENGTH, false),
     };
 
     // Mocks
@@ -143,6 +145,24 @@ describe('NotificationRepository', () => {
 
     const showNotificationSpy = jest.spyOn(notificationRepository as any, 'showNotification');
 
+    calculateTitleLength = sectionString => {
+      const defaultSectionLength = NotificationRepository.CONFIG.TITLE_LENGTH;
+      const length = defaultSectionLength - sectionString.length + defaultSectionLength;
+
+      return length > defaultSectionLength ? length : defaultSectionLength;
+    };
+
+    createTruncatedTitle = (name, conversationName) => {
+      const titleLength = NotificationRepository.CONFIG.TITLE_MAX_LENGTH;
+
+      const titleText = `${truncate(name, calculateTitleLength(conversationName), false)} in ${truncate(
+        conversationName,
+        calculateTitleLength(name),
+        false,
+      )}`;
+      return truncate(titleText, titleLength, false);
+    };
+
     verifyNotification = (_conversation, _message, _expected_body) => {
       return notificationRepository.notify(_message, undefined, _conversation).then(() => {
         expect(showNotificationSpy).toHaveBeenCalledTimes(1);
@@ -153,10 +173,7 @@ describe('NotificationRepository', () => {
         notification_content.trigger = trigger;
 
         if (_conversation.isGroup()) {
-          const titleLength = NotificationRepository.CONFIG.TITLE_LENGTH;
-          const titleText = `${_message.user().name()} in ${_conversation.display_name()}`;
-
-          notification_content.title = truncate(titleText, titleLength, false);
+          notification_content.title = createTruncatedTitle(_message.user().name(), _conversation.display_name());
         } else {
           notification_content.title = 'Name not available';
         }
@@ -192,11 +209,8 @@ describe('NotificationRepository', () => {
 
         const obfuscateMessage = _setting === NotificationPreference.OBFUSCATE_MESSAGE;
         if (obfuscateMessage) {
-          const titleLength = NotificationRepository.CONFIG.TITLE_LENGTH;
-          const titleText = `${message.user().name()} in ${conversation.display_name()}`;
-
           notification_content.options.body = t('notificationObfuscated');
-          notification_content.title = truncate(titleText, titleLength, false);
+          notification_content.title = createTruncatedTitle(_message.user().name(), _conversation.display_name());
         } else {
           notification_content.options.body = t('notificationObfuscated');
           notification_content.title = t('notificationObfuscatedTitle');
@@ -542,10 +556,7 @@ describe('NotificationRepository', () => {
 
   describe('shows a well-formed group notification', () => {
     beforeEach(() => {
-      const titleLength = NotificationRepository.CONFIG.TITLE_LENGTH;
-      const titleText = `${message.user().name()} in ${conversation.display_name()}`;
-
-      notification_content.title = truncate(titleText, titleLength, false);
+      notification_content.title = createTruncatedTitle(user.name(), conversation.display_name());
     });
 
     it('if a group is created', () => {
@@ -561,9 +572,8 @@ describe('NotificationRepository', () => {
     });
 
     it('if a group is renamed', () => {
-      const renameMessage = new RenameMessage();
+      const renameMessage = new RenameMessage('Lorem Ipsum Conversation');
       renameMessage.user(user);
-      (renameMessage as any).name = 'Lorem Ipsum Conversation';
 
       const expected_body = `${user.name()} renamed the conversation to ${renameMessage.name}`;
       expect(expected_body).toBeDefined();
@@ -603,11 +613,7 @@ describe('NotificationRepository', () => {
     describe('if people are added', () => {
       beforeEach(() => {
         memberMessage.type = CONVERSATION_EVENT.MEMBER_JOIN;
-
-        const titleLength = NotificationRepository.CONFIG.TITLE_LENGTH;
-        const titleText = `${memberMessage.user().name()} in ${conversation.display_name()}`;
-
-        notification_content.title = truncate(titleText, titleLength, false);
+        notification_content.title = createTruncatedTitle(user.name(), conversation.display_name());
       });
 
       it('with one user being added to the conversation', () => {
@@ -641,10 +647,8 @@ describe('NotificationRepository', () => {
     describe('if people are removed', () => {
       beforeEach(() => {
         memberMessage.type = CONVERSATION_EVENT.MEMBER_LEAVE;
-        const titleLength = NotificationRepository.CONFIG.TITLE_LENGTH;
-        const titleText = `${memberMessage.user().name()} in ${conversation.display_name()}`;
 
-        notification_content.title = truncate(titleText, titleLength, false);
+        notification_content.title = createTruncatedTitle(user.name(), conversation.display_name());
       });
 
       it('with one user being removed from the conversation', () => {
diff --git a/src/script/notification/NotificationRepository.ts b/src/script/notification/NotificationRepository.ts
index 340775869aa..3a458127636 100644
--- a/src/script/notification/NotificationRepository.ts
+++ b/src/script/notification/NotificationRepository.ts
@@ -108,12 +108,13 @@ export class NotificationRepository {
       BODY_LENGTH: 80,
       ICON_URL: '/image/logo/notification.png',
       TIMEOUT: TIME_IN_MILLIS.SECOND * 5,
-      TITLE_LENGTH: 38,
+      TITLE_LENGTH: 17,
+      TITLE_MAX_LENGTH: 38,
     };
   }
 
   static get EVENTS_TO_NOTIFY(): SuperType[] {
-    return [SuperType.CALL, SuperType.CONTENT, SuperType.MEMBER, SuperType.PING, SuperType.REACTION, SuperType.SYSTEM];
+    return [SuperType.CALL, SuperType.CONTENT, SuperType.MEMBER, SuperType.PING, SuperType.SYSTEM];
   }
 
   /**
@@ -494,7 +495,7 @@ export class NotificationRepository {
         return createBodyMessageTimerUpdate();
       }
       case SystemMessageType.CONVERSATION_DELETE: {
-        return (messageEntity as DeleteConversationMessage).caption();
+        return (messageEntity as DeleteConversationMessage).caption;
       }
     }
   }
@@ -610,6 +611,16 @@ export class NotificationRepository {
     return this.getConversationId(connectionEntity, conversationEntity)?.id || '';
   }
 
+  /**
+   Calculate the length of the opposite title section string and return the extra length
+  */
+  private calculatedTitleLength = (sectionString: string) => {
+    const maxSectionLength = NotificationRepository.CONFIG.TITLE_LENGTH;
+    const length = maxSectionLength - sectionString.length + maxSectionLength;
+
+    return length > maxSectionLength ? length : maxSectionLength;
+  };
+
   /**
    * Creates the notification title.
    *
@@ -619,14 +630,22 @@ export class NotificationRepository {
     const conversationName = conversationEntity && conversationEntity.display_name();
     const userEntity = messageEntity.user();
 
+    const truncatedConversationName = truncate(
+      conversationName ?? '',
+      this.calculatedTitleLength(userEntity.name()),
+      false,
+    );
+
+    const truncatedName = truncate(userEntity.name(), this.calculatedTitleLength(conversationName ?? ''), false);
+
     let title;
     if (conversationName) {
       title = conversationEntity.isGroup()
-        ? t('notificationTitleGroup', {conversation: conversationName, user: userEntity.name()}, {}, true)
+        ? t('notificationTitleGroup', {conversation: truncatedConversationName, user: truncatedName}, {}, true)
         : conversationName;
     }
 
-    return truncate(title || userEntity.name(), NotificationRepository.CONFIG.TITLE_LENGTH, false);
+    return truncate(title ?? truncatedName, NotificationRepository.CONFIG.TITLE_MAX_LENGTH, false);
   }
 
   /**
@@ -636,7 +655,7 @@ export class NotificationRepository {
    */
   private createTitleObfuscated(): string {
     const obfuscatedTitle = t('notificationObfuscatedTitle');
-    return truncate(obfuscatedTitle, NotificationRepository.CONFIG.TITLE_LENGTH, false);
+    return truncate(obfuscatedTitle, NotificationRepository.CONFIG.TITLE_MAX_LENGTH, false);
   }
 
   /**
diff --git a/src/script/page/AppLock/AppLock.tsx b/src/script/page/AppLock/AppLock.tsx
index 5bc78ae8932..1dbaae0b393 100644
--- a/src/script/page/AppLock/AppLock.tsx
+++ b/src/script/page/AppLock/AppLock.tsx
@@ -211,7 +211,7 @@ const AppLock: React.FC<AppLockProps> = ({
     const target = event.target as HTMLFormElement & {password: HTMLInputElement};
     try {
       setIsLoading(true);
-      const currentClientId = clientState.currentClient().id;
+      const currentClientId = clientState.currentClient.id;
       await clientRepository.clientService.deleteClient(currentClientId, target.password.value);
       appLockRepository.removeCode();
       amplify.publish(WebAppEvents.LIFECYCLE.SIGN_OUT, SIGN_OUT_REASON.USER_REQUESTED, true);
diff --git a/src/script/page/AppMain.tsx b/src/script/page/AppMain.tsx
index 37294ac181c..fc240735dbb 100644
--- a/src/script/page/AppMain.tsx
+++ b/src/script/page/AppMain.tsx
@@ -36,13 +36,15 @@ import {showUserModal, UserModal} from 'Components/Modals/UserModal';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 
 import {AppLock} from './AppLock';
+import {FeatureConfigChangeHandler} from './components/FeatureConfigChange/FeatureConfigChangeHandler/FeatureConfigChangeHandler';
+import {FeatureConfigChangeNotifier} from './components/FeatureConfigChange/FeatureConfigChangeNotifier';
+import {WindowTitleUpdater} from './components/WindowTitleUpdater';
 import {LeftSidebar} from './LeftSidebar';
 import {MainContent} from './MainContent';
 import {PanelEntity, PanelState, RightSidebar} from './RightSidebar';
 import {RootProvider} from './RootProvider';
 import {useAppMainState, ViewType} from './state';
 import {useAppState, ContentState} from './useAppState';
-import {useWindowTitle} from './useWindowTitle';
 
 import {ConversationState} from '../conversation/ConversationState';
 import {User} from '../entity/User';
@@ -58,7 +60,7 @@ import {WarningsContainer} from '../view_model/WarningsContainer/WarningsContain
 
 export type RightSidebarParams = {
   entity: PanelEntity | null;
-  showLikes?: boolean;
+  showReactions?: boolean;
   highlighted?: User[];
 };
 
@@ -83,22 +85,19 @@ const AppMain: FC<AppMainProps> = ({
     throw new Error('API Context has not been set');
   }
 
-  const {contentState} = useAppState();
+  const contentState = useAppState(state => state.contentState);
 
   const {repository: repositories} = app;
 
-  const {accent_id, availability: userAvailability} = useKoSubscribableChildren(selfUser, [
-    'accent_id',
-    'availability',
-  ]);
+  const {
+    accent_id,
+    availability: userAvailability,
+    isActivatedAccount,
+  } = useKoSubscribableChildren(selfUser, ['accent_id', 'availability', 'isActivatedAccount']);
 
   const teamState = container.resolve(TeamState);
   const userState = container.resolve(UserState);
 
-  useWindowTitle();
-
-  const {isActivatedAccount} = useKoSubscribableChildren(userState, ['isActivatedAccount']);
-
   const {
     history,
     entity: currentEntity,
@@ -114,11 +113,9 @@ const AppMain: FC<AppMainProps> = ({
 
     if (isDifferentId || isDifferentState) {
       goTo(panelState, params);
-
-      return;
+    } else {
+      closeRightSidebar();
     }
-
-    closeRightSidebar();
   };
 
   // To be changed when design chooses a breakpoint, the conditional can be integrated to the ui-kit directly
@@ -216,6 +213,7 @@ const AppMain: FC<AppMainProps> = ({
       data-uie-name="status-webapp"
       data-uie-value="is-loaded"
     >
+      <WindowTitleUpdater />
       <RootProvider value={mainView}>
         <ErrorBoundary FallbackComponent={ErrorFallback}>
           <div id="app" className="app">
@@ -239,6 +237,7 @@ const AppMain: FC<AppMainProps> = ({
                 actionsViewModel={mainView.actions}
                 isFederated={mainView.isFederated}
                 teamState={teamState}
+                selfUser={selfUser}
                 userState={userState}
               />
             )}
@@ -246,6 +245,8 @@ const AppMain: FC<AppMainProps> = ({
 
           <AppLock clientRepository={repositories.client} />
           <WarningsContainer onRefresh={app.refresh} />
+          <FeatureConfigChangeNotifier selfUserId={selfUser.id} teamState={teamState} />
+          <FeatureConfigChangeHandler teamState={teamState} />
 
           <CallingContainer
             multitasking={mainView.multitasking}
@@ -264,7 +265,7 @@ const AppMain: FC<AppMainProps> = ({
           />
 
           {/*The order of these elements matter to show proper modals stack upon each other*/}
-          <UserModal userRepository={repositories.user} />
+          <UserModal selfUser={selfUser} userRepository={repositories.user} />
           <PrimaryModalComponent />
           <GroupCreationModal userState={userState} teamState={teamState} />
         </ErrorBoundary>
diff --git a/src/script/page/LeftSidebar/LeftSidebar.tsx b/src/script/page/LeftSidebar/LeftSidebar.tsx
index c313e4e0228..3e0bdd685a2 100644
--- a/src/script/page/LeftSidebar/LeftSidebar.tsx
+++ b/src/script/page/LeftSidebar/LeftSidebar.tsx
@@ -51,19 +51,15 @@ const Animated: React.FC<{children: React.ReactNode}> = ({children, ...rest}) =>
 const LeftSidebar: React.FC<LeftSidebarProps> = ({listViewModel, selfUser, isActivatedAccount}) => {
   const {conversationRepository, propertiesRepository} = listViewModel;
   const repositories = listViewModel.contentViewModel.repositories;
-  const {listState} = useAppState();
+  const listState = useAppState(state => state.listState);
 
   const switchList = (list: ListState) => listViewModel.switchList(list);
 
   const goHome = () =>
-    selfUser.isTemporaryGuest()
-      ? listViewModel.switchList(ListState.TEMPORARY_GUEST)
-      : listViewModel.switchList(ListState.CONVERSATIONS);
+    selfUser.isTemporaryGuest() ? switchList(ListState.TEMPORARY_GUEST) : switchList(ListState.CONVERSATIONS);
 
   useEffect(() => {
-    amplify.subscribe(WebAppEvents.SHORTCUT.START, () => {
-      listViewModel.switchList(ListState.START_UI);
-    });
+    amplify.subscribe(WebAppEvents.SHORTCUT.START, () => switchList(ListState.START_UI));
   }, []);
 
   return (
@@ -118,6 +114,7 @@ const LeftSidebar: React.FC<LeftSidebarProps> = ({listViewModel, selfUser, isAct
                 mainViewModel={listViewModel.mainViewModel}
                 userRepository={repositories.user}
                 isFederated={listViewModel.isFederated}
+                selfUser={selfUser}
               />
             )}
           </>
diff --git a/src/script/page/LeftSidebar/panels/Archive.tsx b/src/script/page/LeftSidebar/panels/Archive.tsx
index 683cc07b84c..dc530fa3904 100644
--- a/src/script/page/LeftSidebar/panels/Archive.tsx
+++ b/src/script/page/LeftSidebar/panels/Archive.tsx
@@ -56,8 +56,6 @@ const Archive = ({
   ]);
 
   const onClickConversation = async (conversation: Conversation) => {
-    await conversationRepository.unarchiveConversation(conversation, true, 'opened conversation from archive');
-    onClose();
     amplify.publish(WebAppEvents.CONVERSATION.SHOW, conversation, {});
   };
 
@@ -68,6 +66,7 @@ const Archive = ({
 
   const {currentFocus, handleKeyDown, resetConversationFocus} = useConversationFocus(conversations);
 
+  const isActiveConversation = (conversation: Conversation) => conversationState.isActiveConversation(conversation);
   return (
     <ListWrapper id="archive" header={t('archiveHeader')} onClose={onClose}>
       <h2 className="visually-hidden">{t('archiveHeader')}</h2>
@@ -85,6 +84,7 @@ const Archive = ({
             conversation={conversation}
             onJoinCall={answerCall}
             showJoinButton={false}
+            isSelected={isActiveConversation}
           />
         ))}
       </ul>
diff --git a/src/script/page/LeftSidebar/panels/Conversations/ConversationsList.tsx b/src/script/page/LeftSidebar/panels/Conversations/ConversationsList.tsx
index 0d6c6f7e47c..9fd4e6df2b9 100644
--- a/src/script/page/LeftSidebar/panels/Conversations/ConversationsList.tsx
+++ b/src/script/page/LeftSidebar/panels/Conversations/ConversationsList.tsx
@@ -69,7 +69,7 @@ export const ConversationsList = ({
   resetConversationFocus,
   handleArrowKeyDown,
 }: ConversationsListProps) => {
-  const {contentState} = useAppState();
+  const contentState = useAppState(state => state.contentState);
 
   const {joinableCalls} = useKoSubscribableChildren(callState, ['joinableCalls']);
 
diff --git a/src/script/page/LeftSidebar/panels/Preferences.tsx b/src/script/page/LeftSidebar/panels/Preferences.tsx
index 85020f700dc..5013586cd0c 100644
--- a/src/script/page/LeftSidebar/panels/Preferences.tsx
+++ b/src/script/page/LeftSidebar/panels/Preferences.tsx
@@ -120,7 +120,7 @@ const Preferences: React.FC<PreferencesProps> = ({
   preferenceNotificationRepository,
   onClose,
 }) => {
-  const {contentState} = useAppState();
+  const contentState = useAppState(state => state.contentState);
 
   useEffect(() => {
     // Update local team
diff --git a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
index a7a7fa354e4..7f75a6a7bcf 100644
--- a/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
+++ b/src/script/page/LeftSidebar/panels/StartUI/PeopleTab.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useEffect, useRef, useState} from 'react';
+import {useEffect, useRef, useState} from 'react';
 
 import {BackendErrorLabel} from '@wireapp/api-client/lib/http';
 import {amplify} from 'amplify';
@@ -53,7 +53,7 @@ import {UserState} from '../../../../user/UserState';
 
 export type SearchResultsData = {contacts: User[]; groups: Conversation[]; others: User[]};
 
-export const PeopleTab: React.FC<{
+interface PeopleTabProps {
   canCreateGroupConversation: boolean;
   canCreateGuestRoom: boolean;
   canInviteTeamMembers: boolean;
@@ -72,13 +72,17 @@ export const PeopleTab: React.FC<{
   teamState: TeamState;
   userRepository: UserRepository;
   userState: UserState;
-}> = ({
+  selfUser: User;
+}
+
+export const PeopleTab = ({
   searchQuery,
   isTeam,
   isFederated,
   teamRepository,
   teamState,
   userState,
+  selfUser,
   canInviteTeamMembers,
   canSearchUnconnectedUsers,
   canCreateGroupConversation,
@@ -91,7 +95,7 @@ export const PeopleTab: React.FC<{
   onClickConversation,
   onClickUser,
   onSearchResults,
-}) => {
+}: PeopleTabProps) => {
   const logger = getLogger('PeopleSearch');
   const [topPeople, setTopPeople] = useState<User[]>([]);
   const teamSize = teamState.teamSize();
@@ -99,6 +103,8 @@ export const PeopleTab: React.FC<{
   const currentSearchQuery = useRef('');
 
   const {connectedUsers} = useKoSubscribableChildren(conversationState, ['connectedUsers']);
+  const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
+
   const getLocalUsers = (unfiltered?: boolean) => {
     if (!canSearchUnconnectedUsers) {
       return connectedUsers;
@@ -130,7 +136,7 @@ export const PeopleTab: React.FC<{
     searchResults: SearchResultsData,
     query: string,
   ): Promise<SearchResultsData> => {
-    const selfTeamId = userState.self().teamId;
+    const selfTeamId = selfUser.teamId;
     const [contacts, others] = partition(remoteUsers, user => user.teamId === selfTeamId);
     const nonExternalContacts = await teamRepository.filterExternals(contacts);
     return {
@@ -199,7 +205,7 @@ export const PeopleTab: React.FC<{
           const userEntities = await searchRepository.searchByName(query, isHandle);
           const localUserIds = localSearchResults.contacts.map(({id}) => id);
           const onlyRemoteUsers = userEntities.filter(user => !localUserIds.includes(user.id));
-          const results = userState.self().inTeam()
+          const results = inTeam
             ? await organizeTeamSearchResults(onlyRemoteUsers, localSearchResults, query)
             : {...localSearchResults, others: onlyRemoteUsers};
 
@@ -353,6 +359,7 @@ export const PeopleTab: React.FC<{
                 conversationRepository={conversationRepository}
                 mode={UserlistMode.COMPACT}
                 users={results.contacts}
+                selfUser={selfUser}
               />
             </div>
           </div>
@@ -380,6 +387,7 @@ export const PeopleTab: React.FC<{
                 onClick={onClickUser}
                 mode={UserlistMode.OTHERS}
                 conversationRepository={conversationRepository}
+                selfUser={selfUser}
               />
             </div>
           </div>
diff --git a/src/script/page/LeftSidebar/panels/StartUI/StartUI.tsx b/src/script/page/LeftSidebar/panels/StartUI/StartUI.tsx
index e71f0445d6a..3a242743117 100644
--- a/src/script/page/LeftSidebar/panels/StartUI/StartUI.tsx
+++ b/src/script/page/LeftSidebar/panels/StartUI/StartUI.tsx
@@ -32,7 +32,6 @@ import {IntegrationRepository} from 'src/script/integration/IntegrationRepositor
 import {ServiceEntity} from 'src/script/integration/ServiceEntity';
 import {UserRepository} from 'src/script/user/UserRepository';
 import {MainViewModel} from 'src/script/view_model/MainViewModel';
-import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {PeopleTab, SearchResultsData} from './PeopleTab';
@@ -57,6 +56,7 @@ type StartUIProps = {
   onClose: () => void;
   searchRepository: SearchRepository;
   teamRepository: TeamRepository;
+  selfUser: User;
   teamState?: TeamState;
   userRepository: UserRepository;
   userState?: UserState;
@@ -79,9 +79,9 @@ const StartUI: React.FC<StartUIProps> = ({
   mainViewModel,
   userRepository,
   isFederated,
+  selfUser,
 }) => {
   const brandName = Config.getConfig().BRAND_NAME;
-  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
   const {
     canInviteTeamMembers,
     canSearchUnconnectedUsers,
@@ -137,7 +137,7 @@ const StartUI: React.FC<StartUIProps> = ({
     });
   };
 
-  const openInviteModal = () => showInviteModal({selfUser: userState.self()});
+  const openInviteModal = () => showInviteModal({selfUser});
 
   const openConversation = async (conversation: Conversation): Promise<void> => {
     await actions.openGroupConversation(conversation);
@@ -196,6 +196,7 @@ const StartUI: React.FC<StartUIProps> = ({
           isFederated={isFederated}
           teamRepository={teamRepository}
           teamState={teamState}
+          selfUser={selfUser}
           userState={userState}
           canSearchUnconnectedUsers={canSearchUnconnectedUsers()}
           conversationState={conversationState}
diff --git a/src/script/page/MainContent/MainContent.tsx b/src/script/page/MainContent/MainContent.tsx
index 552111bd10c..c9f811c0f6a 100644
--- a/src/script/page/MainContent/MainContent.tsx
+++ b/src/script/page/MainContent/MainContent.tsx
@@ -78,7 +78,10 @@ const MainContent: FC<MainContentProps> = ({
   const teamState = container.resolve(TeamState);
   const {showRequestModal} = useLegalHoldModalState();
 
-  const {contentState, isShowingConversation} = useAppState();
+  const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']);
+
+  const contentState = useAppState(state => state.contentState);
+  const isShowingConversation = useAppState(state => state.isShowingConversation);
 
   useEffect(() => {
     if (!isShowingConversation() && conversationState.activeConversation()) {
@@ -137,6 +140,7 @@ const MainContent: FC<MainContentProps> = ({
                 conversationRepository={repositories.conversation}
                 assetRepository={repositories.asset}
                 messageRepository={repositories.message}
+                selfUser={selfUser}
               />
             )}
 
@@ -146,7 +150,7 @@ const MainContent: FC<MainContentProps> = ({
                 className={cx('preferences-page preferences-about', incomingCssClass)}
                 ref={removeAnimationsClass}
               >
-                <AboutPreferences />
+                <AboutPreferences selfUser={selfUser} />
               </div>
             )}
 
@@ -164,6 +168,8 @@ const MainContent: FC<MainContentProps> = ({
                   conversationRepository={repositories.conversation}
                   propertiesRepository={repositories.properties}
                   userRepository={repositories.user}
+                  selfUser={selfUser}
+                  isActivatedAccount={isActivatedAccount}
                 />
               </div>
             )}
@@ -196,7 +202,7 @@ const MainContent: FC<MainContentProps> = ({
                   resetSession={(userId, device, conversation) =>
                     repositories.message.resetSession(userId, device.id, conversation)
                   }
-                  userState={userState}
+                  selfUser={selfUser}
                   verifyDevice={(userId, device, verified) =>
                     repositories.client.verifyClient(userId, device, verified)
                   }
@@ -210,7 +216,7 @@ const MainContent: FC<MainContentProps> = ({
                 className={cx('preferences-page preferences-options', incomingCssClass)}
                 ref={removeAnimationsClass}
               >
-                <OptionPreferences propertiesRepository={repositories.properties} />
+                <OptionPreferences selfUser={selfUser} propertiesRepository={repositories.properties} />
               </div>
             )}
 
@@ -230,7 +236,7 @@ const MainContent: FC<MainContentProps> = ({
               <Conversation
                 initialMessage={initialMessage}
                 teamState={teamState}
-                userState={userState}
+                selfUser={selfUser}
                 isRightSidebarOpen={isRightSidebarOpen}
                 openRightSidebar={openRightSidebar}
               />
diff --git a/src/script/page/MainContent/panels/Collection/Collection.test.tsx b/src/script/page/MainContent/panels/Collection/Collection.test.tsx
index 037016c0465..52811432082 100644
--- a/src/script/page/MainContent/panels/Collection/Collection.test.tsx
+++ b/src/script/page/MainContent/panels/Collection/Collection.test.tsx
@@ -34,6 +34,7 @@ import {Collection} from './Collection';
 import {AssetRepository} from '../../../../assets/AssetRepository';
 import {MessageRepository} from '../../../../conversation/MessageRepository';
 import {Text} from '../../../../entity/message/Text';
+import {User} from '../../../../entity/User';
 
 jest.mock('./CollectionDetails', () => ({
   CollectionDetails: () => <div>CollectionDetails</div>,
@@ -88,6 +89,7 @@ describe('Collection', () => {
   };
   const mockAssetRepository = container.resolve(AssetRepository);
   const mockMessageRepository = {} as MessageRepository;
+  const mockSelfUser = new User(createUuid());
 
   it('displays all image assets', async () => {
     const {getAllByText, getByText, queryByText} = render(
@@ -97,6 +99,7 @@ describe('Collection', () => {
           conversation={conversation}
           conversationRepository={mockConversationRepository as any}
           messageRepository={mockMessageRepository}
+          selfUser={mockSelfUser}
         />,
       ),
     );
@@ -122,6 +125,7 @@ describe('Collection', () => {
           messageRepository={mockMessageRepository}
           conversation={conversation}
           conversationRepository={mockConversationRepository as any}
+          selfUser={mockSelfUser}
         />,
       ),
     );
@@ -142,6 +146,7 @@ describe('Collection', () => {
           messageRepository={mockMessageRepository}
           conversation={conversation}
           conversationRepository={mockConversationRepository as any}
+          selfUser={mockSelfUser}
         />,
       ),
     );
diff --git a/src/script/page/MainContent/panels/Collection/Collection.tsx b/src/script/page/MainContent/panels/Collection/Collection.tsx
index dc0b6bd7249..1ad0d9fde97 100644
--- a/src/script/page/MainContent/panels/Collection/Collection.tsx
+++ b/src/script/page/MainContent/panels/Collection/Collection.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useEffect, useState} from 'react';
+import {useEffect, useState} from 'react';
 
 import {amplify} from 'amplify';
 
@@ -40,6 +40,7 @@ import {Category, isOfCategory} from './utils';
 import {AssetRepository} from '../../../../assets/AssetRepository';
 import {MessageRepository} from '../../../../conversation/MessageRepository';
 import {Conversation} from '../../../../entity/Conversation';
+import {User} from '../../../../entity/User';
 import {MessageCategory} from '../../../../message/MessageCategory';
 
 interface CollectionDetailsProps {
@@ -47,6 +48,7 @@ interface CollectionDetailsProps {
   conversationRepository: ConversationRepository;
   assetRepository: AssetRepository;
   messageRepository: MessageRepository;
+  selfUser: User;
 }
 
 type Categories = Record<Category, ContentMessage[]>;
@@ -78,12 +80,13 @@ function splitIntoCategories(messages: ContentMessage[]): Categories {
   );
 }
 
-const Collection: React.FC<CollectionDetailsProps> = ({
+const Collection = ({
   conversation,
   conversationRepository,
   assetRepository,
   messageRepository,
-}) => {
+  selfUser,
+}: CollectionDetailsProps) => {
   const [searchTerm, setSearchTerm] = useState('');
   const {display_name} = useKoSubscribableChildren(conversation, ['display_name']);
   const [messages, setMessages] = useState<ContentMessage[]>([]);
@@ -131,6 +134,7 @@ const Collection: React.FC<CollectionDetailsProps> = ({
       conversationRepository,
       currentMessageEntity: message,
       messageRepository,
+      selfUser,
     });
   };
 
diff --git a/src/script/page/MainContent/panels/preferences/AVPreferences.tsx b/src/script/page/MainContent/panels/preferences/AVPreferences.tsx
index cc163cf5806..e972af3c6ea 100644
--- a/src/script/page/MainContent/panels/preferences/AVPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/AVPreferences.tsx
@@ -17,8 +17,7 @@
  *
  */
 
-import React from 'react';
-
+import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
@@ -30,7 +29,6 @@ import {SaveCallLogs} from './avPreferences/SaveCallLogs';
 import {PreferencesPage} from './components/PreferencesPage';
 
 import type {CallingRepository} from '../../../../calling/CallingRepository';
-import {DeviceTypes} from '../../../../media/MediaDevicesHandler';
 import type {MediaRepository} from '../../../../media/MediaRepository';
 import type {PropertiesRepository} from '../../../../properties/PropertiesRepository';
 
@@ -40,27 +38,27 @@ interface AVPreferencesProps {
   propertiesRepository: PropertiesRepository;
 }
 
-const AVPreferences: React.FC<AVPreferencesProps> = ({
+const AVPreferences = ({
   mediaRepository: {devicesHandler, constraintsHandler, streamHandler},
   propertiesRepository,
   callingRepository,
-}) => {
+}: AVPreferencesProps) => {
   const deviceSupport = useKoSubscribableChildren(devicesHandler?.deviceSupport, [
-    DeviceTypes.AUDIO_INPUT,
-    DeviceTypes.AUDIO_OUTPUT,
-    DeviceTypes.VIDEO_INPUT,
+    MediaDeviceType.AUDIO_INPUT,
+    MediaDeviceType.AUDIO_OUTPUT,
+    MediaDeviceType.VIDEO_INPUT,
   ]);
 
   return (
     <PreferencesPage title={t('preferencesAV')}>
-      {deviceSupport.audioInput && (
+      {deviceSupport.audioinput && (
         <MicrophonePreferences
           {...{devicesHandler, streamHandler}}
           refreshStream={() => callingRepository.refreshAudioInput()}
         />
       )}
-      {deviceSupport.audioOutput && <AudioOutPreferences {...{devicesHandler}} />}
-      {deviceSupport.videoInput && (
+      {deviceSupport.audiooutput && <AudioOutPreferences {...{devicesHandler}} />}
+      {deviceSupport.videoinput && (
         <CameraPreferences
           {...{devicesHandler, streamHandler}}
           refreshStream={() => callingRepository.refreshVideoInput()}
diff --git a/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx b/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
index 3cdf5315b89..4b59e66f162 100644
--- a/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/AboutPreferences.tsx
@@ -19,36 +19,34 @@
 
 import React, {useMemo} from 'react';
 
-import {container} from 'tsyringe';
-
 import {Link, LinkVariant} from '@wireapp/react-ui-kit';
 
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {PreferencesPage} from './components/PreferencesPage';
 import {PreferencesSection} from './components/PreferencesSection';
 
 import {Config} from '../../../../Config';
+import {User} from '../../../../entity/User';
 import {getPrivacyPolicyUrl, getTermsOfUsePersonalUrl, getTermsOfUseTeamUrl, URL} from '../../../../externalRoute';
-import {UserState} from '../../../../user/UserState';
-import {useKoSubscribableChildren} from '../../../../util/ComponentUtil';
 
 interface AboutPreferencesProps {
-  userState?: UserState;
+  selfUser: User;
 }
 
-const AboutPreferences: React.FC<AboutPreferencesProps> = ({userState = container.resolve(UserState)}) => {
-  const {self} = useKoSubscribableChildren(userState, ['self']);
-  const {inTeam} = useKoSubscribableChildren(self, ['inTeam']);
+const AboutPreferences: React.FC<AboutPreferencesProps> = ({selfUser}) => {
+  const {inTeam} = useKoSubscribableChildren(selfUser, ['inTeam']);
   const config = Config.getConfig();
   const websiteUrl = URL.WEBSITE;
   const privacyPolicyUrl = getPrivacyPolicyUrl();
+
   const termsOfUseUrl = useMemo(() => {
-    if (self) {
+    if (selfUser) {
       return inTeam ? getTermsOfUseTeamUrl() : getTermsOfUsePersonalUrl();
     }
     return '';
-  }, [self, inTeam]);
+  }, [selfUser, inTeam]);
 
   const showWireSection = !!(termsOfUseUrl || websiteUrl || privacyPolicyUrl);
   const showSupportSection = !!(config.URL.SUPPORT.INDEX || config.URL.SUPPORT.CONTACT);
diff --git a/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx b/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx
index de599cbd58d..dd6e7de53dd 100644
--- a/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/AccountPreferences.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import React, {useRef} from 'react';
+import {useRef} from 'react';
 
 import {ErrorBoundary} from 'react-error-boundary';
 import {container} from 'tsyringe';
@@ -58,7 +58,6 @@ import {StorageKey} from '../../../../storage';
 import {TeamState} from '../../../../team/TeamState';
 import {RichProfileRepository} from '../../../../user/RichProfileRepository';
 import type {UserRepository} from '../../../../user/UserRepository';
-import {UserState} from '../../../../user/UserState';
 import {AccentColorPicker} from '../../../AccentColorPicker';
 
 interface AccountPreferencesProps {
@@ -72,23 +71,24 @@ interface AccountPreferencesProps {
   showDomain?: boolean;
   teamState?: TeamState;
   userRepository: UserRepository;
-  userState?: UserState;
+  selfUser: User;
+  isActivatedAccount?: boolean;
 }
 
 const logger = getLogger('AccountPreferences');
 
-const AccountPreferences: React.FC<AccountPreferencesProps> = ({
+export const AccountPreferences = ({
   importFile,
   clientRepository,
   userRepository,
   propertiesRepository,
   switchContent,
   conversationRepository,
+  selfUser,
+  isActivatedAccount = false,
   showDomain = false,
-  userState = container.resolve(UserState),
   teamState = container.resolve(TeamState),
-}) => {
-  const {self: selfUser, isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']);
+}: AccountPreferencesProps) => {
   const {isTeam, teamName} = useKoSubscribableChildren(teamState, ['isTeam', 'teamName']);
   const {name, email, availability, username, managedBy, phone} = useKoSubscribableChildren(selfUser, [
     'name',
@@ -100,7 +100,8 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
   ]);
   const canEditProfile = managedBy === User.CONFIG.MANAGED_BY.WIRE;
   const isDesktop = Runtime.isDesktopApp();
-  const isTemporaryAndNonPersistent = useRef(isTemporaryClientAndNonPersistent(loadValue(StorageKey.AUTH.PERSIST)));
+  const persistedAuth = loadValue(StorageKey.AUTH.PERSIST);
+  const isTemporaryAndNonPersistent = useRef(isTemporaryClientAndNonPersistent(!!persistedAuth));
   const config = Config.getConfig();
   const brandName = config.BRAND_NAME;
   const isConsentCheckEnabled = config.FEATURE.CHECK_CONSENT;
@@ -117,7 +118,7 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
           action: async (): Promise<void> => {
             try {
               await conversationRepository.leaveGuestRoom();
-              clientRepository.logoutClient();
+              void clientRepository.logoutClient();
             } catch (error) {
               logger.warn('Error while leaving room', error);
             }
@@ -144,7 +145,7 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
         }}
       >
         <h3
-          className="heading-h3 text-center ellipsis"
+          className="heading-h3 text-center"
           title={name}
           css={{
             marginBottom: 16,
@@ -156,11 +157,11 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
 
         <div>
           <ErrorBoundary FallbackComponent={ErrorFallback}>
-            <AvatarInput {...{isActivatedAccount, selfUser, userRepository}} />
+            <AvatarInput selfUser={selfUser} isActivatedAccount={isActivatedAccount} userRepository={userRepository} />
           </ErrorBoundary>
         </div>
 
-        {isActivatedAccount && isTeam && <AvailabilityButtons {...{availability}} />}
+        {isActivatedAccount && isTeam && <AvailabilityButtons availability={availability} />}
 
         {isActivatedAccount && (
           <div>
@@ -179,13 +180,25 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
               marginLeft: '-8px',
             }}
           >
-            <NameInput {...{canEditProfile, name, userRepository}} />
-            <UsernameInput {...{canEditProfile, userRepository, username}} domain={showDomain ? domain : undefined} />
-            {email && !selfUser.isNoPasswordSSO && <EmailInput {...{canEditProfile, email, userRepository}} />}
+            <NameInput canEditProfile={canEditProfile} name={name} userRepository={userRepository} />
+
+            <UsernameInput
+              canEditProfile={canEditProfile}
+              userRepository={userRepository}
+              username={username}
+              domain={showDomain ? domain : undefined}
+            />
+
+            {email && !selfUser.isNoPasswordSSO && (
+              <EmailInput canEditProfile={canEditProfile} email={email} userRepository={userRepository} />
+            )}
+
             {phone && <AccountInput label={t('preferencesAccountPhone')} value={phone} readOnly fieldName="phone" />}
+
             {isTeam && (
               <AccountInput label={t('preferencesAccountTeam')} value={teamName} readOnly fieldName="status-team" />
             )}
+
             {richFields.map(({type, value}) => (
               <AccountInput
                 key={type}
@@ -198,6 +211,7 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
               />
             ))}
           </div>
+
           <AccountLink
             label={t('preferencesAccountLink')}
             value={`${Config.getConfig().URL.ACCOUNT_BASE}/user-profile/?id=${selfUser.id}`}
@@ -214,25 +228,32 @@ const AccountPreferences: React.FC<AccountPreferencesProps> = ({
           >
             {t('preferencesAccountLeaveGuestRoom')}
           </button>
+
           <div className="preferences-leave-disclaimer">{t('preferencesAccountLeaveGuestRoomDescription')}</div>
         </PreferencesSection>
       )}
 
-      {isConsentCheckEnabled && <DataUsageSection {...{brandName, isActivatedAccount, propertiesRepository}} />}
+      {isConsentCheckEnabled && (
+        <DataUsageSection
+          brandName={brandName}
+          isActivatedAccount={isActivatedAccount}
+          propertiesRepository={propertiesRepository}
+        />
+      )}
 
-      <PrivacySection {...{propertiesRepository}} />
+      <PrivacySection propertiesRepository={propertiesRepository} />
 
       {isActivatedAccount && (
         <>
           {!isTemporaryAndNonPersistent.current && (
             <HistoryBackupSection brandName={brandName} importFile={importFile} switchContent={switchContent} />
           )}
-          <AccountSecuritySection {...{selfUser, userRepository}} />
-          {!isDesktop && <LogoutSection {...{clientRepository}} />}
+
+          <AccountSecuritySection selfUser={selfUser} userRepository={userRepository} />
+
+          {!isDesktop && <LogoutSection clientRepository={clientRepository} />}
         </>
       )}
     </PreferencesPage>
   );
 };
-
-export {AccountPreferences};
diff --git a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx
index fad22a6616a..173d04a92a8 100644
--- a/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/OptionPreferences.tsx
@@ -22,12 +22,13 @@ import React, {useEffect, useState} from 'react';
 import {AudioPreference, NotificationPreference, WebappProperties} from '@wireapp/api-client/lib/user/data/';
 import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
 import {amplify} from 'amplify';
-import {container} from 'tsyringe';
 
 import {Checkbox, CheckboxLabel, IndicatorRangeInput} from '@wireapp/react-ui-kit';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
+import {Theme} from 'Components/AppContainer/hooks/useTheme';
 import {RadioGroup} from 'Components/Radio';
+import {User} from 'src/script/entity/User';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
@@ -37,26 +38,21 @@ import {PreferencesSection} from './components/PreferencesSection';
 import {RootFontSize, useRootFontSize} from '../../../../hooks/useRootFontSize';
 import {PropertiesRepository} from '../../../../properties/PropertiesRepository';
 import {PROPERTIES_TYPE} from '../../../../properties/PropertiesType';
-import {UserState} from '../../../../user/UserState';
-import {THEMES as ThemeViewModelThemes} from '../../../../view_model/ThemeViewModel';
 interface OptionPreferencesProps {
   propertiesRepository: PropertiesRepository;
-  userState?: UserState;
+  selfUser: User;
 }
 
 const fontSizes = Object.values(RootFontSize);
 
-const OptionPreferences: React.FC<OptionPreferencesProps> = ({
-  propertiesRepository,
-  userState = container.resolve(UserState),
-}) => {
-  const {isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']);
+const OptionPreferences = ({propertiesRepository, selfUser}: OptionPreferencesProps) => {
+  const {isActivatedAccount} = useKoSubscribableChildren(selfUser, ['isActivatedAccount']);
   const {
     properties: {settings},
   } = propertiesRepository;
   const [optionAudio, setOptionAudio] = useState<AudioPreference>(settings.sound.alerts);
   const [optionReplaceInlineEmoji, setOptionReplaceInlineEmoji] = useState<boolean>(settings.emoji.replace_inline);
-  const [optionDarkMode, setOptionDarkMode] = useState<boolean>(settings.interface.theme === ThemeViewModelThemes.DARK);
+  const [optionDarkMode, setOptionDarkMode] = useState<boolean>(settings.interface.theme === 'dark');
   const [optionSendPreviews, setOptionSendPreviews] = useState<boolean>(settings.previews.send);
   const [optionNotifications, setOptionNotifications] = useState<NotificationPreference>(settings.notifications);
   const [currentRootFontSize, setCurrentRootFontSize] = useRootFontSize();
@@ -66,7 +62,7 @@ const OptionPreferences: React.FC<OptionPreferencesProps> = ({
     const updateProperties = ({settings}: WebappProperties): void => {
       setOptionAudio(settings.sound.alerts);
       setOptionReplaceInlineEmoji(settings.emoji.replace_inline);
-      setOptionDarkMode(settings.interface.theme === ThemeViewModelThemes.DARK);
+      setOptionDarkMode(settings.interface.theme === 'dark');
       setOptionSendPreviews(settings.previews.send);
       setOptionNotifications(settings.notifications);
     };
@@ -103,7 +99,7 @@ const OptionPreferences: React.FC<OptionPreferencesProps> = ({
   };
 
   const saveOptionNewTheme = (useDarkMode: boolean) => {
-    const newTheme = useDarkMode ? ThemeViewModelThemes.DARK : ThemeViewModelThemes.DEFAULT;
+    const newTheme: Theme = useDarkMode ? 'dark' : 'default';
     propertiesRepository.savePreference(PROPERTIES_TYPE.INTERFACE.THEME, newTheme);
     setOptionDarkMode(useDarkMode);
   };
diff --git a/src/script/page/MainContent/panels/preferences/accountPreferences/HistoryBackupSection.tsx b/src/script/page/MainContent/panels/preferences/accountPreferences/HistoryBackupSection.tsx
index f2af68400e1..debff9721ae 100644
--- a/src/script/page/MainContent/panels/preferences/accountPreferences/HistoryBackupSection.tsx
+++ b/src/script/page/MainContent/panels/preferences/accountPreferences/HistoryBackupSection.tsx
@@ -17,15 +17,12 @@
  *
  */
 
-import {FC, useRef} from 'react';
-
-import {TabIndex} from '@wireapp/react-ui-kit/lib/types/enums';
+import {FC} from 'react';
 
 import {Button, ButtonVariant} from '@wireapp/react-ui-kit';
 
-import {CONFIG as HistoryExportConfig} from 'Components/HistoryExport';
+import {BackupFileUpload} from 'Components/HistoryImport/BackupFileUpload';
 import {ContentState} from 'src/script/page/useAppState';
-import {handleKeyDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {PreferencesSection} from '../components/PreferencesSection';
@@ -37,10 +34,12 @@ interface HistoryBackupSectionProps {
 }
 
 const HistoryBackupSection: FC<HistoryBackupSectionProps> = ({brandName, importFile, switchContent}) => {
-  const fileInputRef = useRef<HTMLInputElement>(null);
-
-  const fileInputClick = () => fileInputRef.current?.click();
-
+  const handleFileChange = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (file) {
+      importFile(file);
+    }
+  };
   return (
     <PreferencesSection
       hasSeparator
@@ -60,39 +59,12 @@ const HistoryBackupSection: FC<HistoryBackupSectionProps> = ({brandName, importF
       <p id="preferences-history-describe-1" className="preferences-detail">
         {t('preferencesOptionsBackupExportSecondary', brandName)}
       </p>
-      <Button
+      <BackupFileUpload
+        onFileChange={handleFileChange}
+        backupImportHeadLine={t('preferencesOptionsBackupImportHeadline')}
         variant={ButtonVariant.TERTIARY}
-        className="preferences-history-restore-button"
-        role="button"
-        tabIndex={TabIndex.FOCUSABLE}
-        onKeyDown={event => handleKeyDown(event, fileInputClick)}
-        aria-labelledby="do-backup-import"
-      >
-        <label
-          className="preferences-history-backup-import-field"
-          data-uie-name="do-backup-import"
-          id="do-backup-import"
-          htmlFor="file-import-input"
-        >
-          <span>{t('preferencesOptionsBackupImportHeadline')}</span>
-          <input
-            id="file-import-input"
-            ref={fileInputRef}
-            tabIndex={TabIndex.UNFOCUSABLE}
-            type="file"
-            accept={`.${HistoryExportConfig.FILE_EXTENSION}`}
-            onChange={event => {
-              const file = event.target.files?.[0];
-              if (file) {
-                importFile(file);
-              }
-            }}
-            onFocus={({target}) => target.blur()}
-            data-uie-name="input-import-file"
-            aria-describedby="preferences-history-describe-2"
-          />
-        </label>
-      </Button>
+        cssClassName="preferences-history-restore-button"
+      />
       <p id="preferences-history-describe-2" className="preferences-detail">
         {t('preferencesOptionsBackupImportSecondary')}
       </p>
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
index b6b29f960f6..d3d3bf2a332 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/AudioOutPreferences.tsx
@@ -20,12 +20,13 @@
 import React from 'react';
 
 import {Icon} from 'Components/Icon';
+import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 
 import {DeviceSelect} from './DeviceSelect';
 
-import {DeviceTypes, MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
+import {MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
 import {PreferencesSection} from '../components/PreferencesSection';
 
 interface AudioOutPreferencesProps {
@@ -33,19 +34,20 @@ interface AudioOutPreferencesProps {
 }
 
 const AudioOutPreferences: React.FC<AudioOutPreferencesProps> = ({devicesHandler}) => {
-  const {[DeviceTypes.AUDIO_OUTPUT]: availableDevices} = useKoSubscribableChildren(devicesHandler?.availableDevices, [
-    DeviceTypes.AUDIO_OUTPUT,
-  ]);
+  const {[MediaDeviceType.AUDIO_OUTPUT]: availableDevices} = useKoSubscribableChildren(
+    devicesHandler?.availableDevices,
+    [MediaDeviceType.AUDIO_OUTPUT],
+  );
 
-  const {[DeviceTypes.AUDIO_OUTPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
-    DeviceTypes.AUDIO_OUTPUT,
+  const {[MediaDeviceType.AUDIO_OUTPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
+    MediaDeviceType.AUDIO_OUTPUT,
   ]);
 
   return (
     <PreferencesSection title={t('preferencesAVSpeakers')}>
       <DeviceSelect
         uieName="enter-speaker"
-        onChange={deviceId => devicesHandler.currentDeviceId[DeviceTypes.AUDIO_OUTPUT](deviceId)}
+        onChange={deviceId => devicesHandler.currentDeviceId[MediaDeviceType.AUDIO_OUTPUT](deviceId)}
         devices={availableDevices as MediaDeviceInfo[]}
         value={currentDeviceId}
         icon={Icon.Speaker}
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx
index 42ab4980795..95b3dd879a0 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/CallOptions.tsx
@@ -102,7 +102,6 @@ const CallOptions: React.FC<CallOptionsProps> = ({constraintsHandler, properties
           }}
           checked={soundlessCallsEnabled}
           data-uie-name="status-preference-soundless-incoming-calls"
-          disabled={isCbrEncodingEnforced}
         >
           <CheckboxLabel htmlFor="status-preference-soundless-incoming-calls">
             {t('preferencesOptionsEnableSoundlessIncomingCalls')}
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
index 5a942456521..67d87b161a4 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/CameraPreferences.tsx
@@ -20,6 +20,7 @@
 import React, {useEffect, useRef, useState} from 'react';
 
 import {Icon} from 'Components/Icon';
+import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 import {getLogger} from 'Util/Logger';
@@ -27,7 +28,7 @@ import {getLogger} from 'Util/Logger';
 import {DeviceSelect} from './DeviceSelect';
 
 import {Config} from '../../../../../Config';
-import {DeviceTypes, MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
+import {MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
 import {MediaStreamHandler} from '../../../../../media/MediaStreamHandler';
 import {MediaType} from '../../../../../media/MediaType';
 import {PreferencesSection} from '../components/PreferencesSection';
@@ -50,12 +51,13 @@ const CameraPreferences: React.FC<CameraPreferencesProps> = ({
   const [isRequesting, setIsRequesting] = useState(false);
   const [stream, setStream] = useState<MediaStream | null>(null);
   const videoElement = useRef<HTMLVideoElement>(null);
-  const {[DeviceTypes.VIDEO_INPUT]: availableDevices} = useKoSubscribableChildren(devicesHandler?.availableDevices, [
-    DeviceTypes.VIDEO_INPUT,
-  ]);
+  const {[MediaDeviceType.VIDEO_INPUT]: availableDevices} = useKoSubscribableChildren(
+    devicesHandler?.availableDevices,
+    [MediaDeviceType.VIDEO_INPUT],
+  );
 
-  const {[DeviceTypes.VIDEO_INPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
-    DeviceTypes.VIDEO_INPUT,
+  const {[MediaDeviceType.VIDEO_INPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
+    MediaDeviceType.VIDEO_INPUT,
   ]);
 
   const {URL: urls, BRAND_NAME: brandName} = Config.getConfig();
@@ -120,7 +122,7 @@ const CameraPreferences: React.FC<CameraPreferencesProps> = ({
         defaultDeviceName={t('preferencesAVCamera')}
         icon={Icon.Camera}
         isRequesting={isRequesting}
-        onChange={deviceId => devicesHandler.currentDeviceId[DeviceTypes.VIDEO_INPUT](deviceId)}
+        onChange={deviceId => devicesHandler.currentDeviceId[MediaDeviceType.VIDEO_INPUT](deviceId)}
         title={t('preferencesAVCamera')}
       />
 
@@ -140,8 +142,9 @@ const CameraPreferences: React.FC<CameraPreferencesProps> = ({
                   __html: t('preferencesAVNoCamera', brandName, {
                     '/faqLink': '</a>',
                     br: '<br>',
-                    faqLink:
-                      "<a href='https://support.wire.com/hc/articles/202935412' data-uie-name='go-no-camera-faq' target='_blank' rel='noopener noreferrer'>",
+                    faqLink: `<a href='${
+                      Config.getConfig().URL.SUPPORT.CAMERA_ACCESS_DENIED
+                    }' data-uie-name='go-no-camera-faq' target='_blank' rel='noopener noreferrer'>`,
                   }),
                 }}
               />
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/DeviceSelect.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/DeviceSelect.tsx
index 560f42fbb43..04cf5222581 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/DeviceSelect.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/DeviceSelect.tsx
@@ -75,7 +75,7 @@ const DeviceSelect: React.FC<DeviceSelectProps> = ({
           }}
           dataUieName={uieName}
           options={devicesList}
-          defaultValue={currentValue}
+          value={currentValue}
           label={title}
           isDisabled={disabled}
         />
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/InputLevel.test.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/InputLevel.test.tsx
index 06d6d375a99..a7cb77ff4e3 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/InputLevel.test.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/InputLevel.test.tsx
@@ -33,7 +33,7 @@ describe('InputLevel', () => {
           getByteFrequencyData: (arr: Uint8Array) => {
             arr.fill(128);
           },
-        } as AnalyserNode),
+        }) as AnalyserNode,
       createMediaStreamSource: (stream: MediaStream) => ({connect: () => {}, disconnect: () => {}}),
     }));
 
diff --git a/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx b/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
index 6d2b5ca3f5c..f2ac892bdac 100644
--- a/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/avPreferences/MicrophonePreferences.tsx
@@ -20,6 +20,7 @@
 import React, {useEffect, useState} from 'react';
 
 import {Icon} from 'Components/Icon';
+import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 import {getLogger} from 'Util/Logger';
@@ -28,7 +29,7 @@ import {DeviceSelect} from './DeviceSelect';
 import {InputLevel} from './InputLevel';
 
 import {Config} from '../../../../../Config';
-import {DeviceTypes, MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
+import {MediaDevicesHandler} from '../../../../../media/MediaDevicesHandler';
 import {MediaStreamHandler} from '../../../../../media/MediaStreamHandler';
 import {MediaType} from '../../../../../media/MediaType';
 import {PreferencesSection} from '../components/PreferencesSection';
@@ -48,12 +49,13 @@ const MicrophonePreferences: React.FC<MicrophonePreferencesProps> = ({
 }) => {
   const [isRequesting, setIsRequesting] = useState(false);
   const [stream, setStream] = useState<MediaStream>();
-  const {[DeviceTypes.AUDIO_INPUT]: availableDevices} = useKoSubscribableChildren(devicesHandler?.availableDevices, [
-    DeviceTypes.AUDIO_INPUT,
-  ]);
+  const {[MediaDeviceType.AUDIO_INPUT]: availableDevices} = useKoSubscribableChildren(
+    devicesHandler?.availableDevices,
+    [MediaDeviceType.AUDIO_INPUT],
+  );
 
-  const {[DeviceTypes.AUDIO_INPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
-    DeviceTypes.AUDIO_INPUT,
+  const {[MediaDeviceType.AUDIO_INPUT]: currentDeviceId} = useKoSubscribableChildren(devicesHandler?.currentDeviceId, [
+    MediaDeviceType.AUDIO_INPUT,
   ]);
 
   const {URL: urls} = Config.getConfig();
@@ -100,7 +102,7 @@ const MicrophonePreferences: React.FC<MicrophonePreferencesProps> = ({
         defaultDeviceName={t('preferencesAVMicrophone')}
         icon={Icon.MicOn}
         isRequesting={isRequesting}
-        onChange={deviceId => devicesHandler.currentDeviceId[DeviceTypes.AUDIO_INPUT](deviceId)}
+        onChange={deviceId => devicesHandler.currentDeviceId[MediaDeviceType.AUDIO_INPUT](deviceId)}
         title={t('preferencesAVMicrophone')}
       />
       {isRequesting ? (
diff --git a/src/script/page/MainContent/panels/preferences/components/PreferencesCheckbox.tsx b/src/script/page/MainContent/panels/preferences/components/PreferencesCheckbox.tsx
deleted file mode 100644
index eb7904430a6..00000000000
--- a/src/script/page/MainContent/panels/preferences/components/PreferencesCheckbox.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import React, {useRef} from 'react';
-
-import {Checkbox} from 'Components/Checkbox';
-
-interface PreferencesCheckboxProps {
-  checked: boolean;
-  details?: string | React.ReactNode;
-  disabled?: boolean;
-  label: string;
-  onChange: (checked: boolean) => void;
-  uieName: string;
-}
-
-const PreferencesCheckbox: React.FC<PreferencesCheckboxProps> = ({
-  checked,
-  disabled,
-  onChange,
-  label,
-  details,
-  uieName,
-}) => {
-  const {current: id} = useRef(Math.random().toString(36).slice(2));
-  return (
-    <>
-      <div className="preferences-option">
-        <Checkbox
-          label={label}
-          name={id}
-          disabled={disabled}
-          isChecked={checked}
-          onCheckedChanged={() => onChange(!checked)}
-          uieName={uieName}
-        />
-      </div>
-
-      {details && <div className="preferences-detail preferences-detail-intended">{details}</div>}
-    </>
-  );
-};
-
-export {PreferencesCheckbox};
diff --git a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.test.tsx b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.test.tsx
index fba63b879b9..d5bc372ca35 100644
--- a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.test.tsx
+++ b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.test.tsx
@@ -24,11 +24,12 @@ import {ClientEntity} from 'src/script/client/ClientEntity';
 import {ClientState} from 'src/script/client/ClientState';
 import {ConversationState} from 'src/script/conversation/ConversationState';
 import {CryptographyRepository} from 'src/script/cryptography/CryptographyRepository';
-import {UserState} from 'src/script/user/UserState';
 import {createUuid} from 'Util/uuid';
 
 import {DevicesPreferences} from './DevicesPreferences';
 
+import {User} from '../../../../../entity/User';
+
 function createDevice(): ClientEntity {
   const device = new ClientEntity(true, '', createUuid());
   device.model = 'test device';
@@ -39,7 +40,7 @@ function createDevice(): ClientEntity {
 describe('DevicesPreferences', () => {
   const clientState = new ClientState();
   clientState.clients = ko.pureComputed(() => [createDevice(), createDevice()]);
-  clientState.currentClient(createDevice());
+  clientState.currentClient = createDevice();
   const defaultParams = {
     clientState: clientState,
     conversationState: new ConversationState(),
@@ -49,7 +50,7 @@ describe('DevicesPreferences', () => {
     } as unknown as CryptographyRepository,
     removeDevice: jest.fn(),
     resetSession: jest.fn(),
-    userState: new UserState(),
+    selfUser: new User(createUuid()),
     verifyDevice: jest.fn(),
   };
 
diff --git a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx
index d970f038fff..21046d4e209 100644
--- a/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx
+++ b/src/script/page/MainContent/panels/preferences/devices/DevicesPreferences.tsx
@@ -27,6 +27,7 @@ import {Icon} from 'Components/Icon';
 import {VerifiedIcon} from 'Components/VerifiedIcon';
 import {ClientEntity} from 'src/script/client/ClientEntity';
 import {CryptographyRepository} from 'src/script/cryptography/CryptographyRepository';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {handleKeyDown} from 'Util/KeyboardUtil';
 import {t} from 'Util/LocalizerUtil';
 
@@ -37,27 +38,18 @@ import {DeviceDetailsPreferences} from './DeviceDetailsPreferences';
 import {ClientState} from '../../../../../client/ClientState';
 import {ConversationState} from '../../../../../conversation/ConversationState';
 import {Conversation} from '../../../../../entity/Conversation';
-import {UserState} from '../../../../../user/UserState';
-import {useKoSubscribableChildren} from '../../../../../util/ComponentUtil';
+import {User} from '../../../../../entity/User';
 import {PreferencesPage} from '../components/PreferencesPage';
 
-interface DevicesPreferencesProps {
-  clientState: ClientState;
-  conversationState: ConversationState;
-  cryptographyRepository: CryptographyRepository;
-  removeDevice: (device: ClientEntity) => Promise<unknown>;
-  resetSession: (userId: QualifiedId, device: ClientEntity, conversation: Conversation) => Promise<void>;
-  userState: UserState;
-  verifyDevice: (userId: QualifiedId, device: ClientEntity, isVerified: boolean) => void;
-}
-
-const Device: React.FC<{
+interface DeviceProps {
   device: ClientEntity;
   isSSO: boolean;
   onRemove: (device: ClientEntity) => void;
   onSelect: (device: ClientEntity) => void;
   deviceNumber: number;
-}> = ({device, isSSO, onSelect, onRemove, deviceNumber}) => {
+}
+
+const Device = ({device, isSSO, onSelect, onRemove, deviceNumber}: DeviceProps) => {
   const {isVerified} = useKoSubscribableChildren(device.meta, ['isVerified']);
   const verifiedLabel = isVerified ? t('preferencesDevicesVerification') : t('preferencesDeviceNotVerified');
   const deviceAriaLabel = `${t('preferencesDevice')} ${deviceNumber}, ${device.getName()}, ${verifiedLabel}`;
@@ -129,21 +121,31 @@ const Device: React.FC<{
   );
 };
 
-const DevicesPreferences: React.FC<DevicesPreferencesProps> = ({
+interface DevicesPreferencesProps {
+  clientState: ClientState;
+  conversationState: ConversationState;
+  cryptographyRepository: CryptographyRepository;
+  removeDevice: (device: ClientEntity) => Promise<unknown>;
+  resetSession: (userId: QualifiedId, device: ClientEntity, conversation: Conversation) => Promise<void>;
+  selfUser: User;
+  verifyDevice: (userId: QualifiedId, device: ClientEntity, isVerified: boolean) => void;
+}
+
+const DevicesPreferences = ({
   clientState = container.resolve(ClientState),
-  userState = container.resolve(UserState),
   conversationState = container.resolve(ConversationState),
   cryptographyRepository,
   removeDevice,
   verifyDevice,
   resetSession,
-}) => {
+  selfUser,
+}: DevicesPreferencesProps) => {
   const [selectedDevice, setSelectedDevice] = useState<ClientEntity | undefined>();
-  const {clients, currentClient} = useKoSubscribableChildren(clientState, ['clients', 'currentClient']);
-  const {self} = useKoSubscribableChildren(userState, ['self']);
-  const isSSO = self?.isNoPasswordSSO;
+  const {clients} = useKoSubscribableChildren(clientState, ['clients']);
+  const currentClient = clientState.currentClient;
+  const isSSO = selfUser.isNoPasswordSSO;
   const getFingerprint = (device: ClientEntity) =>
-    cryptographyRepository.getRemoteFingerprint(self.qualifiedId, device.id);
+    cryptographyRepository.getRemoteFingerprint(selfUser.qualifiedId, device.id);
 
   const [localFingerprint, setLocalFingerprint] = useState('');
   useEffect(() => {
@@ -160,9 +162,9 @@ const DevicesPreferences: React.FC<DevicesPreferencesProps> = ({
           setSelectedDevice(undefined);
         }}
         onClose={() => setSelectedDevice(undefined)}
-        onVerify={(device, verified) => verifyDevice(self.qualifiedId, device, verified)}
+        onVerify={(device, verified) => verifyDevice(selfUser.qualifiedId, device, verified)}
         onResetSession={device =>
-          resetSession(self.qualifiedId, device, conversationState.getSelfProteusConversation())
+          resetSession(selfUser.qualifiedId, device, conversationState.getSelfProteusConversation())
         }
       />
     );
@@ -172,7 +174,7 @@ const DevicesPreferences: React.FC<DevicesPreferencesProps> = ({
     <PreferencesPage title={t('preferencesDevices')}>
       <fieldset className="preferences-section" data-uie-name="preferences-device-current">
         <legend className="preferences-header">{t('preferencesDevicesCurrent')}</legend>
-        <DetailedDevice device={currentClient} fingerprint={localFingerprint} />
+        {currentClient && <DetailedDevice device={currentClient} fingerprint={localFingerprint} />}
       </fieldset>
 
       <hr className="preferences-devices-separator preferences-separator" />
diff --git a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx
index 86d36e13893..f90f3facd63 100644
--- a/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx
+++ b/src/script/page/RightSidebar/AddParticipants/AddParticipants.tsx
@@ -68,6 +68,7 @@ interface AddParticipantsProps {
   teamRepository: TeamRepository;
   teamState: TeamState;
   userState: UserState;
+  selfUser: User;
 }
 const AddParticipants: FC<AddParticipantsProps> = ({
   activeConversation,
@@ -80,6 +81,7 @@ const AddParticipants: FC<AddParticipantsProps> = ({
   teamRepository,
   teamState,
   userState,
+  selfUser,
 }) => {
   const {
     firstUserEntity,
@@ -99,7 +101,7 @@ const AddParticipants: FC<AddParticipantsProps> = ({
     'participating_user_ids',
   ]);
   const {isTeam, teamMembers, teamUsers} = useKoSubscribableChildren(teamState, ['isTeam', 'teamMembers', 'teamUsers']);
-  const {connectedUsers, self: selfUser} = useKoSubscribableChildren(userState, ['connectedUsers', 'self']);
+  const {connectedUsers} = useKoSubscribableChildren(userState, ['connectedUsers']);
   const {teamRole} = useKoSubscribableChildren(selfUser, ['teamRole']);
   const {services} = useKoSubscribableChildren(integrationRepository, ['services']);
 
@@ -235,6 +237,7 @@ const AddParticipants: FC<AddParticipantsProps> = ({
               teamRepository={teamRepository}
               conversationRepository={conversationRepository}
               excludeUsers={participatingUserIds}
+              selfUser={selfUser}
               isSelectable
               allowRemoteSearch
             />
diff --git a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.test.tsx b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.test.tsx
new file mode 100644
index 00000000000..d082f529e1a
--- /dev/null
+++ b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.test.tsx
@@ -0,0 +1,157 @@
+/*
+ * Wire
+ * Copyright (C) 2019 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {act, render} from '@testing-library/react';
+import {CONVERSATION_TYPE} from '@wireapp/api-client/lib/conversation';
+
+import {Conversation} from 'src/script/entity/Conversation';
+import {createUuid} from 'Util/uuid';
+
+import {ConversationDetails} from './ConversationDetails';
+
+import {TestFactory} from '../../../../../test/helper/TestFactory';
+import {ConversationRepository} from '../../../conversation/ConversationRepository';
+import {ConversationRoleRepository} from '../../../conversation/ConversationRoleRepository';
+import {User} from '../../../entity/User';
+import {IntegrationRepository} from '../../../integration/IntegrationRepository';
+import {SearchRepository} from '../../../search/SearchRepository';
+import {TeamEntity} from '../../../team/TeamEntity';
+import {TeamRepository} from '../../../team/TeamRepository';
+import {TeamState} from '../../../team/TeamState';
+import {ActionsViewModel} from '../../../view_model/ActionsViewModel';
+
+jest.mock('Components/panel/EnrichedFields', () => ({
+  useEnrichedFields: () => [],
+  EnrichedFields: () => <div />,
+  __esModule: true,
+}));
+jest.mock('Components/panel/UserDetails', () => ({
+  UserDetails: () => <div />,
+  __esModule: true,
+}));
+
+const testFactory = new TestFactory();
+let conversationRepository: ConversationRepository;
+let searchRepository: SearchRepository;
+
+beforeAll(() => {
+  testFactory.exposeConversationActors().then(factory => {
+    conversationRepository = factory;
+    return conversationRepository;
+  });
+
+  testFactory.exposeSearchActors().then(factory => {
+    searchRepository = factory;
+    return searchRepository;
+  });
+});
+
+const getDefaultParams = () => {
+  const conversationRoleRepository: Partial<ConversationRoleRepository> = {
+    canAddParticipants: () => true,
+    canDeleteGroup: () => true,
+    canLeaveGroup: () => true,
+    canRenameGroup: () => true,
+    canToggleTimeout: () => true,
+    isUserGroupAdmin: () => true,
+  };
+
+  const selfUserMock = new User(createUuid());
+
+  return {
+    actionsViewModel: {
+      archiveConversation: async (activeConversation: Conversation) => Promise.resolve(),
+      blockUser: async (userEntity: User, hideConversation?: boolean, nextConversationEntity?: Conversation) =>
+        Promise.resolve(),
+      cancelConnectionRequest: (userEntity: User, hideConversation?: boolean, nextConversationEntity?: Conversation) =>
+        Promise.resolve(),
+      clearConversation: (activeConversation: Conversation) => {},
+      deleteConversation: async (activeConversation: Conversation) => Promise.resolve(),
+      leaveConversation: async (activeConversation: Conversation) => Promise.resolve(),
+      toggleMuteConversation: (conversationEntity: Conversation) => {},
+    } as ActionsViewModel,
+    conversationRepository: {
+      expectReadReceipt: () => true,
+      getNextConversation: () => Promise.resolve(new Conversation()),
+      refreshUnavailableParticipants: () => Promise.resolve(),
+      conversationRoleRepository: conversationRoleRepository as ConversationRoleRepository,
+    } as unknown as ConversationRepository,
+    integrationRepository: {getServiceFromUser: (): null => null} as unknown as IntegrationRepository,
+    isFederated: false,
+    isVisible: true,
+    searchRepository,
+    teamRepository: {
+      getRoleBadge: (userId: string) => '',
+      updateTeamMembersByIds: (teamEntity: TeamEntity, memberIds?: string[], append?: boolean) => Promise.resolve(),
+      isSelfConnectedTo: () => true,
+    } as unknown as TeamRepository,
+    teamState: new TeamState(),
+    selfUser: selfUserMock,
+  };
+};
+
+describe('ConversationDetails', () => {
+  it("returns the right actions depending on the conversation's type for non group creators", () => {
+    const conversation = new Conversation();
+    const otherUser = new User('other-user');
+    jest.spyOn(otherUser as any, 'isConnected').mockReturnValue(true);
+    jest.spyOn(conversation as any, 'isClearable').mockReturnValue(true);
+    conversation.participating_user_ets([otherUser]);
+
+    const defaultProps = getDefaultParams();
+
+    const {rerender, getByTestId} = render(<ConversationDetails {...defaultProps} activeConversation={conversation} />);
+
+    const tests = [
+      {
+        conversationType: CONVERSATION_TYPE.ONE_TO_ONE,
+        expected: ['go-create-group', 'do-archive', 'do-clear', 'do-block'],
+        permission: {canCreateGroupConversation: () => true},
+      },
+      {
+        conversationType: CONVERSATION_TYPE.ONE_TO_ONE,
+        expected: ['do-archive', 'do-clear', 'do-block'],
+        permission: {canCreateGroupConversation: () => false},
+      },
+      {
+        conversationType: CONVERSATION_TYPE.REGULAR,
+        expected: ['do-archive', 'do-clear', 'do-leave'],
+        permission: {canCreateGroupConversation: () => true},
+      },
+      {
+        conversationType: CONVERSATION_TYPE.CONNECT,
+        expected: ['do-archive', 'do-cancel-request', 'do-block'],
+        permission: {canCreateGroupConversation: () => true},
+      },
+    ];
+
+    return tests.forEach(({expected, permission, conversationType}) => {
+      act(() => {
+        conversation.type(conversationType);
+      });
+
+      rerender(<ConversationDetails {...defaultProps} activeConversation={conversation} />);
+
+      expected.forEach(action => {
+        const actionItem = getByTestId(action);
+        expect(actionItem).not.toBeNull();
+      });
+    });
+  });
+});
diff --git a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx
index 0f11cb26f23..8ba1633d693 100644
--- a/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx
+++ b/src/script/page/RightSidebar/ConversationDetails/ConversationDetails.tsx
@@ -54,7 +54,6 @@ import {TeamRepository} from '../../../team/TeamRepository';
 import {TeamState} from '../../../team/TeamState';
 import {Shortcut} from '../../../ui/Shortcut';
 import {ShortcutType} from '../../../ui/ShortcutType';
-import {UserState} from '../../../user/UserState';
 import {ActionsViewModel} from '../../../view_model/ActionsViewModel';
 import {PanelHeader} from '../PanelHeader';
 import {PanelEntity, PanelState} from '../RightSidebar';
@@ -65,8 +64,8 @@ const CONFIG = {
 };
 
 interface ConversationDetailsProps {
-  onClose: () => void;
-  togglePanel: (panel: PanelState, entity: PanelEntity, addMode?: boolean, direction?: 'left' | 'right') => void;
+  onClose?: () => void;
+  togglePanel?: (panel: PanelState, entity: PanelEntity, addMode?: boolean, direction?: 'left' | 'right') => void;
   actionsViewModel: ActionsViewModel;
   activeConversation: Conversation;
   conversationRepository: ConversationRepository;
@@ -74,15 +73,15 @@ interface ConversationDetailsProps {
   searchRepository: SearchRepository;
   teamRepository: TeamRepository;
   teamState: TeamState;
-  userState: UserState;
+  selfUser: User;
   isFederated?: boolean;
 }
 
 const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>(
   (
     {
-      onClose,
-      togglePanel,
+      onClose = () => {},
+      togglePanel = () => {},
       actionsViewModel,
       activeConversation,
       conversationRepository,
@@ -90,7 +89,7 @@ const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>
       searchRepository,
       teamRepository,
       teamState,
-      userState,
+      selfUser,
       isFederated = false,
     },
     ref,
@@ -155,8 +154,11 @@ const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>
       'team',
     ]);
 
-    const {self: selfUser, isActivatedAccount} = useKoSubscribableChildren(userState, ['self', 'isActivatedAccount']);
-    const {is_verified: isSelfVerified, teamRole} = useKoSubscribableChildren(selfUser, ['is_verified', 'teamRole']);
+    const {
+      is_verified: isSelfVerified,
+      teamRole,
+      isActivatedAccount,
+    } = useKoSubscribableChildren(selfUser, ['is_verified', 'teamRole', 'isActivatedAccount']);
 
     const isActiveGroupParticipant = isGroup && !removedFromConversation;
 
@@ -308,7 +310,6 @@ const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>
           {isSingleUserMode && !isServiceMode && firstParticipant && (
             <>
               <UserDetails
-                conversationDomain={activeConversation.domain}
                 participant={firstParticipant}
                 isVerified={isVerified}
                 isSelfVerified={isSelfVerified}
@@ -372,6 +373,7 @@ const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>
                       truncate
                       showEmptyAdmin
                       selfFirst={false}
+                      selfUser={selfUser}
                       noSelfInteraction
                     />
 
@@ -433,7 +435,11 @@ const ConversationDetails = forwardRef<HTMLDivElement, ConversationDetailsProps>
             <>
               <ConversationDetailsBottomActions
                 isDeviceActionEnabled={
-                  firstParticipant && (firstParticipant.isConnected() || firstParticipant.inTeam())
+                  !!(
+                    isSingleUserMode &&
+                    firstParticipant &&
+                    (firstParticipant.isConnected() || firstParticipant.inTeam())
+                  )
                 }
                 showDevices={openParticipantDevices}
                 showNotifications={showNotifications}
diff --git a/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts b/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts
index 1ddb49b2da6..697b0687e07 100644
--- a/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts
+++ b/src/script/page/RightSidebar/ConversationDetails/utils/getConversationActions.ts
@@ -47,7 +47,7 @@ const getConversationActions = (
   const isSingleUser = is1to1Action || conversationEntity.isRequest();
   const userEntity = conversationEntity.firstUserEntity();
 
-  const nextConversationEntity = conversationRepository.getNextConversation(conversationEntity);
+  const getNextConversation = () => conversationRepository.getNextConversation(conversationEntity);
   const userPermissions = UserPermission.generatePermissionHelpers(teamRole);
 
   const allMenuElements = [
@@ -72,7 +72,7 @@ const getConversationActions = (
     {
       condition: conversationEntity.isRequest(),
       item: {
-        click: async () => actionsViewModel.cancelConnectionRequest(userEntity, true, nextConversationEntity),
+        click: async () => actionsViewModel.cancelConnectionRequest(userEntity, true, getNextConversation()),
         icon: 'close-icon',
         identifier: 'do-cancel-request',
         label: t('conversationDetailsActionCancelRequest'),
@@ -90,7 +90,7 @@ const getConversationActions = (
     {
       condition: isSingleUser && (userEntity?.isConnected() || userEntity?.isRequest()),
       item: {
-        click: () => actionsViewModel.blockUser(userEntity, true, nextConversationEntity),
+        click: () => actionsViewModel.blockUser(userEntity, true, getNextConversation()),
         icon: 'block-icon',
         identifier: 'do-block',
         label: t('conversationDetailsActionBlock'),
diff --git a/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx b/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx
index e97b89a7a36..65ded3f7d2b 100644
--- a/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx
+++ b/src/script/page/RightSidebar/ConversationParticipants/ConversationParticipants.tsx
@@ -113,6 +113,7 @@ const ConversationParticipants: FC<ConversationParticipantsProps> = ({
             conversationRepository={conversationRepository}
             conversation={activeConversation}
             selfFirst={false}
+            selfUser={selfUser}
             noSelfInteraction
           />
         </FadingScrollbar>
diff --git a/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx b/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx
index 1bcd5872004..ecd09f90b1a 100644
--- a/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx
+++ b/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx
@@ -34,7 +34,6 @@ import {User} from '../../../entity/User';
 import {IntegrationRepository} from '../../../integration/IntegrationRepository';
 import {ServiceEntity} from '../../../integration/ServiceEntity';
 import {generatePermissionHelpers} from '../../../user/UserPermission';
-import {UserState} from '../../../user/UserState';
 import {ActionsViewModel} from '../../../view_model/ActionsViewModel';
 import {PanelHeader} from '../PanelHeader';
 
@@ -42,12 +41,13 @@ interface GroupParticipantServiceProps {
   activeConversation: Conversation;
   actionsViewModel: ActionsViewModel;
   integrationRepository: IntegrationRepository;
+  enableRemove: boolean;
   goToRoot: () => void;
   onBack: () => void;
   onClose: () => void;
   serviceEntity: ServiceEntity;
   userEntity: User;
-  userState: UserState;
+  selfUser: User;
   isAddMode?: boolean;
 }
 
@@ -55,12 +55,13 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
   activeConversation,
   actionsViewModel,
   integrationRepository,
+  enableRemove,
   goToRoot,
   onBack,
   onClose,
   serviceEntity,
   userEntity,
-  userState,
+  selfUser,
   isAddMode = false,
 }) => {
   const {
@@ -68,10 +69,9 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
     isActiveParticipant,
     participating_user_ids: participatingUserIds,
   } = useKoSubscribableChildren(activeConversation, ['inTeam', 'isActiveParticipant', 'participating_user_ids']);
-  const {self: selfUser} = useKoSubscribableChildren(userState, ['self']);
   const {teamRole} = useKoSubscribableChildren(selfUser, ['teamRole']);
 
-  const {canChatWithServices, canUpdateGroupParticipants} = generatePermissionHelpers(teamRole);
+  const {canChatWithServices} = generatePermissionHelpers(teamRole);
 
   const selectedInConversation = participatingUserIds.some(user => matchQualifiedIds(userEntity, user));
 
@@ -119,7 +119,7 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
           </div>
         )}
 
-        {showActions && canUpdateGroupParticipants() && (
+        {showActions && enableRemove && (
           <div
             role="button"
             tabIndex={TabIndex.FOCUSABLE}
diff --git a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx
index 18bf3e23fda..a4c07e3919f 100644
--- a/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx
+++ b/src/script/page/RightSidebar/GroupParticipantUser/GroupParticipantUser.tsx
@@ -42,7 +42,6 @@ import {User} from '../../../entity/User';
 import {ClientEvent} from '../../../event/Client';
 import {TeamRepository} from '../../../team/TeamRepository';
 import {TeamState} from '../../../team/TeamState';
-import {UserState} from '../../../user/UserState';
 import {ActionsViewModel} from '../../../view_model/ActionsViewModel';
 import {PanelHeader} from '../PanelHeader';
 import {PanelEntity} from '../RightSidebar';
@@ -58,7 +57,7 @@ interface GroupParticipantUserProps {
   conversationRoleRepository: ConversationRoleRepository;
   teamRepository: TeamRepository;
   teamState: TeamState;
-  userState: UserState;
+  selfUser: User;
   isFederated?: boolean;
 }
 
@@ -73,18 +72,20 @@ const GroupParticipantUser: FC<GroupParticipantUserProps> = ({
   conversationRoleRepository,
   teamRepository,
   teamState,
-  userState,
+  selfUser,
   isFederated = false,
 }) => {
   const {isGroup, roles} = useKoSubscribableChildren(activeConversation, ['isGroup', 'roles']);
-  const {isTemporaryGuest} = useKoSubscribableChildren(currentUser, ['isTemporaryGuest']);
+  const {isTemporaryGuest, isAvailable} = useKoSubscribableChildren(currentUser, ['isTemporaryGuest', 'isAvailable']);
   const {classifiedDomains, isTeam, team} = useKoSubscribableChildren(teamState, [
     'classifiedDomains',
     'isTeam',
     'team',
   ]);
-  const {isActivatedAccount, self: selfUser} = useKoSubscribableChildren(userState, ['isActivatedAccount', 'self']);
-  const {is_verified: isSelfVerified} = useKoSubscribableChildren(selfUser, ['is_verified']);
+  const {is_verified: isSelfVerified, isActivatedAccount} = useKoSubscribableChildren(selfUser, [
+    'is_verified',
+    'isActivatedAccount',
+  ]);
 
   const canChangeRole =
     conversationRoleRepository.canChangeParticipantRoles(activeConversation) && !currentUser.isMe && !isTemporaryGuest;
@@ -148,7 +149,6 @@ const GroupParticipantUser: FC<GroupParticipantUserProps> = ({
 
       <FadingScrollbar className="panel__content">
         <UserDetails
-          conversationDomain={activeConversation.domain}
           participant={currentUser}
           badge={teamRepository.getRoleBadge(currentUser.id)}
           isGroupAdmin={isAdmin}
@@ -156,7 +156,7 @@ const GroupParticipantUser: FC<GroupParticipantUserProps> = ({
           classifiedDomains={classifiedDomains}
         />
 
-        {!currentUser.isMe && (
+        {!currentUser.isMe && isAvailable && (
           <div className="conversation-details__devices">
             <button
               className="panel__action-item"
@@ -176,7 +176,7 @@ const GroupParticipantUser: FC<GroupParticipantUserProps> = ({
           </div>
         )}
 
-        {canChangeRole && (
+        {canChangeRole && isAvailable && (
           <>
             <div className="conversation-details__admin">
               <div
diff --git a/src/script/page/RightSidebar/GuestServicesOptions/GuestServicesOptions.tsx b/src/script/page/RightSidebar/GuestServicesOptions/GuestServicesOptions.tsx
index 89ba7b4aa4f..0bd28a9a47a 100644
--- a/src/script/page/RightSidebar/GuestServicesOptions/GuestServicesOptions.tsx
+++ b/src/script/page/RightSidebar/GuestServicesOptions/GuestServicesOptions.tsx
@@ -89,11 +89,11 @@ const GuestServicesOptions: FC<GuestServicesOptionsProps> = ({
         preventClose: true,
         primaryAction: {
           action: changeAccessState,
-          text: t('modalConversationRemoveAction'),
+          text: t('modalConversationRemoveGuestsOrServicesAction'),
         },
         text: {
           message,
-          title: t('modalConversationRemoveGuestsAndServicesHeadline'),
+          title: isGuest ? t('modalConversationRemoveGuestsHeadline') : t('modalConversationRemoveServicesHeadline'),
         },
       });
     }
diff --git a/src/script/page/MainContent/panels/preferences/components/PreferencesLink.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.styles.ts
similarity index 61%
rename from src/script/page/MainContent/panels/preferences/components/PreferencesLink.tsx
rename to src/script/page/RightSidebar/MessageDetails/MessageDetails.styles.ts
index 4c0ec91e7c6..2b59f4b9d98 100644
--- a/src/script/page/MainContent/panels/preferences/components/PreferencesLink.tsx
+++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.styles.ts
@@ -1,6 +1,6 @@
 /*
  * Wire
- * Copyright (C) 2021 Wire Swiss GmbH
+ * Copyright (C) 2023 Wire Swiss GmbH
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,18 +17,17 @@
  *
  */
 
-import React from 'react';
+import {CSSObject} from '@emotion/react';
 
-interface PreferencesLinkProps {
-  children: React.ReactNode;
-  href: string;
-  uie?: string;
-}
-
-const PreferencesLink: React.FC<PreferencesLinkProps> = ({href, uie, children}) => (
-  <a className="preferences-link" href={href} rel="nofollow noopener noreferrer" target="_blank" data-uie-name={uie}>
-    {children}
-  </a>
-);
-
-export {PreferencesLink};
+export const panelContentTitleStyles: CSSObject = {
+  display: 'inline-flex',
+  paddingLeft: 20,
+  borderBottom: '1px solid var(--sidebar-border-color)',
+  marginTop: 20,
+  span: {
+    color: 'var(--text-input-placeholder)',
+    fontSize: 'var(--font-size-medium)',
+    lineHeight: 'var(--line-height-lg)',
+    letterSpacing: '0.5px',
+  },
+};
diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx
index 27e4275cf3d..56e56bf67e4 100644
--- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx
+++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.test.tsx
@@ -49,21 +49,22 @@ beforeAll(() => {
   });
 });
 
-const getDefaultParams = (showLikes: boolean = false) => {
+const getDefaultParams = (showReactions: boolean = false) => {
   return {
     conversationRepository,
     onClose: jest.fn(),
     searchRepository,
-    showLikes,
+    showReactions,
     teamRepository: {
       conversationHasGuestLinkEnabled: async (conversationId: string) => true,
-    } as TeamRepository,
+      isSelfConnectedTo: () => false,
+    } as unknown as TeamRepository,
     updateEntity: jest.fn(),
   };
 };
 
 describe('MessageDetails', () => {
-  it('renders no likes view', async () => {
+  it('renders no reactions view', async () => {
     const conversation = new Conversation();
     conversation.team_id = 'mock-team-id';
 
@@ -77,8 +78,8 @@ describe('MessageDetails', () => {
     message.timestamp(timestamp);
     message.user(user);
 
-    const getUsersById = jest.fn(async (qid: QualifiedId) => {
-      return [new User('mock-id', 'test-domain.mock')];
+    const getUsersById = jest.fn(async (ids: QualifiedId[]) => {
+      return ids.map(id => new User(id.id, 'test-domain.mock'));
     });
 
     const userRepository = {
@@ -89,6 +90,7 @@ describe('MessageDetails', () => {
     const {getByText} = render(
       <MessageDetails
         {...defaultProps}
+        selfUser={new User()}
         togglePanel={() => undefined}
         activeConversation={conversation}
         messageEntity={message}
@@ -97,9 +99,9 @@ describe('MessageDetails', () => {
     );
 
     await waitFor(() => {
-      getByText('messageDetailsNoLikes');
+      getByText('messageDetailsNoReactions');
     });
 
-    expect(getByText('messageDetailsNoLikes')).not.toBeNull();
+    expect(getByText('messageDetailsNoReactions')).not.toBeNull();
   });
 });
diff --git a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx
index 34d98ad0c37..c39aa5c8c5f 100644
--- a/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx
+++ b/src/script/page/RightSidebar/MessageDetails/MessageDetails.tsx
@@ -17,7 +17,7 @@
  *
  */
 
-import {FC, useCallback, useEffect, useMemo, useState} from 'react';
+import {FC, Fragment, useCallback, useEffect, useMemo, useState} from 'react';
 
 import type {QualifiedId} from '@wireapp/api-client/lib/user/';
 import {amplify} from 'amplify';
@@ -27,11 +27,21 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {FadingScrollbar} from 'Components/FadingScrollbar';
 import {Icon} from 'Components/Icon';
+import {EmojiImg} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/EmojiImg';
+import {
+  messageReactionDetailsMargin,
+  reactionsCountAlignment,
+} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageReactions/MessageReactions.styles';
 import {UserSearchableList} from 'Components/UserSearchableList';
 import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {getEmojiTitleFromEmojiUnicode, getEmojiUnicode} from 'Util/EmojiUtil';
 import {t} from 'Util/LocalizerUtil';
+import {getEmojiUrl, groupByReactionUsers} from 'Util/ReactionUtil';
+import {capitalizeFirstChar} from 'Util/StringUtil';
 import {formatLocale} from 'Util/TimeUtil';
 
+import {panelContentTitleStyles} from './MessageDetails.styles';
+
 import {ConversationRepository} from '../../../conversation/ConversationRepository';
 import {Conversation} from '../../../entity/Conversation';
 import {ContentMessage} from '../../../entity/message/ContentMessage';
@@ -47,8 +57,8 @@ import {PanelHeader} from '../PanelHeader';
 import {PanelEntity, PanelState} from '../RightSidebar';
 
 const MESSAGE_STATES = {
-  LIKES: 'likes',
-  NO_LIKES: 'no-likes',
+  REACTIONS: 'reactions',
+  NO_REACTIONS: 'no-reactions',
   NO_RECEIPTS: 'no-receipts',
   RECEIPTS: 'receipts',
   RECEIPTS_OFF: 'receipts-off',
@@ -56,6 +66,19 @@ const MESSAGE_STATES = {
 
 const formatUserCount = (users: User[]): string => (users.length ? ` (${users.length})` : '');
 
+const getTotalReactionUsersCount = (reactions: Map<string, User[]>): number => {
+  let total = 0;
+  reactions.forEach(reaction => {
+    total += reaction.length;
+  });
+  return total;
+};
+
+const formatReactionCount = (reactions: Map<string, User[]>): string => {
+  const total = getTotalReactionUsersCount(reactions);
+  return total ? ` (${total})` : '';
+};
+
 const sortUsers = (userA: User, userB: User): number =>
   userA.name().localeCompare(userB.name(), undefined, {sensitivity: 'base'});
 
@@ -69,7 +92,8 @@ interface MessageDetailsProps {
   teamRepository: TeamRepository;
   searchRepository: SearchRepository;
   userRepository: UserRepository;
-  showLikes?: boolean;
+  showReactions?: boolean;
+  selfUser: User;
   updateEntity: (message: Message) => void;
   togglePanel: (state: PanelState, entity: PanelEntity, addMode?: boolean) => void;
 }
@@ -80,17 +104,18 @@ const MessageDetails: FC<MessageDetailsProps> = ({
   messageEntity,
   teamRepository,
   searchRepository,
-  showLikes = false,
+  showReactions = false,
   userRepository,
+  selfUser,
   onClose,
   updateEntity,
   togglePanel,
 }) => {
   const [receiptUsers, setReceiptUsers] = useState<User[]>([]);
-  const [likeUsers, setLikeUsers] = useState<User[]>([]);
+  const [reactionUsers, setReactionUsers] = useState<Map<string, User[]>>(new Map());
   const [messageId, setMessageId] = useState<string>(messageEntity.id);
 
-  const [isReceiptsOpen, setIsReceiptsOpen] = useState<boolean>(!showLikes);
+  const [isReceiptsOpen, setIsReceiptsOpen] = useState<boolean>(!showReactions);
 
   const {
     timestamp,
@@ -103,7 +128,7 @@ const MessageDetails: FC<MessageDetailsProps> = ({
   const teamId = activeConversation.team_id;
   const supportsReceipts = messageSender.isMe && teamId;
 
-  const supportsLikes = useMemo(() => {
+  const supportsReactions = useMemo(() => {
     const isPing = messageEntity.super_type === SuperType.PING;
     const isEphemeral = messageEntity?.isEphemeral();
 
@@ -119,15 +144,28 @@ const MessageDetails: FC<MessageDetailsProps> = ({
       return receiptUsers.length ? MESSAGE_STATES.RECEIPTS : MESSAGE_STATES.NO_RECEIPTS;
     }
 
-    return likeUsers.length ? MESSAGE_STATES.LIKES : MESSAGE_STATES.NO_LIKES;
-  }, [supportsReceipts, isReceiptsOpen, messageEntity, receiptUsers, likeUsers]);
-
-  const getLikes = useCallback(async (reactions: UserReactionMap) => {
-    const currentLikes = Object.keys(reactions);
-    const usersLikes = await userRepository.getUsersById(currentLikes.map(likeId => ({domain: '', id: likeId})));
-    const sortedUsersLikes = usersLikes.sort(sortUsers);
+    return getTotalReactionUsersCount(reactionUsers) ? MESSAGE_STATES.REACTIONS : MESSAGE_STATES.NO_REACTIONS;
+  }, [supportsReceipts, isReceiptsOpen, messageEntity, receiptUsers, reactionUsers]);
+
+  const getReactions = useCallback(async (reactions: UserReactionMap) => {
+    const usersMap = new Map<string, User>();
+    const currentReactions = Object.keys(reactions);
+    const usersReactions = await userRepository.getUsersById(
+      currentReactions.map(userId => ({domain: '', id: userId})),
+    );
+    usersReactions.forEach(user => {
+      usersMap.set(user.id, user);
+    });
+    const reactionsGroupByUser = groupByReactionUsers(reactions);
+    const reactionsGroupByUserMap = new Map<string, User[]>();
+    reactionsGroupByUser.forEach((userIds, reaction) => {
+      reactionsGroupByUserMap.set(
+        reaction,
+        userIds.map(userId => usersMap.get(userId)!),
+      );
+    });
 
-    setLikeUsers(sortedUsersLikes);
+    setReactionUsers(reactionsGroupByUserMap);
   }, []);
 
   const receiptTimes = useMemo(() => {
@@ -148,33 +186,33 @@ const MessageDetails: FC<MessageDetailsProps> = ({
     'messageDetailsTitleReceipts',
     messageEntity?.expectsReadConfirmation ? formatUserCount(receiptUsers) : '',
   );
-  const likesTitle = t('messageDetailsTitleLikes', formatUserCount(likeUsers));
+  const reactionsTitle = t('messageDetailsTitleReactions', formatReactionCount(reactionUsers));
 
   const panelTitle = useMemo(() => {
     if (!supportsReceipts) {
-      return likesTitle;
+      return reactionsTitle;
     }
 
-    if (!supportsLikes) {
+    if (!supportsReactions) {
       return receiptsTitle;
     }
 
     return t('messageDetailsTitle');
-  }, [supportsReceipts, supportsLikes, likesTitle, receiptsTitle]);
+  }, [supportsReceipts, supportsReactions, reactionsTitle, receiptsTitle]);
 
-  const showTabs = supportsReceipts && supportsLikes;
+  const showTabs = supportsReceipts && supportsReactions;
 
   const editedFooter = editedTimestamp ? formatTime(editedTimestamp) : '';
 
   const onReceipts = () => setIsReceiptsOpen(true);
 
-  const onLikes = () => setIsReceiptsOpen(false);
+  const onReactions = () => setIsReceiptsOpen(false);
 
   useEffect(() => {
-    if (supportsLikes && reactions) {
-      getLikes(reactions);
+    if (supportsReactions && reactions) {
+      getReactions(reactions);
     }
-  }, [getLikes, supportsLikes, reactions]);
+  }, [getReactions, supportsReactions, reactions]);
 
   useEffect(() => {
     amplify.subscribe(WebAppEvents.CONVERSATION.MESSAGE.UPDATED, (oldId: string, updatedMessageEntity: Message) => {
@@ -184,13 +222,13 @@ const MessageDetails: FC<MessageDetailsProps> = ({
         updateEntity(updatedMessageEntity);
         setMessageId(updatedMessageEntity.id);
 
-        if (supportsLikes && isContentMessage(updatedMessageEntity)) {
+        if (supportsReactions && isContentMessage(updatedMessageEntity)) {
           const messageReactions = updatedMessageEntity.reactions();
-          getLikes(messageReactions);
+          getReactions(messageReactions);
         }
       }
     });
-  }, [messageId, supportsLikes]);
+  }, [messageId, supportsReactions]);
 
   const onParticipantClick = (userEntity: User) => togglePanel(PanelState.GROUP_PARTICIPANT_USER, userEntity);
 
@@ -205,6 +243,13 @@ const MessageDetails: FC<MessageDetailsProps> = ({
 
       {showTabs && (
         <div className="panel__tabs">
+          <button
+            className={cx('panel__tab button-reset-default', {'panel__tab--active': !isReceiptsOpen})}
+            onClick={onReactions}
+            data-uie-name="message-details-reaction-tab"
+          >
+            {reactionsTitle}
+          </button>
           <button
             className={cx('panel__tab button-reset-default', {'panel__tab--active': isReceiptsOpen})}
             onClick={onReceipts}
@@ -212,13 +257,6 @@ const MessageDetails: FC<MessageDetailsProps> = ({
           >
             {receiptsTitle}
           </button>
-          <button
-            className={cx('panel__tab button-reset-default', {'panel__tab--active': !isReceiptsOpen})}
-            onClick={onLikes}
-            data-uie-name="message-details-like-tab"
-          >
-            {likesTitle}
-          </button>
         </div>
       )}
 
@@ -226,6 +264,7 @@ const MessageDetails: FC<MessageDetailsProps> = ({
         {messageState === MESSAGE_STATES.RECEIPTS && (
           <UserSearchableList
             dataUieName="read-list"
+            selfUser={selfUser}
             users={receiptUsers}
             infos={receiptTimes}
             noUnderline
@@ -236,17 +275,35 @@ const MessageDetails: FC<MessageDetailsProps> = ({
           />
         )}
 
-        {messageState === MESSAGE_STATES.LIKES && (
-          <UserSearchableList
-            dataUieName="like-list"
-            users={likeUsers}
-            noUnderline
-            conversationRepository={conversationRepository}
-            searchRepository={searchRepository}
-            teamRepository={teamRepository}
-            onClick={onParticipantClick}
-          />
-        )}
+        {messageState === MESSAGE_STATES.REACTIONS &&
+          Array.from(reactionUsers).map(reactions => {
+            const [reactionKey, users] = reactions;
+            const emojiUnicode = getEmojiUnicode(reactionKey);
+            const emojiUrl = getEmojiUrl(emojiUnicode);
+            const emojiName = getEmojiTitleFromEmojiUnicode(emojiUnicode);
+            const capitalizedEmojiName = capitalizeFirstChar(emojiName);
+            const emojiCount = users.length;
+            return (
+              <Fragment key={reactionKey}>
+                <div css={panelContentTitleStyles} className="font-weight-bold">
+                  <EmojiImg emojiUrl={emojiUrl} emojiName={emojiName} styles={messageReactionDetailsMargin} />
+                  <span css={messageReactionDetailsMargin}>{capitalizedEmojiName}</span>
+                  <span css={reactionsCountAlignment}>({emojiCount})</span>
+                </div>
+                <UserSearchableList
+                  selfUser={selfUser}
+                  key={reactionKey}
+                  dataUieName="reaction-list"
+                  users={users}
+                  noUnderline
+                  conversationRepository={conversationRepository}
+                  searchRepository={searchRepository}
+                  teamRepository={teamRepository}
+                  onClick={onParticipantClick}
+                />
+              </Fragment>
+            );
+          })}
 
         {messageState === MESSAGE_STATES.NO_RECEIPTS && (
           <div className="message-details__empty" data-uie-name="message-details-no-receipts-placeholder">
@@ -255,10 +312,10 @@ const MessageDetails: FC<MessageDetailsProps> = ({
           </div>
         )}
 
-        {messageState === MESSAGE_STATES.NO_LIKES && (
-          <div className="message-details__empty" data-uie-name="message-details-no-likes-placeholder">
+        {messageState === MESSAGE_STATES.NO_REACTIONS && (
+          <div className="message-details__empty" data-uie-name="message-details-no-reactions-placeholder">
             <Icon.Like className="message-details__empty__icon" />
-            <p className="message-details__empty__text">{t('messageDetailsNoLikes')}</p>
+            <p className="message-details__empty__text">{t('messageDetailsNoReactions')}</p>
           </div>
         )}
 
diff --git a/src/script/page/RightSidebar/RightSidebar.tsx b/src/script/page/RightSidebar/RightSidebar.tsx
index 5e920cbd0c0..fd94d94ffc9 100644
--- a/src/script/page/RightSidebar/RightSidebar.tsx
+++ b/src/script/page/RightSidebar/RightSidebar.tsx
@@ -86,6 +86,7 @@ interface RightSidebarProps {
   repositories: ViewModelRepositories;
   teamState: TeamState;
   userState: UserState;
+  selfUser: User;
   isFederated: boolean;
   lastViewedMessageDetailsEntity: Message | null;
   core?: Core;
@@ -97,6 +98,7 @@ const RightSidebar: FC<RightSidebarProps> = ({
   repositories,
   teamState,
   userState,
+  selfUser,
   isFederated,
   lastViewedMessageDetailsEntity,
   core = container.resolve(Core),
@@ -209,7 +211,7 @@ const RightSidebar: FC<RightSidebarProps> = ({
               searchRepository={searchRepository}
               teamRepository={teamRepository}
               teamState={teamState}
-              userState={userState}
+              selfUser={selfUser}
               isFederated={isFederated}
             />
           )}
@@ -226,7 +228,7 @@ const RightSidebar: FC<RightSidebarProps> = ({
               conversationRoleRepository={conversationRoleRepository}
               teamRepository={teamRepository}
               teamState={teamState}
-              userState={userState}
+              selfUser={selfUser}
               isFederated={isFederated}
             />
           )}
@@ -277,12 +279,13 @@ const RightSidebar: FC<RightSidebarProps> = ({
               activeConversation={activeConversation}
               actionsViewModel={actionsViewModel}
               integrationRepository={integrationRepository}
+              enableRemove={conversationRoleRepository.canRemoveParticipants(activeConversation)}
               goToRoot={goToRoot}
               onBack={onBackClick}
               onClose={closePanel}
               serviceEntity={serviceEntity}
               userEntity={userServiceEntity}
-              userState={userState}
+              selfUser={selfUser}
               isAddMode={isAddMode}
             />
           )}
@@ -299,18 +302,20 @@ const RightSidebar: FC<RightSidebarProps> = ({
               teamRepository={teamRepository}
               teamState={teamState}
               userState={userState}
+              selfUser={selfUser}
             />
           )}
 
           {currentState === PanelState.MESSAGE_DETAILS && messageEntity && (
             <MessageDetails
               activeConversation={activeConversation}
+              selfUser={selfUser}
               conversationRepository={conversationRepository}
               messageEntity={messageEntity}
               updateEntity={rightSidebar.updateEntity}
               teamRepository={teamRepository}
               searchRepository={searchRepository}
-              showLikes={rightSidebar.showLikes}
+              showReactions={rightSidebar.showReactions}
               userRepository={userRepository}
               onClose={closePanel}
               togglePanel={togglePanel}
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/FeatureConfigChangeHandler.tsx b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/FeatureConfigChangeHandler.tsx
new file mode 100644
index 00000000000..9134572315c
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/FeatureConfigChangeHandler.tsx
@@ -0,0 +1,46 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect} from 'react';
+
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {getLogger} from 'Util/Logger';
+
+import {handleE2EIdentityFeatureChange} from './Features/E2EIdentity';
+
+import {TeamState} from '../../../../team/TeamState';
+
+const logger = getLogger('FeatureConfigChangeHandler');
+
+type Props = {
+  teamState: TeamState;
+};
+
+export function FeatureConfigChangeHandler({teamState}: Props): null {
+  const {teamFeatures: config} = useKoSubscribableChildren(teamState, ['teamFeatures']);
+
+  useEffect(() => {
+    if (config) {
+      // initialize feature handlers
+      handleE2EIdentityFeatureChange(logger, config);
+    }
+  }, [config]);
+
+  return null;
+}
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/Features/E2EIdentity.ts b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/Features/E2EIdentity.ts
new file mode 100644
index 00000000000..8e5344cf84e
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeHandler/Features/E2EIdentity.ts
@@ -0,0 +1,54 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FeatureStatus, FEATURE_KEY, FeatureList} from '@wireapp/api-client/lib/team';
+
+import {E2EIHandler} from 'src/script/E2EIdentity';
+import {Logger} from 'Util/Logger';
+
+import {isFeatureMLSE2EI, isFeatureMLS} from '../../guards';
+
+export const handleE2EIdentityFeatureChange = (logger: Logger, config: FeatureList) => {
+  const e2eiConfig = config[FEATURE_KEY.MLSE2EID];
+  const mlsConfig = config[FEATURE_KEY.MLS];
+  // Check if MLS or MLS E2EIdentity feature is existent
+  if (!isFeatureMLSE2EI(e2eiConfig) && !isFeatureMLS(mlsConfig)) {
+    return;
+  }
+
+  // Check if E2EIdentity feature is enabled
+  if (e2eiConfig?.status === FeatureStatus.ENABLED) {
+    // Check if MLS feature is enabled
+    if (mlsConfig?.status !== FeatureStatus.ENABLED) {
+      logger.info('Warning: E2EIdentity feature enabled but MLS feature is not active');
+      return;
+    }
+    // Check if E2EIdentity feature has a server discoveryUrl
+    if (!e2eiConfig.config || !e2eiConfig.config.acmeDiscoveryUrl || e2eiConfig.config.acmeDiscoveryUrl.length <= 0) {
+      logger.info('Warning: E2EIdentity feature enabled but no discoveryUrl provided');
+      return;
+    }
+    // Either get the current E2EIdentity handler instance or create a new one
+    const e2eHandler = E2EIHandler.getInstance({
+      discoveryUrl: e2eiConfig.config.acmeDiscoveryUrl!,
+      gracePeriodInMS: e2eiConfig.config.verificationExpiration,
+    });
+    e2eHandler.initialize();
+  }
+};
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.store.ts b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.store.ts
new file mode 100644
index 00000000000..0718192a21a
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.store.ts
@@ -0,0 +1,36 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import type {FeatureList} from '@wireapp/api-client/lib/team/feature/';
+
+const LOCAL_STORAGE_FEATURE_CONFIG_KEY = 'FEATURE_CONFIG_KEY';
+
+export function loadFeatureConfig(selfUserId: string): FeatureList | undefined {
+  const featureConfigs: {[selfId: string]: FeatureList} = JSON.parse(
+    window.localStorage.getItem(LOCAL_STORAGE_FEATURE_CONFIG_KEY) ?? '{}',
+  );
+  if (featureConfigs && featureConfigs[selfUserId]) {
+    return featureConfigs[selfUserId];
+  }
+  return undefined;
+}
+
+export function saveFeatureConfig(selfUserId: string, featureConfigList: FeatureList): void {
+  window.localStorage.setItem(LOCAL_STORAGE_FEATURE_CONFIG_KEY, JSON.stringify({[selfUserId]: featureConfigList}));
+}
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.test.tsx b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.test.tsx
new file mode 100644
index 00000000000..0cc5ba32cf6
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.test.tsx
@@ -0,0 +1,189 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {act, render, waitFor} from '@testing-library/react';
+import {FeatureStatus, FEATURE_KEY} from '@wireapp/api-client/lib/team/feature';
+
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import en from 'I18n/en-US.json';
+import {setStrings} from 'Util/LocalizerUtil';
+
+import {FeatureConfigChangeNotifier} from './FeatureConfigChangeNotifier';
+
+import {TeamState} from '../../../../team/TeamState';
+
+setStrings({en});
+
+describe('FeatureConfigChangeNotifier', () => {
+  const showModalSpy = jest.spyOn(PrimaryModal, 'show');
+
+  beforeEach(() => {
+    showModalSpy.mockClear();
+    localStorage.clear();
+  });
+
+  const baseConfig = {
+    [FEATURE_KEY.FILE_SHARING]: {
+      status: FeatureStatus.DISABLED,
+    },
+    [FEATURE_KEY.VIDEO_CALLING]: {
+      status: FeatureStatus.DISABLED,
+    },
+    [FEATURE_KEY.SELF_DELETING_MESSAGES]: {
+      status: FeatureStatus.DISABLED,
+      config: {enforcedTimeoutSeconds: 0},
+    },
+    [FEATURE_KEY.CONFERENCE_CALLING]: {
+      status: FeatureStatus.DISABLED,
+    },
+    [FEATURE_KEY.CONVERSATION_GUEST_LINKS]: {
+      status: FeatureStatus.DISABLED,
+    },
+  };
+
+  it.each([
+    [
+      FEATURE_KEY.FILE_SHARING,
+      'Sharing and receiving files of any type is now enabled',
+      'Sharing and receiving files of any type is now disabled',
+    ],
+    [FEATURE_KEY.VIDEO_CALLING, 'Camera in calls is enabled', 'Camera in calls is disabled'],
+    [
+      FEATURE_KEY.CONFERENCE_CALLING,
+      'Your team was upgraded to  Enterprise, which gives you access to features such as conference calls and more. <a href="undefined" data-uie-name="read-more-pricing" class="modal__text__read-more" rel="nofollow noopener noreferrer" target="_blank">Learn more about  Enterprise</a>',
+      undefined,
+    ],
+    [
+      FEATURE_KEY.CONVERSATION_GUEST_LINKS,
+      'Generating guest links is now enabled for all group admins.',
+      'Generating guest links is now disabled for all group admins.',
+    ],
+  ] as const)('shows a modal when feature %s is turned on and off', async (feature, enabledString, disabledString) => {
+    const teamState = new TeamState();
+    render(<FeatureConfigChangeNotifier selfUserId={'self'} teamState={teamState} />);
+    act(() => {
+      teamState.teamFeatures(baseConfig);
+    });
+
+    act(() => {
+      teamState.teamFeatures({
+        ...baseConfig,
+        [feature]: {
+          status: FeatureStatus.ENABLED,
+        },
+      });
+    });
+
+    await waitFor(() => {
+      expect(showModalSpy).toHaveBeenCalledTimes(1);
+      expect(showModalSpy).toHaveBeenCalledWith(PrimaryModal.type.ACKNOWLEDGE, {
+        text: expect.objectContaining({
+          htmlMessage: enabledString,
+        }),
+      });
+    });
+
+    act(() => {
+      teamState.teamFeatures({
+        ...baseConfig,
+        [feature]: {
+          status: FeatureStatus.DISABLED,
+        },
+      });
+    });
+
+    if (!disabledString) {
+      expect(showModalSpy).toHaveBeenCalledTimes(1);
+    } else {
+      await waitFor(() => {
+        expect(showModalSpy).toHaveBeenCalledTimes(2);
+        expect(showModalSpy).toHaveBeenCalledWith(PrimaryModal.type.ACKNOWLEDGE, {
+          text: expect.objectContaining({
+            htmlMessage: disabledString,
+          }),
+        });
+      });
+    }
+  });
+
+  it('saves previous state of feature and warn of feature change at mount time', async () => {
+    const teamState = new TeamState();
+    teamState.teamFeatures(baseConfig);
+
+    const {unmount} = render(<FeatureConfigChangeNotifier selfUserId={'self'} teamState={teamState} />);
+
+    unmount();
+    expect(showModalSpy).not.toHaveBeenCalled();
+
+    teamState.teamFeatures({...baseConfig, [FEATURE_KEY.FILE_SHARING]: {status: FeatureStatus.ENABLED}});
+    render(<FeatureConfigChangeNotifier selfUserId={'self'} teamState={teamState} />);
+    expect(showModalSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it.each([
+    [
+      {status: FeatureStatus.DISABLED, config: {enforcedTimeoutSeconds: 0}},
+      {status: FeatureStatus.ENABLED, config: {enforcedTimeoutSeconds: 10}},
+      'Self-deleting messages are now mandatory. New messages will self-delete after 10 seconds.',
+    ],
+    [
+      {status: FeatureStatus.DISABLED, config: {enforcedTimeoutSeconds: 0}},
+      {status: FeatureStatus.ENABLED, config: {enforcedTimeoutSeconds: 0}},
+      'Self-deleting messages are enabled. You can set a timer before writing a message.',
+    ],
+    [
+      {status: FeatureStatus.ENABLED, config: {enforcedTimeoutSeconds: 0}},
+      {status: FeatureStatus.ENABLED, config: {enforcedTimeoutSeconds: 10}},
+      'Self-deleting messages are now mandatory. New messages will self-delete after 10 seconds.',
+    ],
+    [
+      {status: FeatureStatus.ENABLED, config: {enforcedTimeoutSeconds: 10}},
+      {status: FeatureStatus.DISABLED, config: {enforcedTimeoutSeconds: 0}},
+      'Self-deleting messages are disabled',
+    ],
+  ])(
+    'indicates the config change when self deleting messages have changed (%s) to (%s)',
+    async (fromStatus, toStatus, expectedText) => {
+      const teamState = new TeamState();
+      render(<FeatureConfigChangeNotifier selfUserId={'self'} teamState={teamState} />);
+      act(() => {
+        teamState.teamFeatures({
+          ...baseConfig,
+          [FEATURE_KEY.SELF_DELETING_MESSAGES]: fromStatus,
+        });
+      });
+
+      act(() => {
+        teamState.teamFeatures({
+          ...baseConfig,
+          [FEATURE_KEY.SELF_DELETING_MESSAGES]: toStatus,
+        });
+      });
+
+      await waitFor(() => {
+        expect(showModalSpy).toHaveBeenCalledTimes(1);
+        expect(showModalSpy).toHaveBeenCalledWith(PrimaryModal.type.ACKNOWLEDGE, {
+          text: expect.objectContaining({
+            htmlMessage: expectedText,
+          }),
+        });
+      });
+    },
+  );
+});
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.ts b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.ts
new file mode 100644
index 00000000000..3a3930b674c
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/FeatureConfigChangeNotifier.ts
@@ -0,0 +1,190 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {useEffect, useRef} from 'react';
+
+import {
+  FeatureList,
+  FeatureWithoutConfig,
+  Feature,
+  FEATURE_KEY,
+  FeatureStatus,
+  SelfDeletingTimeout,
+} from '@wireapp/api-client/lib/team/feature/';
+
+import {PrimaryModal} from 'Components/Modals/PrimaryModal';
+import {useKoSubscribableChildren} from 'Util/ComponentUtil';
+import {StringIdentifer, replaceLink, t} from 'Util/LocalizerUtil';
+import {getLogger} from 'Util/Logger';
+import {formatDuration} from 'Util/TimeUtil';
+
+import {loadFeatureConfig, saveFeatureConfig} from './FeatureConfigChangeNotifier.store';
+
+import {Config} from '../../../../Config';
+import {TeamState} from '../../../../team/TeamState';
+
+const featureNotifications: Partial<
+  Record<
+    FEATURE_KEY,
+    (
+      oldConfig?: Feature<any> | FeatureWithoutConfig,
+      newConfig?: Feature<any> | FeatureWithoutConfig,
+    ) => undefined | {htmlMessage: string; title: StringIdentifer}
+  >
+> = {
+  [FEATURE_KEY.FILE_SHARING]: (oldConfig, newConfig) => {
+    const status = wasTurnedOnOrOff(oldConfig, newConfig);
+    if (!status) {
+      return undefined;
+    }
+    return {
+      htmlMessage:
+        status === FeatureStatus.ENABLED
+          ? t('featureConfigChangeModalFileSharingDescriptionItemFileSharingEnabled')
+          : t('featureConfigChangeModalFileSharingDescriptionItemFileSharingDisabled'),
+      title: 'featureConfigChangeModalFileSharingHeadline',
+    };
+  },
+  [FEATURE_KEY.VIDEO_CALLING]: (oldConfig, newConfig) => {
+    const status = wasTurnedOnOrOff(oldConfig, newConfig);
+    if (!status) {
+      return undefined;
+    }
+    return {
+      htmlMessage:
+        status === FeatureStatus.ENABLED
+          ? t('featureConfigChangeModalAudioVideoDescriptionItemCameraEnabled')
+          : t('featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled'),
+      title: 'featureConfigChangeModalAudioVideoHeadline',
+    };
+  },
+  [FEATURE_KEY.SELF_DELETING_MESSAGES]: (oldConfig, newConfig) => {
+    if (!oldConfig || !('config' in oldConfig) || !newConfig || !('config' in newConfig)) {
+      return undefined;
+    }
+    const previousTimeout = oldConfig?.config?.enforcedTimeoutSeconds * 1000;
+    const newTimeout = (newConfig?.config?.enforcedTimeoutSeconds ?? 0) * 1000;
+    const previousStatus = oldConfig?.status;
+    const newStatus = newConfig?.status;
+
+    const hasTimeoutChanged = previousTimeout !== newTimeout;
+    const isEnforced = newTimeout > SelfDeletingTimeout.OFF;
+    const hasStatusChanged = previousStatus !== newStatus;
+    const hasFeatureChanged = hasStatusChanged || hasTimeoutChanged;
+    const isFeatureEnabled = newStatus === FeatureStatus.ENABLED;
+
+    if (!hasFeatureChanged) {
+      return undefined;
+    }
+    return {
+      htmlMessage: isFeatureEnabled
+        ? isEnforced
+          ? t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced', {
+              timeout: formatDuration(newTimeout).text,
+            })
+          : t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled')
+        : t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemDisabled'),
+      title: 'featureConfigChangeModalSelfDeletingMessagesHeadline',
+    };
+  },
+  [FEATURE_KEY.CONFERENCE_CALLING]: (oldConfig, newConfig) => {
+    const status = wasTurnedOnOrOff(oldConfig, newConfig);
+    if (!status || status === FeatureStatus.DISABLED) {
+      return undefined;
+    }
+    const replaceEnterprise = replaceLink(
+      Config.getConfig().URL.PRICING,
+      'modal__text__read-more',
+      'read-more-pricing',
+    );
+
+    return {
+      htmlMessage: t(
+        'featureConfigChangeModalConferenceCallingEnabled',
+        {brandName: Config.getConfig().BRAND_NAME},
+        replaceEnterprise,
+      ),
+      title: 'featureConfigChangeModalConferenceCallingTitle',
+    };
+  },
+  [FEATURE_KEY.CONVERSATION_GUEST_LINKS]: (oldConfig, newConfig) => {
+    const status = wasTurnedOnOrOff(oldConfig, newConfig);
+    if (!status) {
+      return undefined;
+    }
+    return {
+      htmlMessage:
+        status === FeatureStatus.ENABLED
+          ? t('featureConfigChangeModalConversationGuestLinksDescriptionItemConversationGuestLinksEnabled')
+          : t('featureConfigChangeModalConversationGuestLinksDescriptionItemConversationGuestLinksDisabled'),
+      title: 'featureConfigChangeModalConversationGuestLinksHeadline',
+    };
+  },
+};
+
+function wasTurnedOnOrOff(oldConfig?: FeatureWithoutConfig, newConfig?: FeatureWithoutConfig): boolean | FeatureStatus {
+  if (oldConfig?.status && newConfig?.status && oldConfig.status !== newConfig.status) {
+    return newConfig.status;
+  }
+  return false;
+}
+
+const logger = getLogger('FeatureConfigChangeNotifier');
+type Props = {
+  teamState: TeamState;
+  selfUserId: string;
+};
+
+export function FeatureConfigChangeNotifier({teamState, selfUserId}: Props): null {
+  const {teamFeatures: config} = useKoSubscribableChildren(teamState, ['teamFeatures']);
+  const previousConfig = useRef<FeatureList | undefined>(loadFeatureConfig(selfUserId));
+
+  useEffect(() => {
+    const previous = previousConfig.current;
+    if (config) {
+      previousConfig.current = config;
+      saveFeatureConfig(selfUserId, config);
+    }
+
+    if (previous && config) {
+      Object.entries(featureNotifications).forEach(([feature, getMessage]) => {
+        const featureKey = feature as FEATURE_KEY;
+        const message = getMessage(previous?.[featureKey], config[featureKey]);
+        if (!message) {
+          return;
+        }
+        logger.info(
+          `Detected feature config change for "${feature}" from "${JSON.stringify(
+            previous?.[featureKey],
+          )}" to "${JSON.stringify(config[featureKey])}"`,
+        );
+        PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
+          text: {
+            htmlMessage: message.htmlMessage,
+            title: t(message.title, {
+              brandName: Config.getConfig().BRAND_NAME,
+            }),
+          },
+        });
+      });
+    }
+  }, [config, selfUserId]);
+
+  return null;
+}
diff --git a/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/index.ts b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/index.ts
new file mode 100644
index 00000000000..6c83b685148
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/FeatureConfigChangeNotifier/index.ts
@@ -0,0 +1,20 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export * from './FeatureConfigChangeNotifier';
diff --git a/src/script/page/components/FeatureConfigChange/guards.ts b/src/script/page/components/FeatureConfigChange/guards.ts
new file mode 100644
index 00000000000..e304293950a
--- /dev/null
+++ b/src/script/page/components/FeatureConfigChange/guards.ts
@@ -0,0 +1,26 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {FeatureMLS, FeatureMLSE2EId} from '@wireapp/api-client/lib/team';
+
+export const isFeatureMLSE2EI = (feature: any): feature is FeatureMLSE2EId =>
+  'config' in feature && 'verificationExpiration' in feature.config;
+
+export const isFeatureMLS = (feature: any): feature is FeatureMLS =>
+  'config' in feature && 'defaultProtocol' in feature.config;
diff --git a/src/script/page/useWindowTitle.ts b/src/script/page/components/WindowTitleUpdater.ts
similarity index 90%
rename from src/script/page/useWindowTitle.ts
rename to src/script/page/components/WindowTitleUpdater.ts
index f9e6010dc27..4ea0b445d56 100644
--- a/src/script/page/useWindowTitle.ts
+++ b/src/script/page/components/WindowTitleUpdater.ts
@@ -28,23 +28,23 @@ import {useKoSubscribableChildren} from 'Util/ComponentUtil';
 import {t} from 'Util/LocalizerUtil';
 import {getLogger} from 'Util/Logger';
 
-import {ContentState, useAppState} from './useAppState';
-
-import {Config} from '../Config';
-import {ConversationState} from '../conversation/ConversationState';
-import {NOTIFICATION_HANDLING_STATE} from '../event/NotificationHandlingState';
-import {UserState} from '../user/UserState';
+import {Config} from '../../Config';
+import {ConversationState} from '../../conversation/ConversationState';
+import {NOTIFICATION_HANDLING_STATE} from '../../event/NotificationHandlingState';
+import {UserState} from '../../user/UserState';
+import {ContentState, useAppState} from '../useAppState';
 
 const windowTitleLogger = getLogger('WindowTitlesViewModel');
 
 const MIN_UNREAD_COUNT = 0;
 const MIN_CONNECTION_REQUEST_COUNT = 1;
 
-export const useWindowTitle = () => {
+const useWindowTitle = () => {
   const userState = container.resolve(UserState);
   const conversationState = container.resolve(ConversationState);
 
-  const {contentState, setUnreadMessagesCount} = useAppState();
+  const contentState = useAppState(state => state.contentState);
+  const setUnreadMessagesCount = useAppState(state => state.setUnreadMessagesCount);
 
   const [updateWindowTitle, setUpdateWindowTitle] = useState(false);
 
@@ -162,3 +162,9 @@ export const useWindowTitle = () => {
     initiateTitleUpdates();
   }, [initiateTitleUpdates, updateNotificationState]);
 };
+
+export function WindowTitleUpdater(): null {
+  useWindowTitle();
+
+  return null;
+}
diff --git a/src/script/page/state.ts b/src/script/page/state.ts
index 3a41e7a4c43..06216729a4d 100644
--- a/src/script/page/state.ts
+++ b/src/script/page/state.ts
@@ -31,7 +31,7 @@ export enum ViewType {
 
 type RightSidebarParams = {
   entity: PanelEntity | null;
-  showLikes?: boolean;
+  showReactions?: boolean;
   highlighted?: User[];
 };
 
@@ -48,7 +48,7 @@ type AppMainState = {
     goToRoot: (entity: RightSidebarParams['entity']) => void;
     highlightedUsers: RightSidebarParams['highlighted'];
     history: PanelState[];
-    showLikes: RightSidebarParams['showLikes'];
+    showReactions: RightSidebarParams['showReactions'];
     lastViewedMessageDetailsEntity: Message | null;
     updateEntity: (entity: RightSidebarParams['entity']) => void;
   };
@@ -70,7 +70,7 @@ const useAppMainState = create<AppMainState>((set, get) => ({
           entity: null,
           highlightedUsers: [],
           history: [],
-          showLikes: false,
+          showReactions: false,
         },
       })),
     entity: null,
@@ -98,7 +98,7 @@ const useAppMainState = create<AppMainState>((set, get) => ({
             lastViewedMessageDetailsEntity,
             highlightedUsers: params?.highlighted || [],
             history: [...replacedNewState, panel],
-            showLikes: !!params?.showLikes,
+            showReactions: !!params?.showReactions,
           },
         };
       });
@@ -110,7 +110,7 @@ const useAppMainState = create<AppMainState>((set, get) => ({
       })),
     highlightedUsers: [],
     history: [],
-    showLikes: false,
+    showReactions: false,
     updateEntity: (entity: RightSidebarParams['entity']) =>
       set(state => ({...state, rightSidebar: {...state.rightSidebar, entity}})),
   },
diff --git a/src/script/router/Router.test.ts b/src/script/router/Router.test.ts
index c6e799dad1e..6f2cf288845 100644
--- a/src/script/router/Router.test.ts
+++ b/src/script/router/Router.test.ts
@@ -19,7 +19,7 @@
 
 import {waitFor} from '@testing-library/react';
 
-import {configureRoutes, navigate} from './Router';
+import {configureRoutes, navigate, setHistoryParam} from './Router';
 
 describe('Router', () => {
   afterEach(() => {
@@ -77,4 +77,42 @@ describe('Router', () => {
       });
     });
   });
+
+  describe('setHistoryParam', () => {
+    // Mock window.history.replaceState before each test
+    beforeEach(() => {
+      global.history.replaceState = jest.fn();
+    });
+
+    // Restore the original method after each test
+    afterEach(() => {
+      (global.history.replaceState as jest.Mock).mockRestore();
+    });
+
+    it('uses history.state if it is not empty and stateObj is not provided', () => {
+      const mockState = {eventKey: 'Enter'};
+      Object.defineProperty(window.history, 'state', {value: mockState, writable: true});
+
+      setHistoryParam('/path');
+      expect(global.history.replaceState).toHaveBeenCalledWith(mockState, '', '#/path');
+    });
+
+    it('uses stateObj even if history.state is not empty', () => {
+      const mockState = {eventKey: 'Tab'};
+      Object.defineProperty(window.history, 'state', {value: mockState, writable: true});
+
+      const newStateObj = {newState: 'state'};
+      setHistoryParam('/path', newStateObj);
+      expect(global.history.replaceState).toHaveBeenCalledWith(newStateObj, '', '#/path');
+    });
+
+    it('explicitely resetting the state is allowed', () => {
+      const mockState = {eventKey: 'Tab'};
+      Object.defineProperty(window.history, 'state', {value: mockState, writable: true});
+
+      const newStateObj = {};
+      setHistoryParam('/path', newStateObj);
+      expect(global.history.replaceState).toHaveBeenCalledWith(newStateObj, '', '#/path');
+    });
+  });
 });
diff --git a/src/script/router/Router.ts b/src/script/router/Router.ts
index ca7acbabbc9..bca81161a5f 100644
--- a/src/script/router/Router.ts
+++ b/src/script/router/Router.ts
@@ -45,6 +45,6 @@ export const navigate = (path: string, stateObj?: {}) => {
   parseRoute();
 };
 
-export const setHistoryParam = (path: string, stateObj?: {}) => {
+export const setHistoryParam = (path: string, stateObj: {} = window.history.state) => {
   window.history.replaceState(stateObj, '', `#${path}`);
 };
diff --git a/src/script/router/routerBindings.ts b/src/script/router/routerBindings.ts
index 115f8d1b5ca..54966767656 100644
--- a/src/script/router/routerBindings.ts
+++ b/src/script/router/routerBindings.ts
@@ -46,7 +46,7 @@ export const createNavigateKeyboard =
     }
   };
 
-export const setResponsiveView = () => {
+const setResponsiveView = () => {
   const {responsiveView} = useAppMainState.getState();
   responsiveView.setCurrentView(ViewType.CENTRAL_COLUMN);
 };
diff --git a/src/script/self/SelfRepository.test.ts b/src/script/self/SelfRepository.test.ts
new file mode 100644
index 00000000000..00771faa128
--- /dev/null
+++ b/src/script/self/SelfRepository.test.ts
@@ -0,0 +1,323 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
+import {TeamFeatureConfigurationUpdateEvent, TEAM_EVENT} from '@wireapp/api-client/lib/event';
+import {FeatureList, FeatureStatus} from '@wireapp/api-client/lib/team';
+import {FEATURE_KEY} from '@wireapp/api-client/lib/team/feature';
+import {act} from 'react-dom/test-utils';
+import {container} from 'tsyringe';
+
+import {TestFactory} from 'test/helper/TestFactory';
+import {TIME_IN_MILLIS} from 'Util/TimeUtil';
+
+import {SelfRepository} from './SelfRepository';
+import * as SelfSupportedProtocols from './SelfSupportedProtocols/SelfSupportedProtocols';
+
+import {ClientEntity} from '../client';
+import {Core} from '../service/CoreSingleton';
+
+const testFactory = new TestFactory();
+
+const generateMLSFeatureConfig = (supportedProtocols: ConversationProtocol[]) => {
+  return {
+    allowedCipherSuites: [1],
+    defaultCipherSuite: 1,
+    defaultProtocol: ConversationProtocol.PROTEUS,
+    protocolToggleUsers: [] as string[],
+    supportedProtocols,
+  };
+};
+
+describe('SelfRepository', () => {
+  describe('initialisePeriodicSelfSupportedProtocolsCheck', () => {
+    beforeAll(() => {
+      jest.useFakeTimers();
+    });
+
+    afterAll(() => {
+      jest.useRealTimers();
+    });
+
+    it.each([
+      [[ConversationProtocol.PROTEUS], [ConversationProtocol.PROTEUS, ConversationProtocol.MLS]],
+      [[ConversationProtocol.PROTEUS, ConversationProtocol.MLS], [ConversationProtocol.PROTEUS]],
+      [[ConversationProtocol.PROTEUS], [ConversationProtocol.MLS]],
+    ])('Updates the list of supported protocols', async (initialProtocols, evaluatedProtocols) => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      selfUser.supportedProtocols(initialProtocols);
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(selfRepository['selfService'], 'putSupportedProtocols');
+
+      await act(async () => {
+        await selfRepository.initialisePeriodicSelfSupportedProtocolsCheck();
+      });
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+      expect(selfRepository['selfService'].putSupportedProtocols).toHaveBeenCalledWith(evaluatedProtocols);
+    });
+
+    it("Does not update supported protocols if they didn't change", async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      const initialProtocols = [ConversationProtocol.PROTEUS];
+      selfUser.supportedProtocols(initialProtocols);
+
+      const evaluatedProtocols = [ConversationProtocol.PROTEUS];
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(selfRepository['selfService'], 'putSupportedProtocols');
+
+      await selfRepository.initialisePeriodicSelfSupportedProtocolsCheck();
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+      expect(selfRepository['selfService'].putSupportedProtocols).not.toHaveBeenCalled();
+    });
+
+    it('registers periodic supported protocols refresh task to be called every 24h', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+      const core = container.resolve(Core);
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      const initialProtocols = [ConversationProtocol.PROTEUS];
+      selfUser.supportedProtocols(initialProtocols);
+
+      const evaluatedProtocols = [ConversationProtocol.PROTEUS];
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(core.recurringTaskScheduler, 'registerTask');
+
+      await act(async () => {
+        await selfRepository.initialisePeriodicSelfSupportedProtocolsCheck();
+      });
+
+      expect(core.recurringTaskScheduler.registerTask).toHaveBeenCalledWith({
+        every: TIME_IN_MILLIS.DAY,
+        key: SelfRepository.SELF_SUPPORTED_PROTOCOLS_CHECK_KEY,
+        task: expect.anything(),
+      });
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+    });
+  });
+
+  describe('deleteSelfUserClient', () => {
+    it('deletes the self user client and refreshes self supported protocols', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      selfRepository['clientRepository'].init(selfUser);
+
+      const client1 = new ClientEntity(true, null, 'client1');
+      const client2 = new ClientEntity(true, null, 'client2');
+
+      const initialClients = [client1, client2];
+      selfUser.devices(initialClients);
+
+      const clientToDelete = initialClients[0];
+
+      jest.spyOn(container.resolve(Core).service?.client!, 'deleteClient');
+      jest.spyOn(selfRepository, 'refreshSelfSupportedProtocols').mockImplementationOnce(jest.fn());
+
+      const expectedClients = [...initialClients].filter(client => client.id !== clientToDelete.id);
+
+      await act(async () => {
+        await selfRepository.deleteSelfUserClient(clientToDelete.id);
+      });
+
+      expect(selfUser.devices()).toEqual(expectedClients);
+      expect(selfRepository.refreshSelfSupportedProtocols).toHaveBeenCalled();
+    });
+  });
+
+  describe('refreshSelfSupportedProtocols', () => {
+    it('refreshes self supported protocols and updates backend with the new list', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      const initialProtocols = [ConversationProtocol.PROTEUS];
+      selfUser.supportedProtocols(initialProtocols);
+
+      const evaluatedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(selfRepository['selfService'], 'putSupportedProtocols');
+
+      await selfRepository.refreshSelfSupportedProtocols();
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+      expect(selfRepository['selfService'].putSupportedProtocols).toHaveBeenCalledWith(evaluatedProtocols);
+    });
+
+    it('does not update backend with supported protocols when not changed', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      const initialProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+      selfUser.supportedProtocols(initialProtocols);
+
+      const evaluatedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(selfRepository['selfService'], 'putSupportedProtocols');
+
+      await selfRepository.refreshSelfSupportedProtocols();
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+      expect(selfRepository['selfService'].putSupportedProtocols).not.toHaveBeenCalled();
+    });
+
+    it('refreshes self supported protocols on team supported protocols update', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const currentSupportedProtocols = [ConversationProtocol.PROTEUS];
+      const newSupportedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+
+      const mockedFeatureList: FeatureList = {
+        [FEATURE_KEY.MLS]: {
+          config: generateMLSFeatureConfig(currentSupportedProtocols),
+          status: FeatureStatus.ENABLED,
+        },
+      };
+
+      const mockedMLSFeatureUpdateEvent: TeamFeatureConfigurationUpdateEvent = {
+        name: FEATURE_KEY.MLS,
+        team: '',
+        time: '',
+        data: {
+          status: FeatureStatus.ENABLED,
+          config: generateMLSFeatureConfig(newSupportedProtocols),
+        },
+
+        type: TEAM_EVENT.FEATURE_CONFIG_UPDATE,
+      };
+
+      jest.spyOn(selfRepository, 'refreshSelfSupportedProtocols').mockImplementationOnce(jest.fn());
+
+      selfRepository['teamRepository'].emit('featureUpdated', {
+        event: mockedMLSFeatureUpdateEvent,
+        prevFeatureList: mockedFeatureList,
+      });
+
+      expect(selfRepository.refreshSelfSupportedProtocols).toHaveBeenCalled();
+    });
+
+    it('refreshes self supported protocols on team refresh', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const selfUser = selfRepository['userState'].self()!;
+
+      const initialProtocols = [ConversationProtocol.PROTEUS];
+      selfUser.supportedProtocols(initialProtocols);
+
+      const evaluatedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+
+      jest.spyOn(SelfSupportedProtocols, 'evaluateSelfSupportedProtocols').mockResolvedValueOnce(evaluatedProtocols);
+      jest.spyOn(selfRepository['selfService'], 'putSupportedProtocols');
+
+      await act(async () => selfRepository['teamRepository'].emit('teamRefreshed'));
+
+      expect(selfUser.supportedProtocols()).toEqual(evaluatedProtocols);
+      expect(selfRepository['selfService'].putSupportedProtocols).toHaveBeenCalledWith(evaluatedProtocols);
+    });
+
+    it('refreshes self supported protocols after mls feature is enabled', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const currentSupportedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+      const currentFeatureStatus = FeatureStatus.DISABLED;
+
+      const newSupportedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+      const newFeatureStatus = FeatureStatus.ENABLED;
+
+      const mockedFeatureList: FeatureList = {
+        [FEATURE_KEY.MLS]: {
+          config: generateMLSFeatureConfig(currentSupportedProtocols),
+          status: currentFeatureStatus,
+        },
+      };
+
+      const mockedMLSFeatureUpdateEvent: TeamFeatureConfigurationUpdateEvent = {
+        name: FEATURE_KEY.MLS,
+        team: '',
+        time: '',
+        data: {
+          status: newFeatureStatus,
+          config: generateMLSFeatureConfig(newSupportedProtocols),
+        },
+
+        type: TEAM_EVENT.FEATURE_CONFIG_UPDATE,
+      };
+
+      jest.spyOn(selfRepository, 'refreshSelfSupportedProtocols').mockImplementationOnce(jest.fn());
+
+      selfRepository['teamRepository'].emit('featureUpdated', {
+        event: mockedMLSFeatureUpdateEvent,
+        prevFeatureList: mockedFeatureList,
+      });
+
+      expect(selfRepository.refreshSelfSupportedProtocols).toHaveBeenCalled();
+    });
+
+    it('does not refresh self supported protocols if mls feature is updated without supported protocols change', async () => {
+      const selfRepository = await testFactory.exposeSelfActors();
+
+      const currentSupportedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+      const newSupportedProtocols = [ConversationProtocol.PROTEUS, ConversationProtocol.MLS];
+
+      const mockedFeatureList: FeatureList = {
+        [FEATURE_KEY.MLS]: {
+          config: generateMLSFeatureConfig(currentSupportedProtocols),
+          status: FeatureStatus.ENABLED,
+        },
+      };
+
+      const mockedMLSFeatureUpdateEvent: TeamFeatureConfigurationUpdateEvent = {
+        name: FEATURE_KEY.MLS,
+        team: '',
+        time: '',
+        data: {
+          status: FeatureStatus.ENABLED,
+          config: generateMLSFeatureConfig(newSupportedProtocols),
+        },
+
+        type: TEAM_EVENT.FEATURE_CONFIG_UPDATE,
+      };
+
+      jest.spyOn(selfRepository, 'refreshSelfSupportedProtocols').mockImplementationOnce(jest.fn());
+
+      selfRepository['teamRepository'].emit('featureUpdated', {
+        event: mockedMLSFeatureUpdateEvent,
+        prevFeatureList: mockedFeatureList,
+      });
+
+      expect(selfRepository.refreshSelfSupportedProtocols).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/script/self/SelfRepository.ts b/src/script/self/SelfRepository.ts
new file mode 100644
index 00000000000..f7a172b58db
--- /dev/null
+++ b/src/script/self/SelfRepository.ts
@@ -0,0 +1,156 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
+import {FEATURE_KEY, FeatureMLS} from '@wireapp/api-client/lib/team/feature/';
+import {amplify} from 'amplify';
+import {container} from 'tsyringe';
+
+import {WebAppEvents} from '@wireapp/webapp-events';
+
+import {Logger, getLogger} from 'Util/Logger';
+import {TIME_IN_MILLIS} from 'Util/TimeUtil';
+
+import {SelfService} from './SelfService';
+import {evaluateSelfSupportedProtocols} from './SelfSupportedProtocols/SelfSupportedProtocols';
+
+import {ClientEntity, ClientRepository} from '../client';
+import {Core} from '../service/CoreSingleton';
+import {TeamRepository} from '../team/TeamRepository';
+import {UserRepository} from '../user/UserRepository';
+import {UserState} from '../user/UserState';
+
+export class SelfRepository {
+  private readonly logger: Logger;
+  static SELF_SUPPORTED_PROTOCOLS_CHECK_KEY = 'self-supported-protocols-check';
+
+  constructor(
+    private readonly selfService: SelfService,
+    private readonly userRepository: UserRepository,
+    private readonly teamRepository: TeamRepository,
+    private readonly clientRepository: ClientRepository,
+    private readonly userState = container.resolve(UserState),
+    private readonly core = container.resolve(Core),
+  ) {
+    this.logger = getLogger('SelfRepository');
+
+    // Every time user's client is deleted, we need to re-evaluate self supported protocols.
+    // It's possible that they have removed proteus client, and now all their clients are mls-capable.
+    amplify.subscribe(WebAppEvents.CLIENT.REMOVE, this.refreshSelfSupportedProtocols);
+
+    teamRepository.on('teamRefreshed', this.refreshSelfSupportedProtocols);
+    teamRepository.on('featureUpdated', ({event, prevFeatureList}) => {
+      if (event.name === FEATURE_KEY.MLS) {
+        void this.handleMLSFeatureUpdate(event.data, prevFeatureList?.[FEATURE_KEY.MLS]);
+      }
+    });
+  }
+
+  private get selfUser() {
+    const selfUser = this.userState.self();
+    if (!selfUser) {
+      throw new Error('Self user is not available');
+    }
+    return selfUser;
+  }
+
+  private handleMLSFeatureUpdate = async (newMLSFeature: FeatureMLS, prevMLSFeature?: FeatureMLS) => {
+    const prevSupportedProtocols = prevMLSFeature?.config.supportedProtocols ?? [];
+    const newSupportedProtocols = newMLSFeature.config.supportedProtocols ?? [];
+
+    const hasFeatureStatusChanged = prevMLSFeature?.status !== newMLSFeature.status;
+
+    const hasTeamSupportedProtocolsChanged = !(
+      prevSupportedProtocols.length === newSupportedProtocols.length &&
+      [...prevSupportedProtocols].every(protocol => newSupportedProtocols.includes(protocol))
+    );
+
+    if (hasFeatureStatusChanged || hasTeamSupportedProtocolsChanged) {
+      await this.refreshSelfSupportedProtocols();
+    }
+  };
+
+  /**
+   * Update self user's list of supported protocols.
+   * It will send a request to the backend to change the supported protocols and then update the user in the local state.
+   * @param supportedProtocols - an array of new supported protocols
+   */
+  private async updateSelfSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void> {
+    this.logger.info('Supported protocols will get updated to:', supportedProtocols);
+    try {
+      await this.selfService.putSupportedProtocols(supportedProtocols);
+      await this.userRepository.updateUserSupportedProtocols(this.selfUser.qualifiedId, supportedProtocols);
+    } catch (error) {
+      this.logger.error('Failed to update self supported protocols: ', error);
+    }
+  }
+
+  /**
+   * Will re-evaluate self supported protocols and update them if necessary.
+   * It will send a request to the backend to change the supported protocols and then update the user in the local state.
+   */
+  public readonly refreshSelfSupportedProtocols = async (): Promise<ConversationProtocol[]> => {
+    const localSupportedProtocols = this.selfUser.supportedProtocols();
+
+    this.logger.info('Evaluating self supported protocols, currently supported protocols:', localSupportedProtocols);
+    const refreshedSupportedProtocols = await evaluateSelfSupportedProtocols(
+      this.teamRepository,
+      this.clientRepository,
+    );
+
+    if (!localSupportedProtocols) {
+      await this.updateSelfSupportedProtocols(refreshedSupportedProtocols);
+      return refreshedSupportedProtocols;
+    }
+
+    const hasSupportedProtocolsChanged = !(
+      localSupportedProtocols.length === refreshedSupportedProtocols.length &&
+      [...localSupportedProtocols].every(protocol => refreshedSupportedProtocols.includes(protocol))
+    );
+
+    if (!hasSupportedProtocolsChanged) {
+      return localSupportedProtocols;
+    }
+
+    await this.updateSelfSupportedProtocols(refreshedSupportedProtocols);
+    return refreshedSupportedProtocols;
+  };
+
+  /**
+   * Will initialise the intervals for checking (and updating if necessary) self supported protocols.
+   * Should be called only once on app load.
+   */
+  public async initialisePeriodicSelfSupportedProtocolsCheck() {
+    // We update supported protocols of self user on initial app load and then in 24 hours intervals
+    await this.refreshSelfSupportedProtocols();
+
+    await this.core.recurringTaskScheduler.registerTask({
+      every: TIME_IN_MILLIS.DAY,
+      task: () => this.refreshSelfSupportedProtocols(),
+      key: SelfRepository.SELF_SUPPORTED_PROTOCOLS_CHECK_KEY,
+    });
+  }
+
+  public async deleteSelfUserClient(clientId: string, password?: string): Promise<ClientEntity[]> {
+    const clients = this.clientRepository.deleteClient(clientId, password);
+
+    await this.refreshSelfSupportedProtocols();
+    return clients;
+  }
+}
diff --git a/src/script/self/SelfService.ts b/src/script/self/SelfService.ts
index 4df92940cea..d4485b16f73 100644
--- a/src/script/self/SelfService.ts
+++ b/src/script/self/SelfService.ts
@@ -17,6 +17,7 @@
  *
  */
 
+import type {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
 import type {TraceState} from '@wireapp/api-client/lib/http/';
 import type {Consent, Self} from '@wireapp/api-client/lib/self/';
 import type {UserUpdate} from '@wireapp/api-client/lib/user/';
@@ -67,4 +68,8 @@ export class SelfService {
   putSelfPhone(phone: string): Promise<void> {
     return this.apiClient.api.self.putPhone({phone});
   }
+
+  putSupportedProtocols(supportedProtocols: ConversationProtocol[]): Promise<void> {
+    return this.apiClient.api.self.putSupportedProtocols(supportedProtocols);
+  }
 }
diff --git a/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.test.ts b/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.test.ts
new file mode 100644
index 00000000000..4fb4c82e325
--- /dev/null
+++ b/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.test.ts
@@ -0,0 +1,214 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {RegisteredClient} from '@wireapp/api-client/lib/client';
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
+import {FeatureStatus, FeatureList} from '@wireapp/api-client/lib/team';
+
+import {MLSMigrationStatus} from 'src/script/mls/MLSMigration/migrationStatus';
+import {TestFactory} from 'test/helper/TestFactory';
+import {TIME_IN_MILLIS} from 'Util/TimeUtil';
+
+import {evaluateSelfSupportedProtocols} from './SelfSupportedProtocols';
+
+import * as mlsSupport from '../../mls/isMLSSupportedByEnvironment';
+
+const testFactory = new TestFactory();
+
+jest.spyOn(mlsSupport, 'isMLSSupportedByEnvironment').mockResolvedValue(true);
+
+const generateMLSFeaturesConfig = (migrationStatus: MLSMigrationStatus, supportedProtocols: ConversationProtocol[]) => {
+  const now = Date.now();
+
+  switch (migrationStatus) {
+    case MLSMigrationStatus.DISABLED:
+      return {
+        mls: {
+          status: FeatureStatus.ENABLED,
+          config: {supportedProtocols},
+        },
+        mlsMigration: {status: FeatureStatus.DISABLED, config: {}},
+      };
+    case MLSMigrationStatus.NOT_STARTED:
+      return {
+        mls: {
+          status: FeatureStatus.ENABLED,
+          config: {supportedProtocols},
+        },
+        mlsMigration: {
+          status: FeatureStatus.ENABLED,
+          config: {
+            startTime: new Date(now + 1 * TIME_IN_MILLIS.DAY).toISOString(),
+            finaliseRegardlessAfter: new Date(now + 2 * TIME_IN_MILLIS.DAY).toISOString(),
+          },
+        },
+      };
+    case MLSMigrationStatus.ONGOING:
+      return {
+        mls: {
+          status: FeatureStatus.ENABLED,
+          config: {supportedProtocols},
+        },
+        mlsMigration: {
+          status: FeatureStatus.ENABLED,
+          config: {
+            startTime: new Date(now - 1 * TIME_IN_MILLIS.DAY).toISOString(),
+            finaliseRegardlessAfter: new Date(now + 1 * TIME_IN_MILLIS.DAY).toISOString(),
+          },
+        },
+      };
+    case MLSMigrationStatus.FINALISED:
+      return {
+        mls: {
+          status: FeatureStatus.ENABLED,
+          config: {supportedProtocols},
+        },
+        mlsMigration: {
+          status: FeatureStatus.ENABLED,
+          config: {
+            startTime: new Date(now - 2 * TIME_IN_MILLIS.DAY).toISOString(),
+            finaliseRegardlessAfter: new Date(now - 1 * TIME_IN_MILLIS.DAY).toISOString(),
+          },
+        },
+      };
+  }
+};
+
+const createMockClientResponse = (doesSupportMLS = false, wasActiveWithinLast4Weeks = false) => {
+  return {
+    mls_public_keys: doesSupportMLS ? {ed25519: 'key'} : {},
+    last_active: wasActiveWithinLast4Weeks
+      ? new Date().toISOString()
+      : new Date(Date.now() - 5 * 7 * 24 * 60 * 60 * 1000).toISOString(),
+  } as unknown as RegisteredClient;
+};
+
+const generateListOfSelfClients = ({allActiveClientsMLSCapable}: {allActiveClientsMLSCapable: boolean}) => {
+  const clients: RegisteredClient[] = [];
+
+  new Array(4).fill(0).forEach(() => clients.push(createMockClientResponse(true, true)));
+  if (!allActiveClientsMLSCapable) {
+    new Array(2).fill(0).forEach(() => clients.push(createMockClientResponse(false, true)));
+  }
+
+  return clients;
+};
+
+const evaluateProtocolsScenarios = [
+  [
+    //with given config
+    generateMLSFeaturesConfig(MLSMigrationStatus.DISABLED, [ConversationProtocol.PROTEUS]),
+
+    //we expect the following result based on whether all active clients are MLS capable or not
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.DISABLED, [ConversationProtocol.PROTEUS, ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.DISABLED, [ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.MLS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.NOT_STARTED, [ConversationProtocol.PROTEUS, ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.NOT_STARTED, [ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.ONGOING, [ConversationProtocol.PROTEUS, ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.ONGOING, [ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.FINALISED, [ConversationProtocol.PROTEUS, ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.PROTEUS, ConversationProtocol.MLS],
+    },
+  ],
+  [
+    generateMLSFeaturesConfig(MLSMigrationStatus.FINALISED, [ConversationProtocol.MLS]),
+    {
+      allActiveClientsMLSCapable: [ConversationProtocol.MLS],
+      someActiveClientsNotMLSCapable: [ConversationProtocol.MLS],
+    },
+  ],
+] as const;
+
+describe('evaluateSelfSupportedProtocols', () => {
+  describe.each([{allActiveClientsMLSCapable: true}, {allActiveClientsMLSCapable: false}])(
+    '%o',
+    ({allActiveClientsMLSCapable}) => {
+      const selfClients = generateListOfSelfClients({allActiveClientsMLSCapable});
+
+      it.each(evaluateProtocolsScenarios)(
+        'evaluates self supported protocols',
+        async ({mls, mlsMigration}, expected) => {
+          const selfRepository = await testFactory.exposeSelfActors();
+
+          jest.spyOn(selfRepository['clientRepository'], 'getAllSelfClients').mockResolvedValue(selfClients);
+
+          const teamFeatureList = {
+            mlsMigration,
+            mls,
+          } as unknown as FeatureList;
+
+          jest.spyOn(selfRepository['teamRepository']['teamState'], 'teamFeatures').mockReturnValue(teamFeatureList);
+
+          const supportedProtocols = await evaluateSelfSupportedProtocols(
+            selfRepository['teamRepository'],
+            selfRepository['clientRepository'],
+          );
+
+          expect(supportedProtocols).toEqual(
+            allActiveClientsMLSCapable ? expected.allActiveClientsMLSCapable : expected.someActiveClientsNotMLSCapable,
+          );
+        },
+      );
+    },
+  );
+});
diff --git a/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.ts b/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.ts
new file mode 100644
index 00000000000..40763b3b62c
--- /dev/null
+++ b/src/script/self/SelfSupportedProtocols/SelfSupportedProtocols.ts
@@ -0,0 +1,124 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
+
+import {isMLSSupportedByEnvironment} from '../../mls/isMLSSupportedByEnvironment';
+import {MLSMigrationStatus} from '../../mls/MLSMigration/migrationStatus';
+
+interface SelfSupportedProtocolsTeamHandler {
+  getTeamSupportedProtocols: () => ConversationProtocol[];
+  getTeamMLSMigrationStatus: () => MLSMigrationStatus;
+}
+
+interface SelfSupportedProtocolsSelfClientsHandler {
+  haveAllActiveSelfClientsRegisteredMLSDevice: () => Promise<boolean>;
+}
+
+/**
+ * Proteus is supported if:
+ * - Proteus is in the list of supported protocols
+ * - MLS migration is enabled but not finalised
+ */
+const isProteusSupported = (teamHandler: SelfSupportedProtocolsTeamHandler) => {
+  const teamSupportedProtocols = teamHandler.getTeamSupportedProtocols();
+  const mlsMigrationStatus = teamHandler.getTeamMLSMigrationStatus();
+
+  const isProteusSupportedByTeam = teamSupportedProtocols.includes(ConversationProtocol.PROTEUS);
+  return (
+    isProteusSupportedByTeam ||
+    [MLSMigrationStatus.NOT_STARTED, MLSMigrationStatus.ONGOING].includes(mlsMigrationStatus)
+  );
+};
+
+/**
+ * MLS is forced if:
+ * - only MLS is in the list of supported protocols
+ * - MLS migration is disabled
+ * - There are still some active clients that do not support MLS
+ * It means that team admin wants to force MLS and drop proteus support, even though not all active clients support MLS
+ */
+const isMLSForcedWithoutMigration = async (
+  teamHandler: SelfSupportedProtocolsTeamHandler,
+  selfClientsHandler: SelfSupportedProtocolsSelfClientsHandler,
+): Promise<boolean> => {
+  const isMLSSupportedByEnv = await isMLSSupportedByEnvironment();
+
+  if (!isMLSSupportedByEnv) {
+    return false;
+  }
+
+  const teamSupportedProtocols = teamHandler.getTeamSupportedProtocols();
+  const mlsMigrationStatus = teamHandler.getTeamMLSMigrationStatus();
+
+  const isMLSSupportedByTeam = teamSupportedProtocols.includes(ConversationProtocol.MLS);
+  const isProteusSupportedByTeam = teamSupportedProtocols.includes(ConversationProtocol.PROTEUS);
+  const doActiveClientsSupportMLS = await selfClientsHandler.haveAllActiveSelfClientsRegisteredMLSDevice();
+  const isMigrationDisabled = mlsMigrationStatus === MLSMigrationStatus.DISABLED;
+
+  return !doActiveClientsSupportMLS && isMLSSupportedByTeam && !isProteusSupportedByTeam && isMigrationDisabled;
+};
+
+/**
+ * MLS is supported if:
+ * - MLS is in the list of supported protocols
+ * - All active clients support MLS, or MLS migration is finalised
+ */
+const isMLSSupported = async (
+  teamHandler: SelfSupportedProtocolsTeamHandler,
+  selfClientsHandler: SelfSupportedProtocolsSelfClientsHandler,
+): Promise<boolean> => {
+  const isMLSSupportedByEnv = await isMLSSupportedByEnvironment();
+
+  if (!isMLSSupportedByEnv) {
+    return false;
+  }
+
+  const teamSupportedProtocols = teamHandler.getTeamSupportedProtocols();
+  const mlsMigrationStatus = teamHandler.getTeamMLSMigrationStatus();
+
+  const isMLSSupportedByTeam = teamSupportedProtocols.includes(ConversationProtocol.MLS);
+  const doActiveClientsSupportMLS = await selfClientsHandler.haveAllActiveSelfClientsRegisteredMLSDevice();
+  return isMLSSupportedByTeam && (doActiveClientsSupportMLS || mlsMigrationStatus === MLSMigrationStatus.FINALISED);
+};
+
+/**
+ * Will evaluate the list of self user's supported protocols and return them.
+ */
+export const evaluateSelfSupportedProtocols = async (
+  teamHandler: SelfSupportedProtocolsTeamHandler,
+  selfClientsHandler: SelfSupportedProtocolsSelfClientsHandler,
+): Promise<ConversationProtocol[]> => {
+  const supportedProtocols: ConversationProtocol[] = [];
+
+  const isProteusProtocolSupported = isProteusSupported(teamHandler);
+  if (isProteusProtocolSupported) {
+    supportedProtocols.push(ConversationProtocol.PROTEUS);
+  }
+
+  const isMLSProtocolSupported = await isMLSSupported(teamHandler, selfClientsHandler);
+
+  const isMLSForced = await isMLSForcedWithoutMigration(teamHandler, selfClientsHandler);
+
+  if (isMLSProtocolSupported || isMLSForced) {
+    supportedProtocols.push(ConversationProtocol.MLS);
+  }
+
+  return supportedProtocols;
+};
diff --git a/src/script/service/CoreSingleton.ts b/src/script/service/CoreSingleton.ts
index 90bf3e40df7..ff2f9bac0cc 100644
--- a/src/script/service/CoreSingleton.ts
+++ b/src/script/service/CoreSingleton.ts
@@ -61,6 +61,8 @@ export class Core extends Account {
         mls: supportsMLS()
           ? {
               keyingMaterialUpdateThreshold: Config.getConfig().FEATURE.MLS_CONFIG_KEYING_MATERIAL_UPDATE_THRESHOLD,
+              defaultCiphersuite: Config.getConfig().FEATURE.MLS_CONFIG_DEFAULT_CIPHERSUITE,
+              useE2EI: Config.getConfig().FEATURE.ENABLE_E2EI,
             }
           : undefined,
 
diff --git a/src/script/storage/record/ClientRecord.ts b/src/script/storage/record/ClientRecord.ts
index c799097fff2..b428f1896f8 100644
--- a/src/script/storage/record/ClientRecord.ts
+++ b/src/script/storage/record/ClientRecord.ts
@@ -32,6 +32,7 @@ export interface ClientRecord {
   };
   meta: {
     is_verified?: boolean;
+    is_mls_verified?: boolean;
     primary_key?: string;
   };
   model?: string;
diff --git a/src/script/storage/record/ConversationRecord.ts b/src/script/storage/record/ConversationRecord.ts
index 00e17fd36ea..d1ce32b467b 100644
--- a/src/script/storage/record/ConversationRecord.ts
+++ b/src/script/storage/record/ConversationRecord.ts
@@ -48,7 +48,6 @@ export interface ConversationRecord {
   epoch: number;
   id: string;
   is_guest: boolean;
-  is_managed: boolean;
   last_event_timestamp: number;
   last_read_timestamp: number;
   last_server_timestamp: number;
@@ -65,4 +64,5 @@ export interface ConversationRecord {
   team_id: string;
   type: CONVERSATION_TYPE;
   verification_state: ConversationVerificationState;
+  mlsVerificationState: ConversationVerificationState;
 }
diff --git a/src/script/storage/record/EventRecord.ts b/src/script/storage/record/EventRecord.ts
index 1582638842b..90294702bef 100644
--- a/src/script/storage/record/EventRecord.ts
+++ b/src/script/storage/record/EventRecord.ts
@@ -61,7 +61,7 @@ export type StoredEvent<T> = {
   /** Only used with IndexedDB table 'event' */
   primary_key: string;
   category: number;
-  id: string;
+  id?: string;
   /** if the message is ephemeral, that's the amount of time it should be displayed to the user
    * the different types are
    *  - string: a datestring
diff --git a/src/script/strings.ts b/src/script/strings.ts
index e0d0bd85b05..47936704b55 100644
--- a/src/script/strings.ts
+++ b/src/script/strings.ts
@@ -1,22 +1,3 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
 /*
  * Wire
  * Copyright (C) 2018 Wire Swiss GmbH
@@ -439,26 +420,25 @@ export const unsupportedJoinStrings = defineMessages({
 });
 
 export const conversationJoinStrings = defineMessages({
-  existentAccountHeadline: {
-    defaultMessage: '{name}, you have been invited to join a conversation in {brandName}',
-    id: 'conversationJoin.existentAccountHeadline',
-  },
   existentAccountJoinWithoutLink: {
     defaultMessage: 'Join the conversation',
     id: 'conversationJoin.existentAccountJoinWithoutLink',
   },
-  existentAccountJoinWithoutText: {
-    defaultMessage: '{existentAccountJoinWithoutLink} without an account',
-    id: 'conversationJoin.existentAccountJoinWithoutText',
+  join: {
+    defaultMessage: 'Join',
+    id: 'conversationJoin.join',
   },
-  existentAccountOpenButton: {
-    defaultMessage: 'Open in {brandName}',
-    id: 'conversationJoin.buttonExistentAccountOpen',
+  joinWithOtherAccount: {
+    defaultMessage: 'Join with another account',
+    id: 'conversationJoin.joinWithOtherAccount',
   },
-  existentAccountSubhead: {
-    defaultMessage:
-      'Audio and video conferencing, text messaging, file sharing, and screen sharing, all end-to-end-encrypted.',
-    id: 'conversationJoin.existentAccountSubhead',
+  existentAccountJoinInBrowser: {
+    defaultMessage: 'Join in the browser',
+    id: 'conversationJoin.existentAccountJoinInBrowser',
+  },
+  existentAccountUserName: {
+    defaultMessage: 'You are logged in as {selfName}',
+    id: 'conversationJoin.existentAccountUserName',
   },
   fullConversationHeadline: {
     defaultMessage: 'Unable to join conversation',
@@ -473,17 +453,9 @@ export const conversationJoinStrings = defineMessages({
     id: 'conversationJoin.hasAccount',
   },
   headline: {
-    defaultMessage: 'You have been invited to join a conversation in {brandName}',
+    defaultMessage: 'The conversation takes place on {domain}',
     id: 'conversationJoin.headline',
   },
-  invalidCreateAccountLink: {
-    defaultMessage: 'Create an account',
-    id: 'conversationJoin.invalidCreateAccountLink',
-  },
-  invalidCreateAccountText: {
-    defaultMessage: 'for group messaging and conference calls.',
-    id: 'conversationJoin.invalidCreateAccountText',
-  },
   invalidHeadline: {
     defaultMessage: 'Conversation not found',
     id: 'conversationJoin.invalidHeadline',
@@ -492,18 +464,26 @@ export const conversationJoinStrings = defineMessages({
     defaultMessage: 'The link to this group conversation expired or the conversation was set to private.',
     id: 'conversationJoin.invalidSubhead',
   },
-  loginLink: {
-    defaultMessage: 'Log in',
-    id: 'conversationJoin.loginLink',
-  },
   namePlaceholder: {
     defaultMessage: 'Your name',
     id: 'conversationJoin.namePlaceholder',
   },
+  noAccountHead: {
+    defaultMessage: "Don't have an account?",
+    id: 'conversationJoin.noAccountHead',
+  },
   subhead: {
     defaultMessage: 'Join conversation as temporary guest (access expires after 24 hours)',
     id: 'conversationJoin.subhead',
   },
+  joinButton: {
+    defaultMessage: 'Join as Temporary Guest',
+    id: 'conversationJoin.joinButton',
+  },
+  mainHeadline: {
+    defaultMessage: 'Join Conversation',
+    id: 'conversationJoin.mainHeadline',
+  },
 });
 
 export const errorHandlerStrings = defineMessages({
@@ -527,6 +507,10 @@ export const errorHandlerStrings = defineMessages({
     defaultMessage: 'This conversation has reached the limit of participants',
     id: 'BackendError.LABEL.CONVERSATION_TOO_MANY_MEMBERS',
   },
+  [BackendErrorLabel.TOO_MANY_TEAM_MEMBERS]: {
+    defaultMessage: 'This team has reached its maximum size',
+    id: 'BackendError.LABEL.TOO_MANY_MEMBERS',
+  },
   [BackendErrorLabel.ACCESS_DENIED]: {
     defaultMessage: 'Please verify your details and try again',
     id: 'BackendError.LABEL.ACCESS_DENIED',
@@ -585,11 +569,12 @@ export const errorHandlerStrings = defineMessages({
     id: 'BackendError.LABEL.TOO_MANY_REQUESTS',
   },
   [BackendErrorLabel.BAD_REQUEST]: {
-    defaultMessage: 'Invalid input',
+    defaultMessage: 'Please verify your details and try again',
     id: 'BackendError.LABEL.BAD_REQUEST',
   },
   [SyntheticErrorLabel.EMAIL_REQUIRED]: {
-    defaultMessage: 'Log in with an email address is required when two-factor authentication is activated',
+    defaultMessage:
+      'You can’t use your username as two-factor authentication is activated. Please log in with your email instead.',
     id: 'BackendError.LABEL.EMAIL_REQUIRED',
   },
   [BackendErrorLabel.INVALID_OPERATION]: {
@@ -597,13 +582,9 @@ export const errorHandlerStrings = defineMessages({
     id: 'BackendError.LABEL.INVALID_OPERATION',
   },
   [BackendErrorLabel.INVALID_PAYLOAD]: {
-    defaultMessage: 'Invalid input',
+    defaultMessage: 'Please verify your details and try again',
     id: 'BackendError.LABEL.INVALID_PAYLOAD',
   },
-  [BackendErrorLabel.NOT_FOUND]: {
-    defaultMessage: 'Could not find resource',
-    id: 'BackendError.LABEL.NOT_FOUND',
-  },
   [BackendErrorLabel.OPERATION_DENIED]: {
     defaultMessage: 'You don’t have permission',
     id: 'BackendError.LABEL.OPERATION_DENIED',
@@ -640,10 +621,6 @@ export const errorHandlerStrings = defineMessages({
     defaultMessage: 'Could not find team member',
     id: 'BackendError.LABEL.NO_TEAM_MEMBER',
   },
-  [BackendErrorLabel.TOO_MANY_MEMBERS]: {
-    defaultMessage: 'This team has reached its maximum size',
-    id: 'BackendError.LABEL.TOO_MANY_MEMBERS',
-  },
   [BackendErrorLabel.SUSPENDED_ACCOUNT]: {
     defaultMessage: 'This account is no longer authorized to log in',
     id: 'BackendError.LABEL.SUSPENDED',
@@ -955,16 +932,16 @@ export const oauthStrings = defineMessages({
     id: 'oauth.allow',
   },
   subhead: {
-    defaultMessage: '{app} requires your permission to:',
+    defaultMessage: 'Microsoft Outlook requires your permission to:',
     id: 'oauth.subhead',
   },
   learnMore: {
-    defaultMessage: '<learnMore>Learn more</learnMore> about these permissions in the settings.',
+    defaultMessage: '<learnMore>Learn more</learnMore> about these permissions',
     id: 'oauth.learnMore',
   },
   details: {
     defaultMessage:
-      'If you allow the permissions listed, Wire™ will be able to connect to your calendar. It won’t see the content of your calendar, just the ones happening with Wire. If you don’t grant the permissions, you can’t use this add-in.',
+      'If you allow the permissions listed above, your Outlook Calendar will be able to connect to Wire. If you don’t grant the permissions, you can’t use this add-in.',
     id: 'oauth.details',
   },
   privacyPolicy: {
@@ -972,19 +949,19 @@ export const oauthStrings = defineMessages({
     id: 'oauth.privacypolicy',
   },
   [Scope.WRITE_CONVERSATIONS]: {
-    defaultMessage: 'Create conversations',
+    defaultMessage: 'Create conversations in Wire',
     id: 'oauth.scope.write_conversations',
   },
   [Scope.WRITE_CONVERSATIONS_CODE]: {
-    defaultMessage: 'Create conversation guest links',
+    defaultMessage: 'Create guest links to conversations in Wire',
     id: 'oauth.scope.write_conversations_code',
   },
   [Scope.READ_SELF]: {
-    defaultMessage: 'Access user information',
+    defaultMessage: 'View your Wire username, profile name, and email',
     id: 'oauth.scope.read_self',
   },
   [Scope.READ_FEATURE_CONFIGS]: {
-    defaultMessage: 'Access team feature configurations',
+    defaultMessage: 'View your team’s feature configurations',
     id: 'oauth.scope.read_feature_configs',
   },
 });
diff --git a/test/unit_tests/team/TeamRepositorySpec.js b/src/script/team/TeamRepository.test.ts
similarity index 52%
rename from test/unit_tests/team/TeamRepositorySpec.js
rename to src/script/team/TeamRepository.test.ts
index 82f18d9818a..42cc677b432 100644
--- a/test/unit_tests/team/TeamRepositorySpec.js
+++ b/src/script/team/TeamRepository.test.ts
@@ -17,18 +17,50 @@
  *
  */
 
+import {Permissions} from '@wireapp/api-client/lib/team/member';
+
+import {randomUUID} from 'crypto';
+
 import {User} from 'src/script/entity/User';
 import {TeamRepository} from 'src/script/team/TeamRepository';
 import {TeamState} from 'src/script/team/TeamState';
 import {UserState} from 'src/script/user/UserState';
 
+import {TeamEntity} from './TeamEntity';
+import {TeamMemberEntity} from './TeamMemberEntity';
+import {TeamService} from './TeamService';
+
+import {AssetRepository} from '../assets/AssetRepository';
+import {ROLE} from '../user/UserPermission';
+import {UserRepository} from '../user/UserRepository';
+
+function buildConnectionRepository() {
+  const team = new TeamEntity(randomUUID());
+  const userState = new UserState();
+  const selfUser = new User('self-id', 'self-domain');
+  selfUser.teamId = team.id;
+  selfUser.isMe = true;
+  selfUser.teamRole(ROLE.NONE);
+  userState.self(selfUser);
+
+  const teamState = new TeamState(userState);
+  teamState.team(team);
+  const userRepository = {} as UserRepository;
+  const assetRepository = {} as AssetRepository;
+  const teamService = new TeamService({} as any);
+  return [
+    new TeamRepository(userRepository, assetRepository, teamService, userState, teamState),
+    {userState, teamState, userRepository, assetRepository, teamService},
+  ] as const;
+}
+
 describe('TeamRepository', () => {
   const teams_data = {
     teams: [
       {
         binding: true,
         creator: '9ca1bf41-42cd-4ee4-b54e-99e8dcc9d375',
-        icon_key: null,
+        icon_key: '',
         icon: '',
         id: 'e6d3adc5-9140-477a-abc1-8279d210ceab',
         name: 'Wire GmbH',
@@ -39,31 +71,17 @@ describe('TeamRepository', () => {
   const team_metadata = teams_data.teams[0];
   const team_members = {
     members: [
-      {user: 'bac6597b-5396-4a6a-8de9-d5aa75c998bf', permissions: 4},
-      {user: '74fa64dc-8318-4426-9935-82590ff8aa3e', permissions: 8},
+      {user: randomUUID(), permissions: {copy: Permissions.DEFAULT, self: Permissions.DEFAULT}},
+      {user: randomUUID(), permissions: {copy: Permissions.DEFAULT, self: Permissions.DEFAULT}},
     ],
   };
 
   describe('getTeam()', () => {
     it('returns the team entity', async () => {
-      const userState = new UserState();
-      const selfUser = new User('self-id');
-      selfUser.teamId = 'e6d3adc5-9140-477a-abc1-8279d210ceab';
-      selfUser.isMe = true;
-      userState.users([selfUser]);
-      const teamService = {
-        getTeamById: jest.fn(team => Promise.resolve(team_metadata)),
-      };
-      const teamRepo = new TeamRepository(
-        teamService,
-        {
-          mapGuestStatus: jest.fn(),
-        },
-        {},
-        userState,
-        new TeamState(userState),
-      );
-      jest.spyOn(teamRepo, 'getSelfMember').mockImplementation(team => Promise.resolve(team_members.members[0]));
+      const [teamRepo, {teamService}] = buildConnectionRepository();
+      jest.spyOn(teamService, 'getTeamById').mockResolvedValue(team_metadata);
+
+      jest.spyOn(teamRepo, 'getSelfMember').mockResolvedValue(new TeamMemberEntity(randomUUID()));
 
       const team_et = await teamRepo.getTeam();
       const [team_data] = teams_data.teams;
@@ -75,12 +93,9 @@ describe('TeamRepository', () => {
 
   describe('getAllTeamMembers()', () => {
     it('returns team member entities', async () => {
-      const userState = new UserState();
-      const teamService = {
-        getAllTeamMembers: jest.fn(() => Promise.resolve(team_members)),
-      };
-      const teamRepo = new TeamRepository(teamService, {}, {}, userState, new TeamState(userState));
-      const entities = await teamRepo.getAllTeamMembers(team_metadata.id);
+      const [teamRepo, {teamService}] = buildConnectionRepository();
+      jest.spyOn(teamService, 'getAllTeamMembers').mockResolvedValue({hasMore: false, members: team_members.members});
+      const entities = await teamRepo['getAllTeamMembers'](team_metadata.id);
       expect(entities.length).toEqual(team_members.members.length);
       expect(entities[0].userId).toEqual(team_members.members[0].user);
       expect(entities[0].permissions).toEqual(team_members.members[0].permissions);
@@ -89,27 +104,9 @@ describe('TeamRepository', () => {
 
   describe('sendAccountInfo', () => {
     it('does not crash when there is no team logo', async () => {
-      const userState = new UserState();
-      const selfUser = new User();
-      selfUser.isMe = true;
-      selfUser.teamRole('z.team.TeamRole.ROLE.NONE');
-      userState.users([selfUser]);
-      const teamState = new TeamState(userState);
-      teamState.team({
-        id: 'team-id',
-        members: () => [],
-        getIconResource: () => {},
-        name: () => 'teamName',
-      });
-
-      const teamRepo = new TeamRepository(
-        {}, // TeamService,
-        {}, // UserRepository,
-        {}, // AssetRepository,
-        userState,
-        teamState,
-      );
-      expect(teamRepo.teamState.isTeam()).toBe(true);
+      const [teamRepo] = buildConnectionRepository();
+
+      expect(teamRepo['teamState'].isTeam()).toBe(true);
 
       const accountInfo = await teamRepo.sendAccountInfo(true);
 
diff --git a/src/script/team/TeamRepository.ts b/src/script/team/TeamRepository.ts
index dcc6f2a30ab..d6734d10c6f 100644
--- a/src/script/team/TeamRepository.ts
+++ b/src/script/team/TeamRepository.ts
@@ -17,32 +17,32 @@
  *
  */
 
-import type {ConversationRolesList} from '@wireapp/api-client/lib/conversation/ConversationRole';
+import {ConversationRolesList, ConversationProtocol} from '@wireapp/api-client/lib/conversation';
 import type {
   TeamConversationDeleteEvent,
   TeamDeleteEvent,
   TeamEvent,
+  TeamFeatureConfigurationUpdateEvent,
   TeamMemberJoinEvent,
   TeamMemberLeaveEvent,
   TeamMemberUpdateEvent,
   TeamUpdateEvent,
 } from '@wireapp/api-client/lib/event';
 import {TEAM_EVENT} from '@wireapp/api-client/lib/event/TeamEvent';
-import type {FeatureList} from '@wireapp/api-client/lib/team/feature/';
-import {FeatureStatus, FEATURE_KEY, SelfDeletingTimeout} from '@wireapp/api-client/lib/team/feature/';
+import {FeatureStatus, FeatureList} from '@wireapp/api-client/lib/team/feature/';
 import type {TeamData} from '@wireapp/api-client/lib/team/team/TeamData';
 import {QualifiedId} from '@wireapp/api-client/lib/user';
 import {amplify} from 'amplify';
 import {container} from 'tsyringe';
 
-import {Runtime} from '@wireapp/commons';
+import {Runtime, TypedEventEmitter} from '@wireapp/commons';
 import {Availability} from '@wireapp/protocol-messaging';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import {Environment} from 'Util/Environment';
-import {replaceLink, t} from 'Util/LocalizerUtil';
+import {t} from 'Util/LocalizerUtil';
 import {getLogger, Logger} from 'Util/Logger';
-import {formatDuration, TIME_IN_MILLIS} from 'Util/TimeUtil';
+import {TIME_IN_MILLIS} from 'Util/TimeUtil';
 import {loadDataUrl} from 'Util/util';
 
 import {TeamEntity} from './TeamEntity';
@@ -53,13 +53,12 @@ import {TeamState} from './TeamState';
 
 import {AssetRepository} from '../assets/AssetRepository';
 import {SIGN_OUT_REASON} from '../auth/SignOutReason';
-import {PrimaryModal} from '../components/Modals/PrimaryModal';
-import {Config} from '../Config';
 import {User} from '../entity/User';
 import {EventSource} from '../event/EventSource';
 import {NOTIFICATION_HANDLING_STATE} from '../event/NotificationHandlingState';
 import {IntegrationMapper} from '../integration/IntegrationMapper';
 import {ServiceEntity} from '../integration/ServiceEntity';
+import {MLSMigrationStatus, getMLSMigrationStatus} from '../mls/MLSMigration/migrationStatus';
 import {ROLE, ROLE as TEAM_ROLE, roleFromTeamPermissions} from '../user/UserPermission';
 import {UserRepository} from '../user/UserRepository';
 import {UserState} from '../user/UserState';
@@ -74,25 +73,31 @@ export interface AccountInfo {
   userID: string;
 }
 
-export class TeamRepository {
-  private static readonly LOCAL_STORAGE_FEATURE_CONFIG_KEY = 'FEATURE_CONFIG_KEY';
+type Events = {
+  featureUpdated: {
+    prevFeatureList?: FeatureList;
+    event: TeamFeatureConfigurationUpdateEvent;
+  };
+  teamRefreshed: void;
+};
+
+export class TeamRepository extends TypedEventEmitter<Events> {
   private readonly logger: Logger;
-  readonly teamService: TeamService;
   private readonly teamMapper: TeamMapper;
   private readonly userRepository: UserRepository;
   private readonly assetRepository: AssetRepository;
 
   constructor(
-    teamService: TeamService,
     userRepository: UserRepository,
     assetRepository: AssetRepository,
+    readonly teamService: TeamService = new TeamService(),
     private readonly userState = container.resolve(UserState),
     private readonly teamState = container.resolve(TeamState),
   ) {
+    super();
     this.logger = getLogger('TeamRepository');
 
     this.teamMapper = new TeamMapper();
-    this.teamService = teamService;
     this.assetRepository = assetRepository;
     this.userRepository = userRepository;
 
@@ -107,7 +112,7 @@ export class TeamRepository {
     };
 
     amplify.subscribe(WebAppEvents.TEAM.EVENT_FROM_BACKEND, this.onTeamEvent);
-    amplify.subscribe(WebAppEvents.EVENT.NOTIFICATION_HANDLING_STATE, this.onNotificationHandlingStateChange);
+    amplify.subscribe(WebAppEvents.EVENT.NOTIFICATION_HANDLING_STATE, this.updateTeamConfig);
     amplify.subscribe(WebAppEvents.TEAM.UPDATE_INFO, this.sendAccountInfo.bind(this));
   }
 
@@ -126,6 +131,7 @@ export class TeamRepository {
     teamId?: string,
   ): Promise<{team: TeamEntity; members: QualifiedId[]} | {team: undefined; members: never[]}> => {
     const team = await this.getTeam();
+    // get the fresh feature config from backend
     await this.updateFeatureConfig();
     if (!teamId) {
       return {team: undefined, members: []};
@@ -135,9 +141,15 @@ export class TeamRepository {
     return {team, members};
   };
 
-  private async updateFeatureConfig() {
-    this.teamState.teamFeatures(await this.teamService.getAllTeamFeatures());
-    return this.teamState.teamFeatures();
+  private async updateFeatureConfig(): Promise<{newFeatureList: FeatureList; prevFeatureList?: FeatureList}> {
+    const prevFeatureList = this.teamState.teamFeatures();
+    const newFeatureList = await this.teamService.getAllTeamFeatures();
+    this.teamState.teamFeatures(newFeatureList);
+
+    return {
+      newFeatureList,
+      prevFeatureList,
+    };
   }
 
   private readonly scheduleTeamRefresh = (): void => {
@@ -145,6 +157,7 @@ export class TeamRepository {
       try {
         await this.getTeam();
         await this.updateFeatureConfig();
+        this.emit('teamRefreshed');
       } catch (error) {
         this.logger.error(error);
       }
@@ -221,7 +234,7 @@ export class TeamRepository {
     return IntegrationMapper.mapServicesFromArray(servicesData, domain);
   }
 
-  readonly onTeamEvent = (eventJson: any, source: EventSource): void => {
+  readonly onTeamEvent = async (eventJson: any, source: EventSource): Promise<void> => {
     if (this.teamState.isTeamDeleted()) {
       // We don't want to handle any events after the team has been deleted
       return;
@@ -249,7 +262,7 @@ export class TeamRepository {
         break;
       }
       case TEAM_EVENT.MEMBER_UPDATE: {
-        this.onMemberUpdate(eventJson);
+        await this.onMemberUpdate(eventJson);
         break;
       }
       case TEAM_EVENT.UPDATE: {
@@ -257,7 +270,7 @@ export class TeamRepository {
         break;
       }
       case TEAM_EVENT.FEATURE_CONFIG_UPDATE: {
-        this.onFeatureConfigUpdate(eventJson, source);
+        await this.onFeatureConfigUpdate(eventJson, source);
         break;
       }
       case TEAM_EVENT.CONVERSATION_CREATE:
@@ -394,171 +407,28 @@ export class TeamRepository {
     }
   }
 
-  private readonly onNotificationHandlingStateChange = async (
-    handlingNotifications: NOTIFICATION_HANDLING_STATE,
-  ): Promise<void> => {
+  private readonly updateTeamConfig = async (handlingNotifications: NOTIFICATION_HANDLING_STATE): Promise<void> => {
     const shouldFetchConfig = handlingNotifications === NOTIFICATION_HANDLING_STATE.WEB_SOCKET;
 
     if (shouldFetchConfig) {
-      const featureConfigList = await this.updateFeatureConfig();
-      this.handleConfigUpdate(featureConfigList);
+      await this.updateFeatureConfig();
     }
   };
 
   private readonly onFeatureConfigUpdate = async (
-    eventJson: TeamEvent & {name: FEATURE_KEY},
+    event: TeamFeatureConfigurationUpdateEvent,
     source: EventSource,
   ): Promise<void> => {
     if (source !== EventSource.WEBSOCKET) {
       // Ignore notification stream events
       return;
     }
-    const featureConfigList = await this.updateFeatureConfig();
-    this.handleConfigUpdate(featureConfigList);
-  };
-
-  private readonly handleConfigUpdate = (featureConfigList: FeatureList) => {
-    const previousConfig = this.loadPreviousFeatureConfig();
-
-    if (previousConfig) {
-      this.handleAudioVideoFeatureChange(previousConfig, featureConfigList);
-      this.handleFileSharingFeatureChange(previousConfig, featureConfigList);
-      this.handleSelfDeletingMessagesFeatureChange(previousConfig, featureConfigList);
-      this.handleConferenceCallingFeatureChange(previousConfig, featureConfigList);
-      this.handleGuestLinkFeatureChange(previousConfig, featureConfigList);
-    }
-    this.saveFeatureConfig(featureConfigList);
-  };
-
-  private readonly handleFileSharingFeatureChange = (previousConfig: FeatureList, newConfig: FeatureList) => {
-    const hasFileSharingChanged =
-      previousConfig?.fileSharing?.status && previousConfig.fileSharing.status !== newConfig?.fileSharing?.status;
-    const hasChangedToEnabled = newConfig?.fileSharing?.status === FeatureStatus.ENABLED;
-
-    if (hasFileSharingChanged) {
-      PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-        text: {
-          htmlMessage: hasChangedToEnabled
-            ? t('featureConfigChangeModalFileSharingDescriptionItemFileSharingEnabled')
-            : t('featureConfigChangeModalFileSharingDescriptionItemFileSharingDisabled'),
-          title: t('featureConfigChangeModalFileSharingHeadline', {brandName: Config.getConfig().BRAND_NAME}),
-        },
-      });
-    }
-  };
-
-  private readonly handleGuestLinkFeatureChange = (previousConfig: FeatureList, newConfig: FeatureList) => {
-    const hasGuestLinkChanged =
-      previousConfig?.conversationGuestLinks?.status &&
-      previousConfig.conversationGuestLinks.status !== newConfig?.conversationGuestLinks?.status;
-    const hasGuestLinkChangedToEnabled = newConfig?.conversationGuestLinks?.status === FeatureStatus.ENABLED;
-
-    if (hasGuestLinkChanged) {
-      PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-        text: {
-          htmlMessage: hasGuestLinkChangedToEnabled
-            ? t('featureConfigChangeModalConversationGuestLinksDescriptionItemConversationGuestLinksEnabled')
-            : t('featureConfigChangeModalConversationGuestLinksDescriptionItemConversationGuestLinksDisabled'),
-          title: t('featureConfigChangeModalConversationGuestLinksHeadline'),
-        },
-      });
-    }
-  };
-
-  private readonly handleSelfDeletingMessagesFeatureChange = (
-    {selfDeletingMessages: previousState}: FeatureList,
-    {selfDeletingMessages: newState}: FeatureList,
-  ) => {
-    if (!previousState?.status) {
-      return;
-    }
-    const previousTimeout = previousState?.config?.enforcedTimeoutSeconds * 1000;
-    const newTimeout = (newState?.config?.enforcedTimeoutSeconds ?? 0) * 1000;
-    const previousStatus = previousState.status;
-    const newStatus = newState?.status;
-
-    const hasTimeoutChanged = previousTimeout !== newTimeout;
-    const isEnforced = newTimeout > SelfDeletingTimeout.OFF;
-    const hasStatusChanged = previousStatus !== newStatus;
-    const hasFeatureChanged = hasStatusChanged || hasTimeoutChanged;
-    const isFeatureEnabled = newStatus === FeatureStatus.ENABLED;
-
-    if (hasFeatureChanged) {
-      PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-        text: {
-          htmlMessage: isFeatureEnabled
-            ? isEnforced
-              ? t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnforced', {
-                  timeout: formatDuration(newTimeout).text,
-                })
-              : t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemEnabled')
-            : t('featureConfigChangeModalSelfDeletingMessagesDescriptionItemDisabled'),
-          title: t('featureConfigChangeModalSelfDeletingMessagesHeadline', {
-            brandName: Config.getConfig().BRAND_NAME,
-          }),
-        },
-      });
-    }
-  };
-
-  private readonly handleAudioVideoFeatureChange = (previousConfig: FeatureList, newConfig: FeatureList) => {
-    const hasVideoCallingChanged =
-      previousConfig?.videoCalling?.status && previousConfig.videoCalling.status !== newConfig?.videoCalling?.status;
-    const hasChangedToEnabled = newConfig?.videoCalling?.status === FeatureStatus.ENABLED;
-
-    if (hasVideoCallingChanged) {
-      PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-        text: {
-          htmlMessage: hasChangedToEnabled
-            ? t('featureConfigChangeModalAudioVideoDescriptionItemCameraEnabled')
-            : t('featureConfigChangeModalAudioVideoDescriptionItemCameraDisabled'),
-          title: t('featureConfigChangeModalAudioVideoHeadline', {brandName: Config.getConfig().BRAND_NAME}),
-        },
-      });
-    }
-  };
-
-  private readonly handleConferenceCallingFeatureChange = (previousConfig: FeatureList, newConfig: FeatureList) => {
-    if (
-      previousConfig?.conferenceCalling?.status &&
-      previousConfig.conferenceCalling.status !== newConfig?.conferenceCalling?.status
-    ) {
-      const hasChangedToEnabled = newConfig?.conferenceCalling?.status === FeatureStatus.ENABLED;
-      if (hasChangedToEnabled) {
-        const replaceEnterprise = replaceLink(
-          Config.getConfig().URL.PRICING,
-          'modal__text__read-more',
-          'read-more-pricing',
-        );
-        PrimaryModal.show(PrimaryModal.type.ACKNOWLEDGE, {
-          text: {
-            htmlMessage: t(
-              'featureConfigChangeModalConferenceCallingEnabled',
-              {brandName: Config.getConfig().BRAND_NAME},
-              replaceEnterprise,
-            ),
-            title: t('featureConfigChangeModalConferenceCallingTitle', {brandName: Config.getConfig().BRAND_NAME}),
-          },
-        });
-      }
-    }
-  };
 
-  private readonly loadPreviousFeatureConfig = (): FeatureList | void => {
-    const featureConfigs: {[selfId: string]: FeatureList} = JSON.parse(
-      window.localStorage.getItem(TeamRepository.LOCAL_STORAGE_FEATURE_CONFIG_KEY) ?? '{}',
-    );
-    if (featureConfigs && featureConfigs[this.userState.self().id]) {
-      return featureConfigs[this.userState.self().id];
-    }
+    // When we receive a `feature-config.update` event, we will refetch the entire feature config
+    const {prevFeatureList} = await this.updateFeatureConfig();
+    this.emit('featureUpdated', {event, prevFeatureList});
   };
 
-  private readonly saveFeatureConfig = (featureConfigList: FeatureList): void =>
-    window.localStorage.setItem(
-      TeamRepository.LOCAL_STORAGE_FEATURE_CONFIG_KEY,
-      JSON.stringify({[this.userState.self().id]: featureConfigList}),
-    );
-
   private onMemberLeave(eventJson: TeamMemberLeaveEvent): void {
     const {
       data: {user: userId},
@@ -634,4 +504,20 @@ export class TeamRepository {
       this.sendAccountInfo();
     }
   }
+
+  public getTeamSupportedProtocols(): ConversationProtocol[] {
+    const mlsFeature = this.teamState.teamFeatures()?.mls;
+
+    if (!mlsFeature || mlsFeature.status === FeatureStatus.DISABLED) {
+      return [ConversationProtocol.PROTEUS];
+    }
+
+    return mlsFeature.config.supportedProtocols || [ConversationProtocol.PROTEUS];
+  }
+
+  public getTeamMLSMigrationStatus(): MLSMigrationStatus {
+    const mlsMigrationFeature = this.teamState.teamFeatures()?.mlsMigration;
+
+    return getMLSMigrationStatus(mlsMigrationFeature);
+  }
 }
diff --git a/src/script/team/TeamState.ts b/src/script/team/TeamState.ts
index bcfa9208b58..d9a8d7e6d74 100644
--- a/src/script/team/TeamState.ts
+++ b/src/script/team/TeamState.ts
@@ -36,7 +36,7 @@ export class TeamState {
   public readonly memberRoles: ko.Observable<any>;
   public readonly supportsLegalHold: ko.Observable<boolean>;
   public readonly teamName: ko.PureComputed<string>;
-  public readonly teamFeatures: ko.Observable<FeatureList>;
+  public readonly teamFeatures: ko.Observable<FeatureList | undefined>;
   public readonly classifiedDomains: ko.PureComputed<string[] | undefined>;
   public readonly isConferenceCallingEnabled: ko.PureComputed<boolean>;
   public readonly isFileSharingSendingEnabled: ko.PureComputed<boolean>;
diff --git a/src/script/ui/ContextMenu.tsx b/src/script/ui/ContextMenu.tsx
index c564460d0c8..de449db3d5f 100644
--- a/src/script/ui/ContextMenu.tsx
+++ b/src/script/ui/ContextMenu.tsx
@@ -26,6 +26,7 @@ import {Availability} from '@wireapp/protocol-messaging';
 
 import {Icon} from 'Components/Icon';
 import {IgnoreOutsideClickWrapper} from 'Components/InputBar/util/clickHandlers';
+import {useMessageActionsState} from 'Components/MessagesList/Message/ContentMessage/MessageActions/MessageActions.state';
 import {isEnterKey, isEscapeKey, isKey, isOneOfKeys, isSpaceKey, KEY} from 'Util/KeyboardUtil';
 
 export interface ContextMenuEntry {
@@ -45,6 +46,7 @@ interface ContextMenuProps {
   entries: ContextMenuEntry[];
   posX: number;
   posY: number;
+  resetMenuStates?: () => void;
 }
 
 let container: HTMLDivElement;
@@ -62,12 +64,13 @@ const cleanUp = () => {
 const getButtonId = (label: string): string => `btn-${label?.split(' ').join('-').toLowerCase()}`;
 
 const contextMenuClassName = 'ctx-menu';
-
+const msgMenuIdentifier = 'message-options-menu';
 const ContextMenu: React.FC<ContextMenuProps> = ({
   entries,
   defaultIdentifier = `${contextMenuClassName}-item`,
   posX,
   posY,
+  resetMenuStates,
 }) => {
   const [mainElement, setMainElement] = useState<HTMLUListElement>();
   const [selected, setSelected] = useState<ContextMenuEntry>();
@@ -112,6 +115,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
         // escape/tab key press while the menu is open will close the menu and focus the trigerer
         cleanUp();
         previouslyFocused.focus();
+        resetMsgMenuStates();
       }
 
       if (isOneOfKeys(event, [KEY.ARROW_UP, KEY.ARROW_DOWN])) {
@@ -127,6 +131,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
       if (isEnterKey(event) || isSpaceKey(event)) {
         if (selected) {
           cleanUp();
+          resetMsgMenuStates();
           selected.click?.();
           previouslyFocused.focus();
         }
@@ -137,6 +142,7 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
       const isOutsideClick = mainElement && !mainElement.contains(event.target as Node);
       if (isOutsideClick) {
         cleanUp();
+        resetMsgMenuStates(isOutsideClick);
       }
     };
 
@@ -153,60 +159,74 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
     };
   }, [mainElement, selected]);
 
+  const {handleMenuOpen} = useMessageActionsState();
+  const resetMsgMenuStates = (isOutsideClick = false) => {
+    if (defaultIdentifier === msgMenuIdentifier) {
+      handleMenuOpen?.(false);
+
+      if (isOutsideClick) {
+        resetMenuStates?.();
+      }
+    }
+  };
+
   return (
     <IgnoreOutsideClickWrapper>
-      <ul
-        className={contextMenuClassName}
-        ref={setMainElement}
-        style={{maxHeight: window.innerHeight, ...style}}
-        role="menu"
-      >
-        {entries.map((entry, index) =>
-          entry.isSeparator ? (
-            <li key={`${index}`} className={`${contextMenuClassName}__separator`} />
-          ) : (
-            <li
-              key={`${index}`}
-              className={cx(`${contextMenuClassName}__item`, {
-                [`${contextMenuClassName}__item--checked`]: entry.isChecked,
-                [`${contextMenuClassName}__item--disabled`]: entry.isDisabled,
-                selected: entry === selected,
-              })}
-              role="menuitem"
-              aria-haspopup="true"
-            >
-              <button
-                id={getButtonId(entry.label!)}
-                className={`${contextMenuClassName}__button`}
-                type="button"
-                data-uie-name={entry.identifier || defaultIdentifier}
-                title={entry.title || entry.label}
-                {...(entry.isDisabled
-                  ? undefined
-                  : {
-                      onClick: event => {
-                        event.preventDefault();
-                        cleanUp();
-                        entry.click?.(event.nativeEvent);
-                      },
-                      onMouseEnter: () => {
-                        setSelected(undefined);
-                      },
-                    })}
+      <div className="overlay">
+        <ul
+          className={contextMenuClassName}
+          ref={setMainElement}
+          style={{maxHeight: window.innerHeight, ...style}}
+          role="menu"
+        >
+          {entries.map((entry, index) =>
+            entry.isSeparator ? (
+              <li key={`${index}`} className={`${contextMenuClassName}__separator`} />
+            ) : (
+              <li
+                key={`${index}`}
+                className={cx(`${contextMenuClassName}__item`, {
+                  [`${contextMenuClassName}__item--checked`]: entry.isChecked,
+                  [`${contextMenuClassName}__item--disabled`]: entry.isDisabled,
+                  selected: entry === selected,
+                })}
+                role="menuitem"
+                aria-haspopup="true"
               >
-                {entry.icon && <Icon name={entry.icon} className={`${contextMenuClassName}__icon`} />}
-                <span>{entry.label}</span>
-                {entry.isChecked && (
-                  <Icon.Check
-                    className={`${contextMenuClassName}__check`}
-                    data-uie-name={`${contextMenuClassName}-check`}
-                  />
-                )}
-              </button>
-            </li>
-          ),
-        )}
-      </ul>
+                <button
+                  id={getButtonId(entry.label!)}
+                  className={`${contextMenuClassName}__button`}
+                  type="button"
+                  data-uie-name={entry.identifier || defaultIdentifier}
+                  title={entry.title || entry.label}
+                  {...(entry.isDisabled
+                    ? undefined
+                    : {
+                        onClick: event => {
+                          event.preventDefault();
+                          cleanUp();
+                          resetMsgMenuStates();
+                          entry.click?.(event.nativeEvent);
+                        },
+                        onMouseEnter: () => {
+                          setSelected(undefined);
+                        },
+                      })}
+                >
+                  {entry.icon && <Icon name={entry.icon} className={`${contextMenuClassName}__icon`} />}
+                  <span>{entry.label}</span>
+                  {entry.isChecked && (
+                    <Icon.Check
+                      className={`${contextMenuClassName}__check`}
+                      data-uie-name={`${contextMenuClassName}-check`}
+                    />
+                  )}
+                </button>
+              </li>
+            ),
+          )}
+        </ul>
+      </div>
     </IgnoreOutsideClickWrapper>
   );
 };
@@ -215,6 +235,7 @@ export const showContextMenu = (
   event: MouseEvent | React.MouseEvent,
   entries: ContextMenuEntry[],
   identifier: string,
+  resetMenuStates?: () => void,
 ) => {
   event.preventDefault();
   event.stopPropagation();
@@ -226,6 +247,12 @@ export const showContextMenu = (
   document.body.appendChild(container);
   reactRoot = createRoot(container);
   reactRoot.render(
-    <ContextMenu entries={entries} defaultIdentifier={identifier} posX={event.clientX} posY={event.clientY} />,
+    <ContextMenu
+      entries={entries}
+      defaultIdentifier={identifier}
+      posX={event.clientX}
+      posY={event.clientY}
+      resetMenuStates={resetMenuStates}
+    />,
   );
 };
diff --git a/src/script/user/AvailabilityMapper.ts b/src/script/user/AvailabilityMapper.ts
index cf0acda1846..f405908a11a 100644
--- a/src/script/user/AvailabilityMapper.ts
+++ b/src/script/user/AvailabilityMapper.ts
@@ -19,8 +19,6 @@
 
 import {Availability} from '@wireapp/protocol-messaging';
 
-import {t} from 'Util/LocalizerUtil';
-
 import {BaseError} from '../error/BaseError';
 import {UserError} from '../error/UserError';
 
@@ -46,21 +44,6 @@ export const valueFromType = (availabilityType: Availability.Type): string => {
   throw new UserError(BaseError.TYPE.INVALID_PARAMETER, BaseError.MESSAGE.INVALID_PARAMETER);
 };
 
-export const nameFromType = (availabilityType: Availability.Type) => {
-  const TYPE_STRINGS = {
-    [Availability.Type.AVAILABLE]: t('userAvailabilityAvailable'),
-    [Availability.Type.AWAY]: t('userAvailabilityAway'),
-    [Availability.Type.BUSY]: t('userAvailabilityBusy'),
-    [Availability.Type.NONE]: t('userAvailabilityNone'),
-  };
-
-  const string = TYPE_STRINGS[availabilityType];
-  if (string) {
-    return string;
-  }
-  throw new UserError(BaseError.TYPE.INVALID_PARAMETER, BaseError.MESSAGE.INVALID_PARAMETER);
-};
-
 export const protoFromType = (availabilityType: Availability.Type) => {
   const typeValue = valueFromType(availabilityType).toUpperCase() as keyof typeof Availability.Type;
   return Availability.Type[typeValue];
diff --git a/src/script/user/UserMapper.test.ts b/src/script/user/UserMapper.test.ts
index ab1abad928a..f4d887be017 100644
--- a/src/script/user/UserMapper.test.ts
+++ b/src/script/user/UserMapper.test.ts
@@ -105,7 +105,6 @@ describe('User Mapper', () => {
       const user_et = mapper.mapUserFromJson(self_user_payload, '');
 
       expect(user_et.name()).toBe('John Doe');
-      expect(user_et.joaatHash).toBe(526273169);
       expect(user_et.accent_id()).toBe(ACCENT_ID.BLUE);
     });
   });
diff --git a/src/script/user/UserMapper.ts b/src/script/user/UserMapper.ts
index 809a31f559e..ea047ab9ef2 100644
--- a/src/script/user/UserMapper.ts
+++ b/src/script/user/UserMapper.ts
@@ -19,7 +19,6 @@
 
 import {container} from 'tsyringe';
 
-import {joaatHash} from 'Util/Crypto';
 import {getLogger, Logger} from 'Util/Logger';
 
 import {isSelfAPIUser} from './UserGuards';
@@ -38,7 +37,10 @@ export class UserMapper {
    * Construct a new User Mapper.
    * @param serverTimeHandler Handles time shift between server and client
    */
-  constructor(private readonly serverTimeHandler: ServerTimeHandler, private teamState = container.resolve(TeamState)) {
+  constructor(
+    private readonly serverTimeHandler: ServerTimeHandler,
+    private teamState = container.resolve(TeamState),
+  ) {
     this.logger = getLogger('UserMapper');
   }
 
@@ -88,7 +90,6 @@ export class UserMapper {
     const isNewUser = userEntity.id === '' && userData.id !== '';
     if (isNewUser && userData.id) {
       userEntity.id = userData.id;
-      userEntity.joaatHash = joaatHash(userData.id ?? '');
     }
 
     if (userData.qualified_id) {
@@ -114,6 +115,7 @@ export class UserMapper {
       picture,
       service,
       team: teamId,
+      supported_protocols: supportedProtocols,
     } = userData;
 
     if (accentId) {
@@ -141,6 +143,10 @@ export class UserMapper {
       userEntity.managedBy(managedBy);
     }
 
+    if (supportedProtocols) {
+      userEntity.supportedProtocols(supportedProtocols);
+    }
+
     if (expirationDate) {
       userEntity.isTemporaryGuest(true);
       const setAdjustedTimestamp = () => {
diff --git a/src/script/user/UserRepository.test.ts b/src/script/user/UserRepository.test.ts
index 0d810fd70eb..fa8dd48bb2e 100644
--- a/src/script/user/UserRepository.test.ts
+++ b/src/script/user/UserRepository.test.ts
@@ -18,6 +18,7 @@
  */
 
 import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data';
+import {QualifiedId} from '@wireapp/api-client/lib/user';
 import {amplify} from 'amplify';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
 
@@ -27,12 +28,14 @@ import {WebAppEvents} from '@wireapp/webapp-events';
 import {entities} from 'test/api/payloads';
 import {TestFactory} from 'test/helper/TestFactory';
 import {generateAPIUser} from 'test/helper/UserGenerator';
+import {matchQualifiedIds} from 'Util/QualifiedId';
 
 import {ConsentValue} from './ConsentValue';
 import {UserRepository} from './UserRepository';
 import {UserState} from './UserState';
 
 import {ClientMapper} from '../client/ClientMapper';
+import {ConnectionEntity} from '../connection/ConnectionEntity';
 import {User} from '../entity/User';
 import {EventRepository} from '../event/EventRepository';
 import {PropertiesRepository} from '../properties/PropertiesRepository';
@@ -214,26 +217,39 @@ describe('UserRepository', () => {
         userState.users([selfUser]);
       });
 
-      it('loads all users from backend if no users are stored locally', async () => {
+      it('loads all users from backend even when they are already known locally', async () => {
         const newUsers = [generateAPIUser(), generateAPIUser()];
         const users = [...localUsers, ...newUsers];
         const userIds = users.map(user => user.qualified_id!);
-        const fetchUserSpy = jest.spyOn(userRepository['userService'], 'getUsers').mockResolvedValue({found: newUsers});
+        const fetchUserSpy = jest.spyOn(userRepository['userService'], 'getUsers').mockResolvedValue({found: users});
 
         await userRepository.loadUsers(new User('self'), [], [], userIds);
 
         expect(userState.users()).toHaveLength(users.length + 1);
-        expect(fetchUserSpy).toHaveBeenCalledWith(newUsers.map(user => user.qualified_id!));
+        expect(fetchUserSpy).toHaveBeenCalledWith(users.map(user => user.qualified_id!));
       });
 
-      it('does not load users from backend if they are already in database', async () => {
-        const userIds = localUsers.map(user => user.qualified_id!);
-        const fetchUserSpy = jest.spyOn(userRepository['userService'], 'getUsers').mockResolvedValue({found: []});
+      it('assigns connections with users', async () => {
+        const newUsers = [generateAPIUser(), generateAPIUser()];
+        const users = [...localUsers, ...newUsers];
+        const userIds = users.map(user => user.qualified_id!);
+        jest.spyOn(userRepository['userService'], 'getUsers').mockResolvedValue({found: users});
 
-        await userRepository.loadUsers(new User('self'), [], [], userIds);
+        const createConnectionWithUser = (userId: QualifiedId) => {
+          const connection = new ConnectionEntity();
+          connection.userId = userId;
+          return connection;
+        };
 
-        expect(userState.users()).toHaveLength(localUsers.length + 1);
-        expect(fetchUserSpy).not.toHaveBeenCalled();
+        const connections = users.map(user => createConnectionWithUser(user.qualified_id));
+
+        await userRepository.loadUsers(new User('self'), connections, [], userIds);
+
+        expect(userState.users()).toHaveLength(users.length + 1);
+        users.forEach(user => {
+          const localUser = userState.users().find(u => matchQualifiedIds(u.qualifiedId, user.qualified_id));
+          expect(localUser?.connection().userId).toEqual(user.qualified_id);
+        });
       });
 
       it('loads users that are partially stored in the DB and maps availability', async () => {
diff --git a/src/script/user/UserRepository.ts b/src/script/user/UserRepository.ts
index 20be0fc4ca4..1d33c941e00 100644
--- a/src/script/user/UserRepository.ts
+++ b/src/script/user/UserRepository.ts
@@ -18,6 +18,7 @@
  */
 
 import type {AddedClient, PublicClient} from '@wireapp/api-client/lib/client';
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
 import {
   UserEvent,
   UserLegalHoldDisableEvent,
@@ -216,8 +217,7 @@ export class UserRepository {
     const [localUsers, incompleteUsers] = partition(dbUsers, user => !!user.qualified_id);
 
     /** users we have in the DB that are not matching any loaded users */
-    const [orphanUsers, liveUsers] = partition(
-      localUsers,
+    const orphanUsers = localUsers.filter(
       localUser => !users.find(user => matchQualifiedIds(user, localUser.qualified_id)),
     );
 
@@ -226,14 +226,10 @@ export class UserRepository {
       await this.userService.removeUserFromDb(orphanUser.qualified_id);
     }
 
-    const missingUsers = users.filter(
-      user =>
-        // The self user doesn't need to be re-fetched
-        !matchQualifiedIds(selfUser.qualifiedId, user) &&
-        !liveUsers.find(localUser => matchQualifiedIds(user, localUser.qualified_id)),
-    );
+    // The self user doesn't need to be re-fetched
+    const usersToFetch = users.filter(user => !matchQualifiedIds(selfUser.qualifiedId, user));
 
-    const {found, failed} = await this.fetchRawUsers(missingUsers, selfUser.domain);
+    const {found, failed} = await this.fetchRawUsers(usersToFetch, selfUser.domain);
 
     const userWithAvailability = found.map(user => {
       const availability = incompleteUsers
@@ -249,7 +245,7 @@ export class UserRepository {
     // Save all new users to the database
     await Promise.all(userWithAvailability.map(user => this.saveUserInDb(user)));
 
-    const mappedUsers = this.mapUserResponse(userWithAvailability.concat(liveUsers), failed);
+    const mappedUsers = this.mapUserResponse(userWithAvailability, failed);
 
     // Assign connections to users
     mappedUsers.forEach(user => {
@@ -719,6 +715,7 @@ export class UserRepository {
     if (!user) {
       if (isMe) {
         userEntity.isMe = true;
+        this.userState.self(userEntity);
       }
       this.userState.users.push(userEntity);
     }
@@ -748,19 +745,52 @@ export class UserRepository {
     return users.map(user => this.updateSavedUser(user));
   }
 
+  /**
+   * Refresh all known users (in local state) from the backend.
+   */
+  async refreshAllKnownUsers() {
+    const userIds = this.userState.users().map(user => user.qualifiedId);
+    return this.refreshUsers(userIds);
+  }
+
+  /**
+   * Will update user entity with provided list of supportedProtocols.
+   * @param userId - id of the user to update
+   * @param supportedProtocols - an array of new supported protocols
+   */
+  async updateUserSupportedProtocols(userId: QualifiedId, supportedProtocols: ConversationProtocol[]): Promise<User> {
+    return this.updateUser(userId, {supported_protocols: supportedProtocols});
+  }
+
+  getSelfSupportedProtocols(): ConversationProtocol[] | null {
+    return this.userState.self()?.supportedProtocols() || null;
+  }
+
+  public async getAllSelfClients() {
+    return this.clientRepository.getAllSelfClients();
+  }
+
   /**
    * will update the local user with fresh data from backend
    * @param user user data from backend
    */
-  private updateSavedUser(user: APIClientUser): User {
-    const localUserEntity = this.findUserById(generateQualifiedId(user)) ?? new User();
+  private async updateSavedUser(user: APIClientUser): Promise<User> {
+    const localUserEntity = this.findUserById(generateQualifiedId(user));
+    if (!localUserEntity) {
+      // If the user could not be found locally, we will get it and save it locally
+      return this.getUserById(user.qualified_id);
+    }
     const updatedUser = this.userMapper.updateUserFromObject(localUserEntity, user, this.userState.self().domain);
-    // TODO update the user in db
+    const {qualifiedId: userId} = updatedUser;
+
+    // update the user in db
+    await this.updateUser(userId, user);
+
     if (this.userState.isTeam()) {
       this.mapGuestStatus([updatedUser]);
     }
     if (updatedUser && updatedUser.inTeam() && updatedUser.isDeleted) {
-      amplify.publish(WebAppEvents.TEAM.MEMBER_LEAVE, updatedUser.teamId, updatedUser.qualifiedId);
+      amplify.publish(WebAppEvents.TEAM.MEMBER_LEAVE, updatedUser.teamId, userId);
     }
     return updatedUser;
   }
diff --git a/src/script/user/UserState.ts b/src/script/user/UserState.ts
index 1b9ed63d3db..bf4637664aa 100644
--- a/src/script/user/UserState.ts
+++ b/src/script/user/UserState.ts
@@ -36,13 +36,10 @@ export class UserState {
   /** Note: this does not include the self user */
   public teamUsers: ko.PureComputed<User[]>;
   public readonly connectRequests: ko.PureComputed<User[]>;
-  public readonly isActivatedAccount: ko.PureComputed<boolean>;
-  public readonly isTemporaryGuest: ko.PureComputed<boolean>;
   public readonly numberOfContacts: ko.PureComputed<number>;
-  public readonly self: ko.PureComputed<User>;
+  public readonly self = ko.observable<User | undefined>();
 
   constructor() {
-    this.self = ko.pureComputed<User>(() => this.users().find(user => user.isMe));
     this.users = ko.observableArray([]);
 
     this.connectRequests = ko
@@ -57,9 +54,6 @@ export class UserState {
       })
       .extend({rateLimit: TIME_IN_MILLIS.SECOND});
 
-    this.isActivatedAccount = ko.pureComputed(() => !this.self()?.isTemporaryGuest());
-    this.isTemporaryGuest = ko.pureComputed(() => this.self()?.isTemporaryGuest());
-
     this.isTeam = ko.observable();
     this.teamMembers = ko.pureComputed((): User[] => []);
     this.teamUsers = ko.pureComputed((): User[] => []);
diff --git a/src/script/util/ArrayUtil.ts b/src/script/util/ArrayUtil.ts
index d6a56810bc9..f8972a0d5af 100644
--- a/src/script/util/ArrayUtil.ts
+++ b/src/script/util/ArrayUtil.ts
@@ -119,20 +119,6 @@ export const iterateItem = <T>(array: T[], currentItem: T, reverse = false): T |
  */
 export const randomElement = <T>(array: T[] = []) => array[Math.floor(Math.random() * array.length)];
 
-/**
- * Remove given element from array
- * @param array source
- * @param element Element which should be removed
- * @returns containing the removed element
- */
-export const removeElement = <T>(array: T[] = [], element: T): T[] | undefined => {
-  const index = array.indexOf(element);
-  if (index > -1) {
-    return array.splice(index, 1);
-  }
-  return undefined;
-};
-
 export const deArrayify = <T>(value: T[] | T): T => (value instanceof Array ? value[0] : value);
 
 export const uniquify = <T>(elements: T[]): T[] => Array.from(new Set<T>(elements));
diff --git a/src/script/util/BackupUtil.ts b/src/script/util/BackupUtil.ts
new file mode 100644
index 00000000000..d9560df4e32
--- /dev/null
+++ b/src/script/util/BackupUtil.ts
@@ -0,0 +1,54 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ENCRYPTED_BACKUP_FORMAT} from '../backup/BackUpHeader';
+
+export const checkBackupEncryption = async (data: ArrayBuffer | Blob): Promise<boolean> => {
+  const fileBytes = await getFileBytes(data);
+  const encrptedFileFormat = new TextEncoder().encode(ENCRYPTED_BACKUP_FORMAT);
+
+  for (let i = 0; i < encrptedFileFormat.length; i++) {
+    const eachFileByte = fileBytes[i];
+    const encrptedFileByte = encrptedFileFormat[i];
+    if (eachFileByte !== encrptedFileByte) {
+      // The number doesn't match, indicating the file is not encrypted
+      return false;
+    }
+  }
+  // All file format bytes match, indicating the file is encrypted
+  return true;
+};
+
+const getFileBytes = async (data: ArrayBuffer | Blob): Promise<Uint8Array> => {
+  if (data instanceof ArrayBuffer) {
+    return Promise.resolve(new Uint8Array(data));
+  } else if (data instanceof Blob) {
+    return readBlobAsArrayBuffer(data).then(arrayBuffer => new Uint8Array(arrayBuffer));
+  }
+  return Promise.reject(new Error('Invalid data type. Expected ArrayBuffer or Blob.'));
+};
+
+const readBlobAsArrayBuffer = (blob: Blob): Promise<ArrayBuffer> => {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => resolve(reader.result as ArrayBuffer);
+    reader.onerror = reject;
+    reader.readAsArrayBuffer(blob);
+  });
+};
diff --git a/src/script/util/CSSMixin.ts b/src/script/util/CSSMixin.ts
index ae3d3d30107..b6e9868f67c 100644
--- a/src/script/util/CSSMixin.ts
+++ b/src/script/util/CSSMixin.ts
@@ -19,13 +19,6 @@
 
 import {CSSObject} from '@emotion/serialize';
 
-export const CSS_ABSOLUTE_CENTER: CSSObject = {
-  left: '50%',
-  position: 'absolute',
-  top: '50%',
-  transform: 'translate(-50%, -50%)',
-};
-
 export const CSS_SQUARE: (size: number | string) => CSSObject = size => ({
   height: size,
   width: size,
diff --git a/src/script/util/CountryCodes.ts b/src/script/util/CountryCodes.ts
index 51a46da0223..bfd94e525e1 100644
--- a/src/script/util/CountryCodes.ts
+++ b/src/script/util/CountryCodes.ts
@@ -19,7 +19,7 @@
 
 /* cspell:disable */
 
-export interface CountryCode {
+interface CountryCode {
   code: number;
   iso: string;
   name: string;
diff --git a/src/script/util/Crypto.test.ts b/src/script/util/Crypto.test.ts
deleted file mode 100644
index a2b8b1859f3..00000000000
--- a/src/script/util/Crypto.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {joaatHash} from './Crypto';
-
-/* eslint-disable no-magic-numbers */
-describe('Crypto', () => {
-  describe(`Jenkins' one-at-a-time hash`, () => {
-    const sample: {[uuid: string]: number} = {
-      '25f79335-6a5b-410e-90ea-653bd18b66da': 348398396,
-      'b88a6d46-b2ae-4122-8022-d6ed66a25f09': 1021700091,
-      'e50759ee-d32b-438f-bdbd-2605f48773e6': 1241303210,
-      '3dcdf935-d346-48cc-bdeb-fd9369192fec': 1413083903,
-      '9c102a7a-349f-4466-bdc0-5d8640023187': 1625780665,
-      'b413f30c-2aed-42d6-b882-328036d4247e': 2188977546,
-      '62e52f9e-0a69-49eb-9a02-b89e440f8950': 3345908844,
-      'fb303c6d-aa88-4ddc-81c1-fc51e5fc0ed8': 3615181544,
-      '17fa9af0-5e83-4b10-a3e6-0059591fabea': 3869474815,
-      'e1b6e9f0-aafd-4ba9-8030-6dd053531afd': 4118671235,
-    };
-
-    it(`can calculate Jenkins' one-at-a-time hash for a User ID`, () => {
-      const userId = '532af01e-1e24-4366-aacf-33b67d4ee376';
-
-      const actual = joaatHash(userId);
-      const expected = window.parseInt('200a4836', 16);
-
-      expect(actual).toBe(expected);
-    });
-
-    it('returns the expected hash values for some test strings', () => {
-      Object.entries(sample).forEach(([input, expected]) => {
-        const actual = joaatHash(input);
-
-        expect(actual).toEqual(expected);
-      });
-    });
-
-    it('returns zero for an empty string', () => {
-      expect(joaatHash('')).toEqual(0);
-    });
-
-    it('returns the same value for upper and lowercase strings', () => {
-      const key = 'E1b6e9f0-aafd-4ba9-8030-6Dd053531afd';
-
-      expect(joaatHash(key)).toEqual(sample[key.toLowerCase()]);
-    });
-  });
-});
diff --git a/src/script/util/Crypto.ts b/src/script/util/Crypto.ts
deleted file mode 100644
index 9dc14b54c4b..00000000000
--- a/src/script/util/Crypto.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import uint32 from 'uint32';
-
-/* eslint-disable no-magic-numbers */
-export const joaatHash = (stringToHash: string): number => {
-  let hash = uint32.toUint32(0);
-  const key = stringToHash.toLowerCase();
-
-  for (let index = 0; index < key.length; index++) {
-    hash = uint32.addMod32(hash, uint32.toUint32(key.charCodeAt(index)));
-    hash = uint32.addMod32(hash, uint32.shiftLeft(hash, 10));
-    hash = uint32.xor(hash, uint32.shiftRight(hash, 6));
-  }
-
-  hash = uint32.addMod32(hash, uint32.shiftLeft(hash, 3));
-  hash = uint32.xor(hash, uint32.shiftRight(hash, 11));
-  hash = uint32.addMod32(hash, uint32.shiftLeft(hash, 15));
-
-  return hash;
-};
diff --git a/src/script/util/DebugUtil.ts b/src/script/util/DebugUtil.ts
index 790368e2ee0..e1c9301a5a7 100644
--- a/src/script/util/DebugUtil.ts
+++ b/src/script/util/DebugUtil.ts
@@ -17,7 +17,8 @@
  *
  */
 
-import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
+import {ConnectionStatus} from '@wireapp/api-client/lib/connection';
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation';
 import {MemberLeaveReason} from '@wireapp/api-client/lib/conversation/data/';
 import {
   BackendEvent,
@@ -32,6 +33,7 @@ import type {QualifiedId} from '@wireapp/api-client/lib/user';
 import {DatabaseKeys} from '@wireapp/core/lib/notification/NotificationDatabaseRepository';
 import Dexie from 'dexie';
 import keyboardjs from 'keyboardjs';
+import {$createTextNode, $getRoot, LexicalEditor} from 'lexical';
 import {container} from 'tsyringe';
 
 import {getLogger, Logger} from 'Util/Logger';
@@ -55,6 +57,7 @@ import {checkVersion} from '../lifecycle/newVersionHandler';
 import {APIClient} from '../service/APIClientSingleton';
 import {Core} from '../service/CoreSingleton';
 import {EventRecord, StorageRepository, StorageSchemata} from '../storage';
+import {TeamState} from '../team/TeamState';
 import {UserRepository} from '../user/UserRepository';
 import {UserState} from '../user/UserState';
 import {ViewModelRepositories} from '../view_model/MainViewModel';
@@ -79,6 +82,7 @@ export class DebugUtil {
     repositories: ViewModelRepositories,
     private readonly clientState = container.resolve(ClientState),
     private readonly userState = container.resolve(UserState),
+    private readonly teamState = container.resolve(TeamState),
     private readonly conversationState = container.resolve(ConversationState),
     private readonly callState = container.resolve(CallState),
     private readonly core = container.resolve(Core),
@@ -177,6 +181,22 @@ export class DebugUtil {
     );
   }
 
+  reconnectWebSocket({dryRun} = {dryRun: false}) {
+    return this.eventRepository.connectWebSocket(this.core, () => {}, dryRun);
+  }
+
+  async reconnectWebSocketWithLastNotificationIdFromBackend({dryRun} = {dryRun: false}) {
+    await this.core.service?.notification.initializeNotificationStream();
+    return this.reconnectWebSocket({dryRun});
+  }
+
+  async updateActiveConversationKeyPackages() {
+    const groupId = this.conversationState.activeConversation()?.groupId;
+    if (groupId) {
+      return this.core.service?.mls?.renewKeyMaterial(groupId);
+    }
+  }
+
   /** Used by QA test automation. */
   blockAllConnections(): Promise<void[]> {
     const blockUsers = this.userState.users().map(userEntity => this.connectionRepository.blockUser(userEntity));
@@ -195,6 +215,26 @@ export class DebugUtil {
     await proteusService['cryptoClient'].debugBreakSession(sessionId);
   }
 
+  async setTeamSupportedProtocols(supportedProtocols: ConversationProtocol[], defaultProtocol?: ConversationProtocol) {
+    const {teamId} = await this.userRepository.getSelf();
+    if (!teamId) {
+      throw new Error('teamId of self user is undefined');
+    }
+
+    const mlsFeature = this.teamState.teamFeatures()?.mls;
+
+    if (!mlsFeature) {
+      throw new Error('MLS feature is not enabled');
+    }
+
+    const response = await this.apiClient.api.teams.feature.putMLSFeature(teamId, {
+      config: {...mlsFeature.config, supportedProtocols, defaultProtocol: defaultProtocol || supportedProtocols[0]},
+      status: FeatureStatus.ENABLED,
+    });
+
+    return response;
+  }
+
   /** Used by QA test automation. */
   async setMLSMigrationConfig(
     isEnabled = true,
@@ -222,6 +262,23 @@ export class DebugUtil {
     return checkVersion(baseVersion);
   }
 
+  /**
+   * will allow to programatically add text in the message input.
+   * This is used by QA to fill the input
+   * @param text the text to add to the input
+   */
+  inputText(text: string) {
+    // This is a hacky way of accessing the lexical editor directly from the DOM element
+    const lexicalEditor = (document.querySelector<HTMLElement>('[data-uie-name=input-message]') as any)
+      .__lexicalEditor as LexicalEditor;
+
+    lexicalEditor.update(() => {
+      const root = $getRoot().getLastChild()!;
+      const textNode = $createTextNode(text);
+      root.append(textNode);
+    });
+  }
+
   /**
    * Used by QA test automation: Will allow the webapp to generate fake link previews when sending a link in a message.
    */
@@ -277,7 +334,7 @@ export class DebugUtil {
     messageId: string,
     conversationId: string = this.conversationState.activeConversation().id,
   ): Promise<void> {
-    const clientId = this.clientState.currentClient().id;
+    const clientId = this.clientState.currentClient?.id;
     const userId = this.userState.self().id;
 
     const isOTRMessage = (notification: BackendEvent) => notification.type === CONVERSATION_EVENT.OTR_MESSAGE_ADD;
diff --git a/src/script/util/EmojiUtil.ts b/src/script/util/EmojiUtil.ts
index a19143d625d..a449abedbe3 100644
--- a/src/script/util/EmojiUtil.ts
+++ b/src/script/util/EmojiUtil.ts
@@ -17,6 +17,9 @@
  *
  */
 
+import emojies from 'emoji-picker-react/src/data/emojis.json';
+import {groupBy} from 'underscore';
+
 // http://www.unicode.org/Public/emoji/11.0/emoji-data.txt
 // This is the exact copy of unicode-range definition for `emoji` font in CSS.
 export const EMOJI_RANGES =
@@ -39,3 +42,37 @@ const isValidString = (string: string) => typeof string === 'string' && string.l
 
 export const includesOnlyEmojis = (text: string) =>
   isValidString(text) && removeEmojis(removeWhitespace(text)).length === 0;
+
+const emojiesFlatten = Object.values(emojies).flat();
+export const emojiesList = groupBy(emojiesFlatten, 'u');
+export const emojiDictionary: Map<string, string> = new Map();
+
+Object.keys(emojiesList).forEach(key => {
+  // return if already existing in the dictionary
+  if (emojiDictionary.has(key)) {
+    return;
+  }
+  const emojiValue = emojiesList[key];
+  // return if not found in list
+  if (!emojiValue) {
+    return;
+  }
+
+  const emojiObject = emojiValue[0];
+  const emojiNames = emojiObject.n;
+
+  emojiDictionary.set(key, emojiNames[0].replaceAll('-', ' '));
+});
+
+export const getEmojiTitleFromEmojiUnicode = (emojiUnicode: string): string => {
+  return emojiDictionary.has(emojiUnicode) ? emojiDictionary.get(emojiUnicode)! : '';
+};
+
+export function getEmojiUnicode(emojis: string) {
+  const hexCode = 16;
+  const padding = 4;
+  const unicode = [...emojis].map(emoji => emoji.codePointAt(0)?.toString(hexCode).padStart(padding, '0')).join('-');
+  // TODO: This is a hack to fix the heart emoji for old android devices. It should be reevaluated at some point in the future and removed.
+  // See https://wearezeta.atlassian.net/browse/WPB-4736
+  return unicode === '2764' ? '2764-fe0f' : unicode;
+}
diff --git a/src/script/util/Entropy.ts b/src/script/util/Entropy.ts
index 59825e8e71a..b4677774beb 100644
--- a/src/script/util/Entropy.ts
+++ b/src/script/util/Entropy.ts
@@ -17,7 +17,7 @@
  *
  */
 
-export interface EntropyFrame {
+interface EntropyFrame {
   x: number;
   y: number;
   t: number;
diff --git a/src/script/util/KeyboardUtil.ts b/src/script/util/KeyboardUtil.ts
index b46c33cad88..a8dc50fc6b4 100644
--- a/src/script/util/KeyboardUtil.ts
+++ b/src/script/util/KeyboardUtil.ts
@@ -65,7 +65,8 @@ export const isEnterKey = (keyboardEvent: KeyboardEvent | ReactKeyboardEvent): b
 
 export const isSpaceKey = (keyboardEvent: KeyboardEvent): boolean => isKey(keyboardEvent, KEY.SPACE);
 
-export const isEscapeKey = (keyboardEvent: KeyboardEvent): boolean => isKey(keyboardEvent, KEY.ESC);
+export const isEscapeKey = (keyboardEvent: KeyboardEvent | ReactKeyboardEvent): boolean =>
+  isKey(keyboardEvent, KEY.ESC);
 
 export const isFunctionKey = (keyboardEvent: KeyboardEvent | ReactKeyboardEvent): boolean =>
   keyboardEvent.altKey || keyboardEvent.ctrlKey || keyboardEvent.metaKey || keyboardEvent.shiftKey;
@@ -79,49 +80,6 @@ export const isPasteAction = (keyboardEvent: KeyboardEvent): boolean =>
 
 export const isRemovalAction = (key: string): boolean => [KEY.BACKSPACE, KEY.DELETE].includes(key);
 
-export const insertAtCaret = (areaId: string, text: string) => {
-  // http://stackoverflow.com/a/1064139
-  const textArea = document.getElementById(areaId) as HTMLTextAreaElement;
-  if (!textArea) {
-    return;
-  }
-
-  const scrollPos = textArea.scrollTop;
-  let strPos = 0;
-  const br =
-    textArea.selectionStart || textArea.selectionStart === 0 ? 'ff' : (document as any).selection ? 'ie' : false;
-
-  if (br === 'ie') {
-    textArea.focus();
-    const range = (document as any).selection.createRange();
-    range.moveStart('character', -textArea.value.length);
-    strPos = range.text.length;
-  } else if (br === 'ff') {
-    strPos = textArea.selectionStart;
-  }
-
-  const front = textArea.value.substring(0, strPos);
-  const back = textArea.value.substring(strPos, textArea.value.length);
-
-  textArea.value = `${front}${text}${back}`;
-  strPos = strPos + text.length;
-
-  if (br === 'ie') {
-    textArea.focus();
-    const ieRange = (document as any).selection.createRange();
-    ieRange.moveStart('character', -textArea.value.length);
-    ieRange.moveStart('character', strPos);
-    ieRange.moveEnd('character', 0);
-    ieRange.select();
-  } else if (br === 'ff') {
-    textArea.selectionStart = strPos;
-    textArea.selectionEnd = strPos;
-    textArea.focus();
-  }
-
-  textArea.scrollTop = scrollPos;
-};
-
 type KeyboardHandler = (event: KeyboardEvent) => void;
 
 const escKeyHandlers: KeyboardHandler[] = [];
diff --git a/src/script/util/LocalizerUtil/ReactLocalizerUtil.test.tsx b/src/script/util/LocalizerUtil/ReactLocalizerUtil.test.tsx
new file mode 100644
index 00000000000..f8d5ed787da
--- /dev/null
+++ b/src/script/util/LocalizerUtil/ReactLocalizerUtil.test.tsx
@@ -0,0 +1,68 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {replaceReactComponents} from './ReactLocalizerUtil';
+
+describe('replaceReactComponents', () => {
+  it('return the string untouched if no replacements are given', () => {
+    const result = replaceReactComponents('Hello World', []);
+    expect(result).toEqual(['Hello World']);
+  });
+
+  it('replaces a single pattern with a react component', () => {
+    const result = replaceReactComponents('Hello World <strong>test</strong>', [
+      {
+        start: '<strong>',
+        end: '</strong>',
+        render: text => <strong>{text}</strong>,
+      },
+    ]);
+
+    expect(result).toHaveLength(2);
+  });
+
+  it('replaces a multiple patterns with a react component', () => {
+    const result = replaceReactComponents('Hello World <strong>test</strong> <strong>another test</strong>', [
+      {
+        start: '<strong>',
+        end: '</strong>',
+        render: text => <strong>{text}</strong>,
+      },
+    ]);
+
+    expect(result).toHaveLength(4);
+  });
+
+  it('replaces a multiple patterns with multiple react component', () => {
+    const result = replaceReactComponents('Hello World <strong>test</strong> [link]another test[/link]', [
+      {
+        start: '<strong>',
+        end: '</strong>',
+        render: text => <strong>{text}</strong>,
+      },
+      {
+        start: '[link]',
+        end: '[/link]',
+        render: text => <button>{text}</button>,
+      },
+    ]);
+
+    expect(result).toHaveLength(4);
+  });
+});
diff --git a/src/script/util/LocalizerUtil/ReactLocalizerUtil.ts b/src/script/util/LocalizerUtil/ReactLocalizerUtil.ts
new file mode 100644
index 00000000000..1753fa34002
--- /dev/null
+++ b/src/script/util/LocalizerUtil/ReactLocalizerUtil.ts
@@ -0,0 +1,59 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import React from 'react';
+
+interface Replacement {
+  start: string;
+  end: string;
+  render: (text: string) => React.ReactNode;
+}
+
+function sanitizeRegexp(text: string) {
+  return text.replaceAll('[', '\\[').replaceAll(']', '\\]');
+}
+
+/**
+ * Will replace all occurences of `replacements` by a React component returned by `render`.
+ */
+export function replaceReactComponents(html: string, replacements: Replacement[]): React.ReactNode[] {
+  if (!replacements.length) {
+    return [html];
+  }
+  const splitRegexp = new RegExp(
+    `(${replacements
+      .map(replacement => `${sanitizeRegexp(replacement.start)}.+?${sanitizeRegexp(replacement.end)}`)
+      .join('|')})`,
+    'g',
+  );
+  return html
+    .split(splitRegexp)
+    .map(node => {
+      const match = replacements.find(
+        replacement => node.startsWith(replacement.start) && node.endsWith(replacement.end),
+      );
+
+      if (match) {
+        const text = node.substring(match.start.length, node.length - match.end.length);
+        return match.render(text);
+      }
+      return node;
+    })
+    .filter(Boolean);
+}
diff --git a/src/script/util/MentionUtil.ts b/src/script/util/MentionUtil.ts
deleted file mode 100644
index 7856866136e..00000000000
--- a/src/script/util/MentionUtil.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2022 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {User} from '../entity/User';
-import {MentionEntity} from '../message/MentionEntity';
-
-export const findMentionAtPosition = (position: number, mentions: MentionEntity[]) =>
-  mentions.find(({startIndex, endIndex}) => position > startIndex && position < endIndex);
-
-export const getMentionCandidate = (
-  currentMentions: MentionEntity[],
-  selectionStart: number,
-  selectionEnd: number,
-  value: string,
-) => {
-  const textInSelection = value.substring(selectionStart, selectionEnd);
-  const wordBeforeSelection = value.substring(0, selectionStart).replace(/[^]*\s/, '');
-  const isSpaceSelected = /\s/.test(textInSelection);
-
-  const startOffset = wordBeforeSelection.length ? wordBeforeSelection.length - 1 : 1;
-  const isSelectionStartMention = findMentionAtPosition(selectionStart - startOffset, currentMentions);
-  const isSelectionEndMention = findMentionAtPosition(selectionEnd, currentMentions);
-  const isOverMention = isSelectionStartMention || isSelectionEndMention;
-  const isOverValidMentionString = /^@\S*$/.test(wordBeforeSelection);
-
-  if (!isSpaceSelected && !isOverMention && isOverValidMentionString) {
-    const wordAfterSelection = value.substring(selectionEnd).replace(/\s[^]*/, '');
-
-    const term = `${wordBeforeSelection.replace(/^@/, '')}${textInSelection}${wordAfterSelection}`;
-    const startIndex = selectionStart - wordBeforeSelection.length;
-    return {startIndex, term};
-  }
-
-  return undefined;
-};
-
-export const detectMentionEdgeDeletion = (
-  textarea: HTMLTextAreaElement,
-  currentMentions: MentionEntity[],
-  selectionStart: number,
-  selectionEnd: number,
-  lengthDifference: number,
-) => {
-  const hadSelection = selectionStart !== selectionEnd;
-
-  if (hadSelection || lengthDifference >= 0) {
-    return null;
-  }
-
-  const currentSelectionStart = textarea.selectionStart;
-  const forwardDeleted = currentSelectionStart === selectionStart;
-  const checkPosition = forwardDeleted ? currentSelectionStart + 1 : currentSelectionStart;
-
-  return findMentionAtPosition(checkPosition, currentMentions);
-};
-
-export const updateMentionRanges = (
-  currentMentions: MentionEntity[],
-  start: number,
-  end: number,
-  difference: number,
-): MentionEntity[] => {
-  const remainingMentions = currentMentions.filter(({startIndex, endIndex}) => endIndex <= start || startIndex >= end);
-
-  return remainingMentions.map(mention => {
-    if (mention.startIndex >= end) {
-      return new MentionEntity(mention.startIndex + difference, mention.length, mention.userId, mention.domain);
-    }
-
-    return mention;
-  });
-};
-
-export const createMentionEntity = (
-  userEntity: User,
-  editedMention?: {startIndex: number; term: string},
-): MentionEntity | null => {
-  const mentionLength = userEntity.name().length + 1;
-
-  if (typeof editedMention?.startIndex === 'number') {
-    return new MentionEntity(editedMention.startIndex, mentionLength, userEntity.id, userEntity.domain);
-  }
-
-  return null;
-};
diff --git a/src/script/util/PromiseQueue.ts b/src/script/util/PromiseQueue.ts
index 9499509377c..6a5f329d3b3 100644
--- a/src/script/util/PromiseQueue.ts
+++ b/src/script/util/PromiseQueue.ts
@@ -31,11 +31,11 @@ interface PromiseQueueOptions {
   timeout?: number;
 }
 
-export type PromiseFn<T> = (...args: any[]) => Promise<T>;
-export type PromiseResolveFn = (value?: unknown) => void;
-export type PromiseRejectFn = (reason?: any) => void;
+type PromiseFn<T> = (...args: any[]) => Promise<T>;
+type PromiseResolveFn = (value?: unknown) => void;
+type PromiseRejectFn = (reason?: any) => void;
 
-export interface QueueEntry<T> {
+interface QueueEntry<T> {
   fn: PromiseFn<T>;
   rejectFn: PromiseRejectFn;
   resolveFn?: PromiseResolveFn;
@@ -192,3 +192,14 @@ export class PromiseQueue {
     }
   }
 }
+
+/**
+ * Will make sure a function is executed in order. If the function is already running, then the next payload will be queued.
+ * @param callback the function to queue
+ */
+export function queue<ReturnType, Params extends any[]>(
+  callback: (...params: Params) => Promise<ReturnType>,
+): (...params: Params) => Promise<ReturnType> {
+  const promiseQueue = new PromiseQueue({name: 'queue'});
+  return (...params: Params) => promiseQueue.push(() => callback(...params));
+}
diff --git a/src/script/util/QualifiedId.ts b/src/script/util/QualifiedId.ts
index b5f49824821..39f078d9b70 100644
--- a/src/script/util/QualifiedId.ts
+++ b/src/script/util/QualifiedId.ts
@@ -17,7 +17,7 @@
  *
  */
 
-export interface QualifiedEntity {
+interface QualifiedEntity {
   [index: string]: any;
   domain: string | null;
   id: string;
diff --git a/src/script/util/ReactionUtil.ts b/src/script/util/ReactionUtil.ts
new file mode 100644
index 00000000000..a5fb20e910e
--- /dev/null
+++ b/src/script/util/ReactionUtil.ts
@@ -0,0 +1,58 @@
+/*
+ * Wire
+ * Copyright (C) 2018 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+export interface Reactions {
+  [key: string]: string;
+}
+
+type ReactionsGroupedByUser = Map<string, string[]>;
+
+export function groupByReactionUsers(reactions: Reactions): ReactionsGroupedByUser {
+  const reactionsGroupedByUser = new Map<string, string[]>();
+
+  for (const user in reactions) {
+    const userReactions = reactions[user] && reactions[user]?.split(',');
+
+    for (const reaction of userReactions) {
+      const users = reactionsGroupedByUser.get(reaction) || [];
+      users.push(user);
+      reactionsGroupedByUser.set(reaction, users);
+    }
+  }
+
+  return reactionsGroupedByUser;
+}
+
+// Maps to the static server emojis url
+export function getEmojiUrl(unicode: string) {
+  return `/image/emojis/img-apple-64/${unicode}.png`;
+}
+
+/**
+ *
+ * @param reactionsList This is an array of tuples, each tuple consists of two elements a
+ * string representing an emoji and an array of strings representing users' reactions for that emoji.
+ * @returns tuples are sorted in descending order based on the length of the user
+ * reactions array for each emoji.
+ */
+export function sortReactionsByUserCount(reactionsList: [string, string[]][]) {
+  return reactionsList.sort(
+    ([, reactionAUserList], [, reactionBUserList]) => reactionBUserList.length - reactionAUserList.length,
+  );
+}
diff --git a/src/script/util/TimeUtil.ts b/src/script/util/TimeUtil.ts
index 7c05b908183..58d0c988edc 100644
--- a/src/script/util/TimeUtil.ts
+++ b/src/script/util/TimeUtil.ts
@@ -292,3 +292,18 @@ export const isYoungerThan7Days = (date: FnDate) => differenceInDays(new Date(),
 export const fromNowLocale = (date: FnDate) => formatDistanceToNow(date, {addSuffix: true, locale});
 
 export {isToday, fromUnixTime, isYesterday, isSameDay, isSameMonth, isThisYear, differenceInHours, differenceInMinutes};
+
+/**
+ * Returns a number of weeks elapsed since the given date.
+ * Should be read as passed less than 1 week ago, passed less than 2 weeks ago, etc.
+ * @param date date to compare with
+ * @returns number of weeks passed since the given date
+ */
+export const weeksPassedSinceDate = (date: Date): number => {
+  const now = new Date();
+
+  const diff = now.getTime() - date.getTime();
+  const diffInWeeks = diff / TIME_IN_MILLIS.WEEK;
+
+  return Math.max(1, Math.ceil(diffInWeeks));
+};
diff --git a/src/script/util/TypePredicateUtil.ts b/src/script/util/TypePredicateUtil.ts
index 30b3f1e89b8..a547009577d 100644
--- a/src/script/util/TypePredicateUtil.ts
+++ b/src/script/util/TypePredicateUtil.ts
@@ -24,7 +24,7 @@ import {Conversation} from '../entity/Conversation';
 import {User} from '../entity/User';
 import {ClientRecord} from '../storage/record/ClientRecord';
 
-export function isAxiosError(errorCandidate: any): errorCandidate is AxiosError {
+export function isAxiosError<T>(errorCandidate: any): errorCandidate is AxiosError<T> {
   return errorCandidate && errorCandidate.isAxiosError === true;
 }
 
diff --git a/src/script/util/UrlUtil.ts b/src/script/util/UrlUtil.ts
index f9a07571d39..cf41f88e10d 100644
--- a/src/script/util/UrlUtil.ts
+++ b/src/script/util/UrlUtil.ts
@@ -108,3 +108,10 @@ export const getLinksFromHtml = <T extends HTMLElement>(html: string): T[] => {
  * @returns prepended URL
  */
 export const prependProtocol = (url: string) => (!url.match(/^http[s]?:\/\//i) ? `http://${url}` : url);
+
+/**
+ * Removes all URL parameters from the current URL
+ */
+export const removeUrlParameters = () => {
+  history.replaceState({}, '', `${location.origin}/${location.hash}`);
+};
diff --git a/src/script/util/ValidationUtil.ts b/src/script/util/ValidationUtil.ts
index 2c90cb1a8ce..55e94d6e37d 100644
--- a/src/script/util/ValidationUtil.ts
+++ b/src/script/util/ValidationUtil.ts
@@ -35,11 +35,6 @@ export class ValidationUtilError extends Error {
 }
 
 export const isValidUsername = (username: string) => /^@?[a-z_0-9.-]{2,256}$/.test(username);
-export const isValidFederationUsername = (username: string) => {
-  const federationUsernameRegex =
-    /^(@?[a-z_0-9.-]{2,256})@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  return federationUsernameRegex.test(username);
-};
 
 /**
  * Checks if input has the format of an international phone number
diff --git a/src/script/util/localStorage.ts b/src/script/util/localStorage.ts
index 630dc7cda8c..1af7cbb3115 100644
--- a/src/script/util/localStorage.ts
+++ b/src/script/util/localStorage.ts
@@ -34,3 +34,17 @@ export function getStorage(): Storage | undefined {
     return undefined;
   }
 }
+
+/**
+ * Clears all keys starting with the given prefix from the given storage
+ * Supports storages with the web storage API (localStorage, sessionStorage)
+ * @param prefix string
+ * @param storage Storage
+ */
+export function clearKeysStartingWith(prefix: string, storage: Storage): void {
+  Object.keys(storage)
+    .filter(item => item.startsWith(prefix))
+    .forEach(item => {
+      storage.removeItem(item);
+    });
+}
diff --git a/src/script/util/messagesFilterUtil.ts b/src/script/util/messagesFilterUtil.ts
new file mode 100644
index 00000000000..0ef7d1bd199
--- /dev/null
+++ b/src/script/util/messagesFilterUtil.ts
@@ -0,0 +1,98 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
+
+import {Message as MessageEntity} from 'src/script/entity/message/Message';
+
+import {SystemMessage} from '../entity/message/SystemMessage';
+import {ClientEvent} from '../event/Client';
+import {isMemberMessage} from '../guards/Message';
+
+/**
+ * Filters out duplicated system messages.
+ * It can happen that the backend sends us an event we've created (we've already received directly from an api call response, e.g. when renaming a conversation).
+ * @param messages - messages to filter
+ * @returns filtered messages
+ */
+const filterDuplicatedSystemMessages = (messages: MessageEntity[]) => {
+  return messages.reduce<MessageEntity[]>((uniqMessages, currentMessage) => {
+    if (isMemberMessage(currentMessage)) {
+      const typesToFilter = [
+        CONVERSATION_EVENT.MEMBER_JOIN,
+        CONVERSATION_EVENT.MEMBER_LEAVE,
+        ClientEvent.CONVERSATION.GROUP_CREATION,
+      ] as string[];
+
+      const uniqMemberMessages = uniqMessages.filter(isMemberMessage);
+
+      if (!!uniqMemberMessages.length && typesToFilter.includes(currentMessage.type)) {
+        switch (currentMessage.type) {
+          case ClientEvent.CONVERSATION.GROUP_CREATION:
+            // Dont show duplicated group creation messages
+            if (uniqMemberMessages.some(m => m.type === currentMessage.type)) {
+              return uniqMessages;
+            }
+          case CONVERSATION_EVENT.MEMBER_JOIN:
+          case CONVERSATION_EVENT.MEMBER_LEAVE:
+            // Dont show duplicated member join/leave messages that follow each other
+            if (uniqMemberMessages?.[uniqMemberMessages.length - 1]?.hash() === currentMessage.hash()) {
+              return uniqMessages;
+            }
+        }
+      }
+    }
+
+    if (currentMessage.isSystem()) {
+      const systemMessagesToFilter = [CONVERSATION_EVENT.RENAME] as string[];
+      if (systemMessagesToFilter.includes(currentMessage.type)) {
+        const uniqUpdateMessages = uniqMessages.filter(
+          (message): message is SystemMessage => message.isSystem() && systemMessagesToFilter.includes(message.type),
+        );
+
+        if (uniqUpdateMessages.length > 0) {
+          const prevMessage = uniqUpdateMessages?.[uniqUpdateMessages.length - 1];
+          if (!prevMessage) {
+            return [...uniqMessages, currentMessage];
+          }
+
+          if (prevMessage.isConversationRename() && currentMessage.isConversationRename()) {
+            // for rename messages, only name changes are relevant, caption stays the same
+            if (prevMessage.name === currentMessage.name) {
+              return uniqMessages;
+            }
+            return [...uniqMessages, currentMessage];
+          }
+          // Dont show duplicated system messages that follow each other
+          if (prevMessage.caption === currentMessage.caption) {
+            return uniqMessages;
+          }
+        }
+      }
+    }
+
+    return [...uniqMessages, currentMessage];
+  }, []);
+};
+
+const filterHiddenMessages = (messages: MessageEntity[]) => messages.filter(message => message.visible());
+
+export const filterMessages = (messages: MessageEntity[]) => {
+  return filterHiddenMessages(filterDuplicatedSystemMessages(messages));
+};
diff --git a/src/script/util/renderElement.ts b/src/script/util/renderElement.ts
index 3290b6c9b9b..8056fb57fd7 100644
--- a/src/script/util/renderElement.ts
+++ b/src/script/util/renderElement.ts
@@ -33,7 +33,7 @@ const roots = new Map<
   }
 >();
 
-export const cleanUpElement = (elementId: string) => {
+const cleanUpElement = (elementId: string) => {
   const root = roots.get(elementId);
   if (root && root.elementContainer) {
     root.reactRoot.unmount();
diff --git a/src/script/util/scroll-helpers.ts b/src/script/util/scroll-helpers.ts
index f2ff551bbf6..158e3920c9b 100644
--- a/src/script/util/scroll-helpers.ts
+++ b/src/script/util/scroll-helpers.ts
@@ -17,20 +17,6 @@
  *
  */
 
-export function scrollEnd(element: HTMLElement): number {
-  return element.scrollHeight - element.clientHeight;
-}
-
-export function scrollToBottom(element: HTMLElement): number {
-  element.scrollTop = element.scrollHeight;
-  return window.setTimeout(() => {
-    if (!isScrolledBottom(element)) {
-      return (element.scrollTop = element.scrollHeight);
-    }
-    return undefined;
-  }, 200);
-}
-
 export function isScrolledBottom(element: HTMLElement): boolean {
   const scrollTop = Math.ceil(element.scrollTop);
   const scrollHeight = element.scrollHeight;
@@ -42,11 +28,6 @@ export function isScrolledTop(element: HTMLElement): boolean {
   return element.scrollTop === 0;
 }
 
-export function scrollBy(element: HTMLElement, distance: number): void {
-  const scrollTop = element.scrollTop;
-  element.scrollTop = scrollTop + distance;
-}
-
 export function isScrollable(element: HTMLElement): boolean {
   return element.scrollHeight > element.clientHeight;
 }
diff --git a/src/script/util/test/mock/WebRTCMock.ts b/src/script/util/test/mock/WebRTCMock.ts
index 880fa5cd218..c5338e82a16 100644
--- a/src/script/util/test/mock/WebRTCMock.ts
+++ b/src/script/util/test/mock/WebRTCMock.ts
@@ -19,14 +19,18 @@
 
 import wrtc from '@koush/wrtc';
 
-const {RTCAudioSource} = wrtc.nonstandard;
+const {RTCAudioSource, RTCRtpSender} = wrtc.nonstandard;
 
 declare global {
   interface Window {
     MediaStream: typeof wrtc.MediaStream;
     RTCAudioSource: typeof RTCAudioSource;
+    RTCRtpSender: typeof RTCRtpSender;
   }
 }
+const RTCRtpSenderMock: Window['RTCRtpSender'] = {
+  prototype: {createEncodedVideoStreams: {}, createEncodedStreams: {}, transform: {}},
+};
 
 Object.defineProperty(window, 'MediaStream', {
   value: wrtc.MediaStream,
@@ -37,3 +41,8 @@ Object.defineProperty(window, 'RTCAudioSource', {
   value: RTCAudioSource,
   writable: true,
 });
+
+Object.defineProperty(window, 'RTCRtpSender', {
+  value: RTCRtpSenderMock,
+  writable: true,
+});
diff --git a/src/script/util/util.ts b/src/script/util/util.ts
index 77e9d19010c..4f14299c9a9 100644
--- a/src/script/util/util.ts
+++ b/src/script/util/util.ts
@@ -19,20 +19,16 @@
 
 import {Decoder, Encoder} from 'bazinga64';
 import {StatusCodes as HTTP_STATUS} from 'http-status-codes';
-import type {ObservableArray} from 'knockout';
 
 import {UrlUtil, Runtime} from '@wireapp/commons';
 
-import {isTabKey} from 'Util/KeyboardUtil';
-import {findMentionAtPosition} from 'Util/MentionUtil';
-
+import {isTabKey} from './KeyboardUtil';
 import {loadValue} from './StorageUtil';
 
 import {QUERY_KEY} from '../auth/route';
 import {Config} from '../Config';
 import type {Conversation} from '../entity/Conversation';
 import {AuthError} from '../error/AuthError';
-import {MentionEntity} from '../message/MentionEntity';
 import {StorageKey} from '../storage/StorageKey';
 
 export const isTemporaryClientAndNonPersistent = (persist: boolean): boolean => {
@@ -109,7 +105,7 @@ export const loadDataUrl = (file: Blob): Promise<string | ArrayBuffer> => {
   });
 };
 
-export const loadUrlBuffer = (
+const loadUrlBuffer = (
   url: string,
   xhrAccessorFunction?: (xhr: XMLHttpRequest) => void,
 ): Promise<{buffer: ArrayBuffer; mimeType: string}> => {
@@ -232,7 +228,7 @@ export const downloadBlob = (blob: Blob, filename: string, mimeType?: string): n
   throw new Error('Failed to download blob: Resource not provided');
 };
 
-export const downloadFile = (url: string, fileName: string, mimeType?: string): number => {
+const downloadFile = (url: string, fileName: string, mimeType?: string): number => {
   const anchor = document.createElement('a');
   anchor.download = fileName;
   anchor.href = url;
@@ -254,25 +250,6 @@ export const downloadFile = (url: string, fileName: string, mimeType?: string):
   }, 100);
 };
 
-// Note: IE10 listens to "transitionend" instead of "animationend"
-export const alias = {
-  animationend: 'transitionend animationend oAnimationEnd MSAnimationEnd mozAnimationEnd webkitAnimationEnd',
-};
-
-export const koPushDeferred = (target: ObservableArray, src: any[], number = 100, delay = 300) => {
-  /** push array deferred to knockout's `observableArray` */
-  let interval: number;
-
-  return (interval = window.setInterval(() => {
-    const chunk = src.splice(0, number);
-    target.push(...chunk);
-
-    if (src.length === 0) {
-      return window.clearInterval(interval);
-    }
-  }, delay));
-};
-
 /**
  * Add zero padding until limit is reached.
  */
@@ -284,21 +261,6 @@ export const zeroPadding = (value: string | number, length = 2): string => {
 export const sortGroupsByLastEvent = (groupA: Conversation, groupB: Conversation): number =>
   groupB.last_event_timestamp() - groupA.last_event_timestamp();
 
-export const sortObjectByKeys = (object: Record<string, any>, reverse: boolean) => {
-  const keys = Object.keys(object);
-  keys.sort();
-
-  if (reverse) {
-    keys.reverse();
-  }
-
-  // Returns a copy of an object, which is ordered by the keys of the original object.
-  return keys.reduce<Record<string, any>>((sortedObject, key: string) => {
-    sortedObject[key] = object[key];
-    return sortedObject;
-  }, {});
-};
-
 // Removes url(' and url(" from the beginning of the string and also ") and ') from the end
 export const stripUrlWrapper = (url: string) => url.replace(/^url\(["']?/, '').replace(/["']?\)$/, '');
 
@@ -320,30 +282,7 @@ export const afterRender = (callback: TimerHandler): number =>
  */
 export const noop = (): void => {};
 
-export function throttle(callback: Function, wait: number, immediate = false) {
-  let timeout: number | null = null;
-  let initialCall = true;
-
-  return function () {
-    const callNow = immediate && initialCall;
-    const next = () => {
-      // eslint-disable-next-line prefer-rest-params
-      callback.apply(this, arguments);
-      timeout = null;
-    };
-
-    if (callNow) {
-      initialCall = false;
-      next();
-    }
-
-    if (!timeout) {
-      timeout = window.setTimeout(next, wait);
-    }
-  };
-}
-
-export const focusableElementsSelector =
+const focusableElementsSelector =
   'button:not([disabled]), [href], input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';
 
 export const preventFocusOutside = (event: KeyboardEvent, parentId: string): void => {
@@ -381,25 +320,6 @@ export const setContextMenuPosition = (event: React.KeyboardEvent) => {
   });
 };
 
-export const generateConversationInputStorageKey = (conversationEntity: Conversation): string =>
-  `${StorageKey.CONVERSATION.INPUT}|${conversationEntity.id}`;
-
-export const getSelectionPosition = (element: HTMLTextAreaElement, currentMentions: MentionEntity[]) => {
-  const {selectionStart: start, selectionEnd: end} = element;
-  const defaultRange = {endIndex: 0, startIndex: Infinity};
-
-  const firstMention = findMentionAtPosition(start, currentMentions) || defaultRange;
-  const lastMention = findMentionAtPosition(end, currentMentions) || defaultRange;
-
-  const mentionStart = Math.min(firstMention.startIndex, lastMention.startIndex);
-  const mentionEnd = Math.max(firstMention.endIndex, lastMention.endIndex);
-
-  const newStart = Math.min(mentionStart, start);
-  const newEnd = Math.max(mentionEnd, end);
-
-  return {newEnd, newStart};
-};
-
 const supportsSecretStorage = () => !Runtime.isDesktopApp() || !!window.systemCrypto;
 
 // disables mls for old 'broken' desktop clients, see https://github.com/wireapp/wire-desktop/pull/6094
diff --git a/src/script/view_model/ActionsViewModel.ts b/src/script/view_model/ActionsViewModel.ts
index f552629d274..99112babed1 100644
--- a/src/script/view_model/ActionsViewModel.ts
+++ b/src/script/view_model/ActionsViewModel.ts
@@ -17,7 +17,9 @@
  *
  */
 
+import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
 import {BackendErrorLabel} from '@wireapp/api-client/lib/http';
+import {QualifiedId} from '@wireapp/api-client/lib/user/';
 import {amplify} from 'amplify';
 import {container} from 'tsyringe';
 
@@ -27,7 +29,7 @@ import {PrimaryModal, removeCurrentModal, usePrimaryModalState} from 'Components
 import {t} from 'Util/LocalizerUtil';
 import {isBackendError} from 'Util/TypePredicateUtil';
 
-import type {ClientRepository, ClientEntity} from '../client';
+import type {ClientEntity} from '../client';
 import type {ConnectionRepository} from '../connection/ConnectionRepository';
 import type {ConversationRepository} from '../conversation/ConversationRepository';
 import type {MessageRepository} from '../conversation/MessageRepository';
@@ -37,11 +39,12 @@ import type {Message} from '../entity/message/Message';
 import type {User} from '../entity/User';
 import type {IntegrationRepository} from '../integration/IntegrationRepository';
 import type {ServiceEntity} from '../integration/ServiceEntity';
+import {SelfRepository} from '../self/SelfRepository';
 import {UserState} from '../user/UserState';
 
 export class ActionsViewModel {
   constructor(
-    private readonly clientRepository: ClientRepository,
+    private readonly selfRepository: SelfRepository,
     private readonly connectionRepository: ConnectionRepository,
     private readonly conversationRepository: ConversationRepository,
     private readonly integrationRepository: IntegrationRepository,
@@ -127,14 +130,26 @@ export class ActionsViewModel {
     });
   };
 
+  private readonly leaveOrClearConversation = async (
+    conversation: Conversation,
+    {leave, clear}: {leave: boolean; clear: boolean},
+  ): Promise<void> => {
+    if (leave) {
+      await this.conversationRepository.leaveConversation(conversation);
+    }
+    if (clear) {
+      await this.conversationRepository.clearConversation(conversation);
+    }
+  };
+
   readonly clearConversation = (conversationEntity: Conversation): void => {
     if (conversationEntity) {
       const modalType = conversationEntity.isLeavable() ? PrimaryModal.type.OPTION : PrimaryModal.type.CONFIRM;
 
       PrimaryModal.show(modalType, {
         primaryAction: {
-          action: (leaveConversation = false) => {
-            this.conversationRepository.clearConversation(conversationEntity, leaveConversation);
+          action: async (leave = false) => {
+            await this.leaveOrClearConversation(conversationEntity, {clear: true, leave: leave});
           },
           text: t('modalConversationClearAction'),
         },
@@ -152,7 +167,7 @@ export class ActionsViewModel {
     const isTemporary = clientEntity.isTemporary();
     if (isSSO || isTemporary) {
       // Temporary clients and clients of SSO users don't require a password to be removed
-      return this.clientRepository.deleteClient(clientEntity.id, undefined);
+      return this.selfRepository.deleteSelfUserClient(clientEntity.id, undefined);
     }
 
     return new Promise<void>(resolve => {
@@ -171,7 +186,7 @@ export class ActionsViewModel {
               if (!isSending) {
                 isSending = true;
                 try {
-                  await this.clientRepository.deleteClient(clientEntity.id, password);
+                  await this.selfRepository.deleteSelfUserClient(clientEntity.id, password);
                   removeCurrentModal();
                   resolve();
                 } catch (error) {
@@ -258,8 +273,8 @@ export class ActionsViewModel {
     return this.connectionRepository.ignoreRequest(userEntity);
   };
 
-  readonly leaveConversation = (conversationEntity: Conversation): Promise<void> => {
-    if (!conversationEntity) {
+  readonly leaveConversation = (conversation: Conversation): Promise<void> => {
+    if (!conversation) {
       return Promise.reject();
     }
 
@@ -267,21 +282,16 @@ export class ActionsViewModel {
       PrimaryModal.show(PrimaryModal.type.OPTION, {
         primaryAction: {
           action: async (clearContent = false) => {
-            await this.conversationRepository.removeMember(
-              conversationEntity,
-              this.userState.self().qualifiedId,
-              clearContent,
-            );
-
+            await this.leaveOrClearConversation(conversation, {clear: clearContent, leave: true});
             resolve();
           },
           text: t('modalConversationLeaveAction'),
         },
         text: {
-          closeBtnLabel: t('modalConversationLeaveMessageCloseBtn', conversationEntity.display_name()),
+          closeBtnLabel: t('modalConversationLeaveMessageCloseBtn', conversation.display_name()),
           message: t('modalConversationLeaveMessage'),
           option: t('modalConversationLeaveOption'),
-          title: t('modalConversationLeaveHeadline', conversationEntity.display_name()),
+          title: t('modalConversationLeaveHeadline', conversation.display_name()),
         },
       });
     });
@@ -306,6 +316,10 @@ export class ActionsViewModel {
     return Promise.reject();
   };
 
+  getConversationById = async (conversation: QualifiedId): Promise<Conversation> => {
+    return this.conversationRepository.getConversationById(conversation);
+  };
+
   saveConversation = async (conversation: Conversation): Promise<Conversation> => {
     return this.conversationRepository.saveConversation(conversation);
   };
@@ -338,10 +352,6 @@ export class ActionsViewModel {
   };
 
   private readonly openConversation = async (conversationEntity: Conversation): Promise<void> => {
-    if (conversationEntity.is_archived()) {
-      await this.conversationRepository.unarchiveConversation(conversationEntity, true);
-    }
-
     if (conversationEntity.is_cleared()) {
       conversationEntity.cleared_timestamp(0);
     }
@@ -361,7 +371,7 @@ export class ActionsViewModel {
           primaryAction: {
             action: async () => {
               try {
-                await this.conversationRepository.removeMember(conversationEntity, userEntity.qualifiedId);
+                await this.conversationRepository.removeMembers(conversationEntity, [userEntity.qualifiedId]);
                 resolve();
               } catch (error) {
                 reject(error);
@@ -385,7 +395,9 @@ export class ActionsViewModel {
    * @param userEntity User to connect to
    * @returns Promise that resolves to true if the request was successfully sent, false if not
    */
-  readonly sendConnectionRequest = (userEntity: User): Promise<boolean> => {
+  readonly sendConnectionRequest = (
+    userEntity: User,
+  ): Promise<{connectionStatus: ConnectionStatus; conversationId: QualifiedId} | null> => {
     return this.connectionRepository.createConnection(userEntity);
   };
 
@@ -410,7 +422,7 @@ export class ActionsViewModel {
             await this.connectionRepository.unblockUser(userEntity);
             const conversationEntity = await this.conversationRepository.get1To1Conversation(userEntity);
             resolve();
-            if (typeof conversationEntity !== 'boolean') {
+            if (conversationEntity) {
               await this.conversationRepository.updateParticipatingUserEntities(conversationEntity);
             }
           },
diff --git a/src/script/view_model/CallingViewModel.mocks.ts b/src/script/view_model/CallingViewModel.mocks.ts
index 01ea7b40ea1..1028625cc89 100644
--- a/src/script/view_model/CallingViewModel.mocks.ts
+++ b/src/script/view_model/CallingViewModel.mocks.ts
@@ -47,7 +47,7 @@ export const callState = new CallState();
 export function buildCall(conversationId: QualifiedId, convType = CONV_TYPE.ONEONONE) {
   const qualifiedId = typeof conversationId === 'string' ? {id: conversationId, domain: ''} : conversationId;
   return new Call({id: 'user1', domain: ''}, qualifiedId, convType, {} as any, CALL_TYPE.NORMAL, {
-    currentAvailableDeviceId: {audioOutput: ko.observable()},
+    currentAvailableDeviceId: {audiooutput: ko.observable()},
   } as any);
 }
 
diff --git a/src/script/view_model/CallingViewModel.ts b/src/script/view_model/CallingViewModel.ts
index ac0df2f53cf..a76bf1293af 100644
--- a/src/script/view_model/CallingViewModel.ts
+++ b/src/script/view_model/CallingViewModel.ts
@@ -227,8 +227,8 @@ export class CallingViewModel {
       }
 
       //we don't want to react to avs callbacks when conversation was not yet established
-      const isMLSConversationEstablished = await this.mlsService.conversationExists(subconversationGroupId);
-      if (!isMLSConversationEstablished) {
+      const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
+      if (!doesMLSGroupExist) {
         return;
       }
 
@@ -270,8 +270,8 @@ export class CallingViewModel {
         return;
       }
 
-      const isMLSConversationEstablished = await this.mlsService.conversationExists(subconversationGroupId);
-      if (!isMLSConversationEstablished) {
+      const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
+      if (!doesMLSGroupExist) {
         return;
       }
 
@@ -409,11 +409,11 @@ export class CallingViewModel {
         }
       },
       switchCameraInput: (call: Call, deviceId: string) => {
-        this.mediaDevicesHandler.currentDeviceId.videoInput(deviceId);
+        this.mediaDevicesHandler.currentDeviceId.videoinput(deviceId);
         this.callingRepository.refreshVideoInput();
       },
       switchScreenInput: (call: Call, deviceId: string) => {
-        this.mediaDevicesHandler.currentDeviceId.screenInput(deviceId);
+        this.mediaDevicesHandler.currentDeviceId.screeninput(deviceId);
       },
       toggleCamera: (call: Call) => {
         this.callingRepository.toggleCamera(call);
@@ -428,7 +428,7 @@ export class CallingViewModel {
         const showScreenSelection = (): Promise<void> => {
           return new Promise(resolve => {
             this.callingRepository.onChooseScreen = (deviceId: string): void => {
-              this.mediaDevicesHandler.currentDeviceId.screenInput(deviceId);
+              this.mediaDevicesHandler.currentDeviceId.screeninput(deviceId);
               this.callState.selectableScreens([]);
               this.callState.selectableWindows([]);
               resolve();
diff --git a/src/script/view_model/ContentViewModel.ts b/src/script/view_model/ContentViewModel.ts
index 44467ac5b1c..9ed604427ad 100644
--- a/src/script/view_model/ContentViewModel.ts
+++ b/src/script/view_model/ContentViewModel.ts
@@ -44,7 +44,7 @@ import {PanelState} from '../page/RightSidebar';
 import {useAppMainState} from '../page/state';
 import {ContentState, useAppState} from '../page/useAppState';
 import {generateConversationUrl} from '../router/routeGenerator';
-import {navigate} from '../router/Router';
+import {navigate, setHistoryParam} from '../router/Router';
 import type {UserRepository} from '../user/UserRepository';
 import {UserState} from '../user/UserState';
 
@@ -76,7 +76,10 @@ export class ContentViewModel {
     return this.mainViewModel.isFederated;
   }
 
-  constructor(mainViewModel: MainViewModel, public repositories: ViewModelRepositories) {
+  constructor(
+    mainViewModel: MainViewModel,
+    public repositories: ViewModelRepositories,
+  ) {
     this.userState = container.resolve(UserState);
     this.conversationState = container.resolve(ConversationState);
 
@@ -130,10 +133,90 @@ export class ContentViewModel {
     }
   }
 
-  changeConversation = (conversationEntity: Conversation, messageEntity?: Message) => {
+  private changeConversation(conversationEntity: Conversation, messageEntity?: Message): void {
     this.initialMessage = messageEntity;
     this.conversationState.activeConversation(conversationEntity);
-  };
+  }
+
+  private async getConversationEntity(
+    conversation: Conversation | string,
+    domain: string | null = null,
+  ): Promise<Conversation> {
+    if (isConversationEntity(conversation)) {
+      return conversation;
+    }
+    return await this.conversationRepository.getConversationById({domain: domain || '', id: conversation});
+  }
+
+  private closeRightSidebar(): void {
+    const {rightSidebar} = useAppMainState.getState();
+    rightSidebar.close();
+  }
+
+  private handleMissingConversation(): void {
+    this.closeRightSidebar();
+    return this.switchContent(ContentState.CONNECTION_REQUESTS);
+  }
+
+  private isConversationOpen(conversationEntity: Conversation, isActiveConversation: boolean): boolean {
+    const {contentState} = useAppState.getState();
+    const isConversationState = contentState === ContentState.CONVERSATION;
+    return conversationEntity && isActiveConversation && isConversationState;
+  }
+
+  private switchToNotificationSettingsIfApplicable(
+    openNotificationSettings: boolean,
+    conversationEntity: Conversation,
+  ): void {
+    if (openNotificationSettings) {
+      const {rightSidebar} = useAppMainState.getState();
+      rightSidebar.goTo(PanelState.NOTIFICATIONS, {entity: conversationEntity});
+    }
+  }
+
+  private handleConversationState(
+    isOpenedConversation: boolean,
+    openNotificationSettings: boolean,
+    conversationEntity: Conversation,
+  ): void {
+    const {setContentState} = useAppState.getState();
+    if (isOpenedConversation) {
+      this.switchToNotificationSettingsIfApplicable(openNotificationSettings, conversationEntity);
+      return;
+    }
+    setContentState(ContentState.CONVERSATION);
+
+    this.mainViewModel.list.openConversations(conversationEntity.archivedState());
+  }
+  private showAndNavigate(conversationEntity: Conversation, openNotificationSettings: boolean): void {
+    const {rightSidebar} = useAppMainState.getState();
+    this.showContent(ContentState.CONVERSATION);
+    this.previousConversation = this.conversationState.activeConversation();
+    setHistoryParam(
+      generateConversationUrl({id: conversationEntity?.id ?? '', domain: conversationEntity?.domain ?? ''}),
+      history.state,
+    );
+    if (openNotificationSettings) {
+      rightSidebar.goTo(PanelState.NOTIFICATIONS, {entity: this.conversationState.activeConversation() ?? null});
+    }
+  }
+
+  private showConversationNotFoundErrorModal(): void {
+    PrimaryModal.show(
+      PrimaryModal.type.ACKNOWLEDGE,
+      {
+        text: {
+          message: t('conversationNotFoundMessage'),
+          title: t('conversationNotFoundTitle', Config.getConfig().BRAND_NAME),
+        },
+      },
+      undefined,
+    );
+  }
+
+  private isConversationNotFoundError(error: any): boolean {
+    return error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
+  }
 
   /**
    * Opens the specified conversation.
@@ -155,22 +238,15 @@ export class ContentViewModel {
       openNotificationSettings = false,
     } = options;
 
-    const {rightSidebar} = useAppMainState.getState();
-    const {contentState, setContentState} = useAppState.getState();
-
     if (!conversation) {
-      rightSidebar.close();
-      return this.switchContent(ContentState.CONNECTION_REQUESTS);
+      return this.handleMissingConversation();
     }
 
     try {
-      const conversationEntity = isConversationEntity(conversation)
-        ? conversation
-        : await this.conversationRepository.getConversationById({domain: domain || '', id: conversation});
+      const conversationEntity = await this.getConversationEntity(conversation, domain);
 
       if (!conversationEntity) {
-        rightSidebar.close();
-
+        this.closeRightSidebar();
         throw new ConversationError(
           ConversationError.TYPE.CONVERSATION_NOT_FOUND,
           ConversationError.MESSAGE.CONVERSATION_NOT_FOUND,
@@ -180,56 +256,25 @@ export class ContentViewModel {
       const isActiveConversation = this.conversationState.isActiveConversation(conversationEntity);
 
       if (!isActiveConversation) {
-        rightSidebar.close();
+        this.closeRightSidebar();
       }
 
-      const isConversationState = contentState === ContentState.CONVERSATION;
-      const isOpenedConversation = conversationEntity && isActiveConversation && isConversationState;
-
-      if (isOpenedConversation) {
-        if (openNotificationSettings) {
-          rightSidebar.goTo(PanelState.NOTIFICATIONS, {entity: conversationEntity});
-        }
-        return;
-      }
-
-      setContentState(ContentState.CONVERSATION);
-      this.mainViewModel.list.openConversations();
+      const isOpenedConversation = this.isConversationOpen(conversationEntity, isActiveConversation);
 
+      this.handleConversationState(isOpenedConversation, openNotificationSettings, conversationEntity);
       if (!isActiveConversation) {
         this.conversationState.activeConversation(conversationEntity);
       }
 
-      const messageEntity = openFirstSelfMention ? conversationEntity.getFirstUnreadSelfMention() : exposeMessageEntity;
-
       if (conversationEntity.is_cleared()) {
         conversationEntity.cleared_timestamp(0);
       }
-
-      if (conversationEntity.is_archived()) {
-        await this.conversationRepository.unarchiveConversation(conversationEntity);
-      }
-
+      const messageEntity = openFirstSelfMention ? conversationEntity.getFirstUnreadSelfMention() : exposeMessageEntity;
       this.changeConversation(conversationEntity, messageEntity);
-      this.showContent(ContentState.CONVERSATION);
-      this.previousConversation = this.conversationState.activeConversation();
-
-      if (openNotificationSettings) {
-        rightSidebar.goTo(PanelState.NOTIFICATIONS, {entity: this.conversationState.activeConversation() ?? null});
-      }
-    } catch (error) {
-      const isConversationNotFound = error.type === ConversationError.TYPE.CONVERSATION_NOT_FOUND;
-      if (isConversationNotFound) {
-        PrimaryModal.show(
-          PrimaryModal.type.ACKNOWLEDGE,
-          {
-            text: {
-              message: t('conversationNotFoundMessage'),
-              title: t('conversationNotFoundTitle', Config.getConfig().BRAND_NAME),
-            },
-          },
-          undefined,
-        );
+      this.showAndNavigate(conversationEntity, openNotificationSettings);
+    } catch (error: any) {
+      if (this.isConversationNotFoundError(error)) {
+        this.showConversationNotFoundErrorModal();
       } else {
         throw error;
       }
diff --git a/src/script/view_model/ListViewModel.ts b/src/script/view_model/ListViewModel.ts
index 3c0e3e07f06..0697aea9dfe 100644
--- a/src/script/view_model/ListViewModel.ts
+++ b/src/script/view_model/ListViewModel.ts
@@ -96,9 +96,9 @@ export class ListViewModel {
     this.contentViewModel = mainViewModel.content;
     this.callingViewModel = mainViewModel.calling;
 
-    this.isActivatedAccount = this.userState.isActivatedAccount;
     this.isProAccount = this.teamState.isTeam;
     this.selfUser = this.userState.self;
+    this.isActivatedAccount = ko.pureComputed(() => this.selfUser()?.isActivatedAccount());
 
     // State
     this.lastUpdate = ko.observable();
@@ -132,7 +132,6 @@ export class ListViewModel {
   }
 
   private readonly _initSubscriptions = () => {
-    amplify.subscribe(WebAppEvents.CONVERSATION.SHOW, this.openConversations);
     amplify.subscribe(WebAppEvents.PREFERENCES.MANAGE_ACCOUNT, this.openPreferencesAccount);
     amplify.subscribe(WebAppEvents.PREFERENCES.MANAGE_DEVICES, this.openPreferencesDevices);
     amplify.subscribe(WebAppEvents.PREFERENCES.SHOW_AV, this.openPreferencesAudioVideo);
@@ -279,8 +278,12 @@ export class ListViewModel {
     }
   };
 
-  readonly openConversations = (): void => {
-    const newState = this.isActivatedAccount() ? ListState.CONVERSATIONS : ListState.TEMPORARY_GUEST;
+  readonly openConversations = (archive = false): void => {
+    const newState = this.isActivatedAccount()
+      ? archive
+        ? ListState.ARCHIVE
+        : ListState.CONVERSATIONS
+      : ListState.TEMPORARY_GUEST;
     this.switchList(newState, false);
   };
 
diff --git a/src/script/view_model/MainViewModel.ts b/src/script/view_model/MainViewModel.ts
index 21dbfff1d96..db2eee30724 100644
--- a/src/script/view_model/MainViewModel.ts
+++ b/src/script/view_model/MainViewModel.ts
@@ -43,6 +43,7 @@ import type {PreferenceNotificationRepository} from '../notification/PreferenceN
 import type {PermissionRepository} from '../permission/PermissionRepository';
 import type {PropertiesRepository} from '../properties/PropertiesRepository';
 import type {SearchRepository} from '../search/SearchRepository';
+import type {SelfRepository} from '../self/SelfRepository';
 import {Core} from '../service/CoreSingleton';
 import type {StorageRepository} from '../storage';
 import type {TeamRepository} from '../team/TeamRepository';
@@ -75,6 +76,7 @@ export interface ViewModelRepositories {
   storage: StorageRepository;
   team: TeamRepository;
   user: UserRepository;
+  self: SelfRepository;
 }
 
 export class MainViewModel {
@@ -106,7 +108,7 @@ export class MainViewModel {
     };
 
     this.actions = new ActionsViewModel(
-      repositories.client,
+      repositories.self,
       repositories.connection,
       repositories.conversation,
       repositories.integration,
diff --git a/src/script/view_model/ThemeViewModel.ts b/src/script/view_model/ThemeViewModel.ts
deleted file mode 100644
index a64582e9b8f..00000000000
--- a/src/script/view_model/ThemeViewModel.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import type {WebappProperties} from '@wireapp/api-client/lib/user/data/';
-import {amplify} from 'amplify';
-
-import {WebAppEvents} from '@wireapp/webapp-events';
-
-import type {PropertiesRepository} from '../properties/PropertiesRepository';
-import {PROPERTIES_TYPE} from '../properties/PropertiesType';
-
-const THEMES_CLASS_PREFIX = 'theme-';
-
-export const THEMES = {
-  DARK: 'dark',
-  DEFAULT: 'default',
-};
-
-export class ThemeViewModel {
-  constructor(propertiesRepository: PropertiesRepository) {
-    this.setTheme(propertiesRepository.getPreference(PROPERTIES_TYPE.INTERFACE.THEME));
-
-    amplify.subscribe(WebAppEvents.PROPERTIES.UPDATE.INTERFACE.THEME, this.setTheme);
-    amplify.subscribe(WebAppEvents.PROPERTIES.UPDATED, (properties: WebappProperties) =>
-      this.setTheme(properties.settings.interface.theme),
-    );
-  }
-
-  private readonly setTheme = (newTheme: 'dark' | 'default') => {
-    const classes = document.body.className
-      .split(' ')
-      .filter(elementClass => !elementClass.startsWith(THEMES_CLASS_PREFIX))
-      .concat(`${THEMES_CLASS_PREFIX}${newTheme}`);
-    document.body.className = classes.join(' ');
-  };
-}
diff --git a/src/style/common/accent-color.less b/src/style/common/accent-color.less
index 2433a789067..e44ce43926e 100644
--- a/src/style/common/accent-color.less
+++ b/src/style/common/accent-color.less
@@ -59,6 +59,7 @@
 @blue-600: #0552a0;
 @blue-700: #043e78;
 @blue-800: #022950;
+@blue-900: #021f3c;
 
 @blue-dark-50: #eef7ff;
 @blue-dark-100: #ddedff;
@@ -69,6 +70,7 @@
 @blue-dark-600: #4385cc;
 @blue-dark-700: #326499;
 @blue-dark-800: #224266;
+@blue-dark-900: #19324d;
 
 @green-50: #e8f1ea;
 @green-100: #d2e4d6;
@@ -79,6 +81,7 @@
 @green-600: #176029;
 @green-700: #11481f;
 @green-800: #0c3014;
+@green-900: #09240f;
 
 @green-dark-50: #ebfcef;
 @green-dark-100: #d6f8de;
@@ -100,6 +103,7 @@
 @turquoise-600: #015a6e;
 @turquoise-700: #014352;
 @turquoise-800: #002d37;
+@turquoise-900: #002229;
 
 @turquoise-dark-50: #effdff;
 @turquoise-dark-100: #dffaff;
@@ -110,6 +114,7 @@
 @turquoise-dark-600: #4ab8cc;
 @turquoise-dark-700: #388a99;
 @turquoise-dark-800: #255c66;
+@turquoise-dark-900: #1c454d;
 
 @purple-50: #f4edf7;
 @purple-100: #e7daee;
@@ -120,6 +125,7 @@
 @purple-600: #6e3689;
 @purple-700: #522967;
 @purple-800: #371b44;
+@purple-900: #291433;
 
 @purple-dark-50: #fcf4ff;
 @purple-dark-100: #f8e9ff;
@@ -130,6 +136,7 @@
 @purple-dark-600: #ae72cc;
 @purple-dark-700: #835699;
 @purple-dark-800: #573966;
+@purple-dark-900: #412b4d;
 
 @red-50: #f9e6e8;
 @red-100: #f3ccd0;
@@ -140,6 +147,7 @@
 @red-600: #9b000f;
 @red-700: #74000b;
 @red-800: #4e0008;
+@red-900: #3a0006;
 
 @red-dark-50: #fff2f1;
 @red-dark-100: #ffe4e2;
@@ -150,6 +158,7 @@
 @red-dark-600: #cc5f5a;
 @red-dark-700: #994743;
 @red-dark-800: #66302d;
+@red-dark-900: #4d2422;
 
 @amber-50: #f6eee8;
 @amber-100: #ecded0;
@@ -160,6 +169,7 @@
 @amber-600: #824711;
 @amber-700: #61350d;
 @amber-800: #412408;
+@amber-900: #412408;
 
 @amber-dark-50: #fffbea;
 @amber-dark-100: #fff6d4;
@@ -170,6 +180,7 @@
 @amber-dark-600: #ccaa1e;
 @amber-dark-700: #997f17;
 @amber-dark-800: #66550f;
+@amber-dark-900: #4d400b;
 
 .colors() {
   amber: 5;
@@ -180,7 +191,7 @@
   turquoise: 6;
 }
 
-@color-index: 50, 100, 200, 300, 400, 500, 600, 700, 800;
+@color-index: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900;
 
 body {
   &.theme-default {
@@ -215,11 +226,20 @@ each(.colors(), .(@color-key, @color-name) {
   @button-secondary-hover-border: '@{name}-500';
   @button-secondary-active-bg: '@{name}-50';
   @button-secondary-active-border: '@{name}-500';
+  @message-actions-active-border: '@{name}-300';
+  @message-actions-active-background: '@{name}-50';
+  @message-reactions-active-border: '@{name}-300';
+  @message-reactions-active-background: '@{name}-50';
+  @message-reactions-background: 'w-gray-20';
+  @message-reactions-border: 'w-gray-50';
+  @message-reactions-focus-border: '@{name}-500';
+  @message-reactions-count: 'w-gray-80';
   @toggle-button-hover-bg: '@{name}-700';
   @icon-primary-active-fill: '@{name}-500';
   @icon-secondary-active-border: 'accent_colors-0';
   @indicator-range-input-thumb: '@{name}-700';
   @toggle-button-unselected-bg: '@{name}-100';
+  @content-message-timestamp: 'w-gray-70';
 
   .main-accent-color-@{color-key} {
     --button-primary-hover: @@button-primary-hover;
@@ -229,6 +249,15 @@ each(.colors(), .(@color-key, @color-name) {
     --button-secondary-hover-border: @@button-secondary-hover-border;
     --button-secondary-active-bg: @@button-secondary-active-bg;
     --button-secondary-active-border: @@button-secondary-active-border;
+    --message-actions-active-border:@@message-actions-active-border;
+    --message-actions-active-background:@@message-actions-active-background;
+    --message-reactions-active-border:@@message-reactions-active-border;
+    --message-reactions-active-background:@@message-reactions-active-background;
+    --message-reactions-background: @@message-reactions-background;
+    --message-reactions-border: @@message-reactions-border;
+    --message-reactions-focus-border: @@message-reactions-focus-border;
+    --message-reactions-count: @@message-reactions-count;
+    --content-message-timestamp:@@content-message-timestamp;
     --toggle-button-hover-bg: @@toggle-button-hover-bg;
     --icon-primary-active-fill: @@icon-primary-active-fill;
     --icon-secondary-active-border: @@icon-secondary-active-border;
@@ -269,6 +298,15 @@ each(.colors(), .(@color-key, @color-name) {
     @button-secondary-hover-border-dark: 'w-gray-70';
     @button-secondary-active-bg-dark: 'w-gray-95';
     @button-secondary-active-border-dark: '@{name}-dark-800';
+    @message-actions-active-border-dark: '@{name}-dark-600';
+    @message-actions-active-background-dark: '@{name}-dark-800';
+    @message-reactions-active-border-dark: '@{name}-dark-700';
+    @message-reactions-active-background-dark: '@{name}-dark-900';
+    @message-reactions-background-dark: 'w-gray-90';
+    @message-reactions-border-dark: 'w-gray-80';
+    @message-reactions-focus-border-dark: '@{name}-dark-500';
+    @message-reactions-count-dark: 'w-gray-20';
+    @content-message-timestamp-dark: 'w-gray-60';
     @toggle-button-hover-bg-dark: '@{name}-dark-300';
     @icon-primary-active-fill-dark: 'w-white';
     @icon-secondary-active-border-dark: '@{name}-dark-800' ;
@@ -282,6 +320,15 @@ each(.colors(), .(@color-key, @color-name) {
       --button-secondary-hover-border: @@button-secondary-hover-border-dark;
       --button-secondary-active-bg: @@button-secondary-active-bg-dark;
       --button-secondary-active-border: @@button-secondary-active-border-dark;
+      --message-actions-active-border: @@message-actions-active-border-dark;
+      --message-actions-active-background: @@message-actions-active-background-dark;
+      --message-reactions-active-border: @@message-reactions-active-border-dark;
+      --message-reactions-active-background: @@message-reactions-active-background-dark;
+      --message-reactions-background: @@message-reactions-background-dark;
+      --message-reactions-border: @@message-reactions-border-dark;
+      --message-reactions-focus-border: @@message-reactions-focus-border-dark;
+      --message-reactions-count: @@message-reactions-count-dark;
+      --content-message-timestamp:@@content-message-timestamp-dark;
       --icon-primary-active-fill: @@icon-primary-active-fill-dark;
       --icon-secondary-active-border: @@icon-secondary-active-border-dark;
       --indicator-range-input-thumb: @@indicator-range-input-thumb-dark;
diff --git a/src/style/common/animations.less b/src/style/common/animations.less
index fb7acc9d0a8..7e4ae9073b9 100644
--- a/src/style/common/animations.less
+++ b/src/style/common/animations.less
@@ -21,7 +21,9 @@
   opacity: 1;
   pointer-events: auto;
   transform: translateY(0);
-  transition: visibility 0s, all @animation-timing-slow @ease-out-expo @animation-timing-fast;
+  transition:
+    visibility 0s,
+    all @animation-timing-slow @ease-out-expo @animation-timing-fast;
   visibility: visible;
 }
 
diff --git a/src/style/common/button.less b/src/style/common/button.less
index 33750290955..ecd5585c74e 100644
--- a/src/style/common/button.less
+++ b/src/style/common/button.less
@@ -322,7 +322,9 @@
   padding: 10px;
   border: 1px solid transparent;
   border-radius: 16px;
-  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
+  transition:
+    background-color 0.15s ease-in-out,
+    border-color 0.15s ease-in-out;
 }
 
 .button-text-primary {
@@ -443,7 +445,9 @@
   padding: 0;
   border: 1px solid transparent;
   border-radius: 12px;
-  transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out;
+  transition:
+    background-color 0.15s ease-in-out,
+    border-color 0.15s ease-in-out;
 
   svg {
     path {
diff --git a/src/style/common/context.less b/src/style/common/context.less
index e6a3836401d..79962907686 100644
--- a/src/style/common/context.less
+++ b/src/style/common/context.less
@@ -29,7 +29,9 @@
   border-radius: 4px;
   margin: 0;
   background-color: var(--modal-bg);
-  box-shadow: 0 0 1px 0 fade(#000, 8%), 0 8px 24px 0 fade(#000, 16%);
+  box-shadow:
+    0 0 1px 0 fade(#000, 8%),
+    0 8px 24px 0 fade(#000, 16%);
   font-size: @font-size-small;
   font-weight: @font-weight-regular;
   line-height: @line-height-xl;
diff --git a/src/style/common/input.less b/src/style/common/input.less
index e9ebb0a8855..78c8ec8a7c8 100644
--- a/src/style/common/input.less
+++ b/src/style/common/input.less
@@ -79,42 +79,3 @@
     text-align: center;
   }
 }
-
-.input-group {
-  display: flex;
-  overflow: hidden;
-  border-radius: @button-border-radius;
-  margin-bottom: 8px;
-
-  button,
-  input {
-    border-radius: 0;
-    margin-bottom: 0;
-
-    &:invalid {
-      box-shadow: none;
-    }
-  }
-}
-
-.input-group-button {
-  width: @button-height;
-  flex: 0 0 auto;
-  padding: 0;
-  line-height: @button-height;
-
-  &.visible {
-    display: block;
-  }
-
-  .has-error &,
-  &:not(.visible) {
-    display: none;
-  }
-}
-
-.input-code {
-  font-size: @font-size-lg;
-  letter-spacing: 8px;
-  text-align: center;
-}
diff --git a/src/style/common/loading-dots.less b/src/style/common/loading-dots.less
index c18a18c6b8b..5c36c44ff12 100644
--- a/src/style/common/loading-dots.less
+++ b/src/style/common/loading-dots.less
@@ -33,7 +33,10 @@
     margin-bottom: -2px;
     animation: threeLoadingDotsAni 1s linear infinite;
     background-color: var(--background-fade-16);
-    box-shadow: -8px 0 var(--background-fade-16), 0 0 var(--background-fade-16), 8px 0 var(--background-fade-16);
+    box-shadow:
+      -8px 0 var(--background-fade-16),
+      0 0 var(--background-fade-16),
+      8px 0 var(--background-fade-16);
     content: '';
   }
 }
@@ -41,15 +44,27 @@
 @keyframes threeLoadingDotsAni {
   0%,
   80% {
-    box-shadow: -8px 0 var(--background-fade-16), 0 0 var(--background-fade-16), 8px 0 var(--background-fade-16);
+    box-shadow:
+      -8px 0 var(--background-fade-16),
+      0 0 var(--background-fade-16),
+      8px 0 var(--background-fade-16);
   }
   20% {
-    box-shadow: -9px 0 0 2px var(--background-fade-16), 0 0 var(--background-fade-16), 8px 0 var(--background-fade-16);
+    box-shadow:
+      -9px 0 0 2px var(--background-fade-16),
+      0 0 var(--background-fade-16),
+      8px 0 var(--background-fade-16);
   }
   40% {
-    box-shadow: -8px 0 var(--background-fade-16), 0 0 0 2px var(--background-fade-16), 8px 0 var(--background-fade-16);
+    box-shadow:
+      -8px 0 var(--background-fade-16),
+      0 0 0 2px var(--background-fade-16),
+      8px 0 var(--background-fade-16);
   }
   60% {
-    box-shadow: -8px 0 var(--background-fade-16), 0 0 var(--background-fade-16), 9px 0 0 2px var(--background-fade-16);
+    box-shadow:
+      -8px 0 var(--background-fade-16),
+      0 0 var(--background-fade-16),
+      9px 0 0 2px var(--background-fade-16);
   }
 }
diff --git a/src/style/common/mixins.less b/src/style/common/mixins.less
index 04866983cb5..14eec499f30 100644
--- a/src/style/common/mixins.less
+++ b/src/style/common/mixins.less
@@ -49,6 +49,7 @@
   .setVariables(checkbox-background checkbox-background-selected checkbox-background-disabled checkbox-background-disabled-selected checkbox-border checkbox-border-hover checkbox-border-disabled checkbox-alert);
   .setVariables(message-quote-bg);
   .setVariables(group-creation-modal-teamname-input-bg);
+  .setVariables(message-actions-background message-actions-border message-actions-background-hover message-actions-border-hover);
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/style/common/spinner.less b/src/style/common/spinner.less
index a3b6770e1bd..cd3eed88f51 100644
--- a/src/style/common/spinner.less
+++ b/src/style/common/spinner.less
@@ -35,7 +35,8 @@
     right: -1px;
     bottom: -1px;
     left: -1px;
-    background: linear-gradient(0deg, hsla(0, 0, 100%, 1) 50%, hsla(0, 0, 100%, 0.9) 100%) 0 0,
+    background:
+      linear-gradient(0deg, hsla(0, 0, 100%, 1) 50%, hsla(0, 0, 100%, 0.9) 100%) 0 0,
       linear-gradient(90deg, hsla(0, 0, 100%, 0.9) 0, hsla(0, 0, 100%, 0.6) 100%) 100% 0,
       linear-gradient(180deg, hsla(0, 0, 100%, 0.6) 0, hsla(0, 0, 100%, 0.3) 100%) 100% 100%,
       linear-gradient(360deg, hsla(0, 0, 100%, 0.3) 0, hsla(0, 0, 100%, 0) 100%) 0 100%;
diff --git a/src/style/common/variables.less b/src/style/common/variables.less
index 3e9b1fa471f..2295a932bb9 100644
--- a/src/style/common/variables.less
+++ b/src/style/common/variables.less
@@ -90,7 +90,13 @@
 // ----------------------------------------------------------------------------
 @ars-font-path: '../font/';
 
-@font-family-base: emoji, BlinkMacSystemFont, -apple-system, Helvetica Neue, Arial, sans-serif;
+@font-family-base:
+  emoji,
+  BlinkMacSystemFont,
+  -apple-system,
+  Helvetica Neue,
+  Arial,
+  sans-serif;
 @font-family-ephemeral: Redacted Script;
 
 @font-size-xxs: 0.5rem;
@@ -233,9 +239,9 @@ body {
 @conversation-message-sender-width: 56px;
 
 body {
-  --conversation-message-timestamp-width: 170px;
+  --conversation-message-timestamp-width: 140px;
   @media (max-width: @screen-md-min) {
-    --conversation-message-timestamp-width: 55px;
+    --conversation-message-timestamp-width: 60px;
   }
 }
 
diff --git a/src/style/components/asset/message-button.less b/src/style/components/asset/message-button.less
index de2a921533d..8f8f47d7b45 100644
--- a/src/style/components/asset/message-button.less
+++ b/src/style/components/asset/message-button.less
@@ -53,7 +53,10 @@
     background-color: transparent;
     opacity: 0;
     transform: translateX(50%);
-    transition: background-color 0.05s, transform 0.2s ease-in-out, opacity 0.2s ease-in-out;
+    transition:
+      background-color 0.05s,
+      transform 0.2s ease-in-out,
+      opacity 0.2s ease-in-out;
 
     svg {
       fill: @w-red;
diff --git a/src/style/components/lexical-input.less b/src/style/components/lexical-input.less
new file mode 100644
index 00000000000..903278def17
--- /dev/null
+++ b/src/style/components/lexical-input.less
@@ -0,0 +1,170 @@
+.typeahead-menu {
+  position: unset !important;
+  z-index: 99999;
+  display: unset !important;
+  height: unset !important;
+}
+
+.input-bar--wrapper {
+  position: relative;
+  display: flex;
+  width: 100%;
+  align-items: center;
+}
+
+.editor-container {
+  position: relative;
+  width: 100%;
+  max-height: 200px;
+  background: var(--input-bar-bg);
+  color: var(--main-color);
+  overflow-y: scroll;
+}
+
+.at-mentions {
+  color: var(--accent-color);
+}
+
+.focused-mentions {
+  background-color: var(--accent-color-selection);
+}
+
+.editor-input {
+  position: relative;
+  min-height: 24px;
+  caret-color: var(--accent-color);
+  //padding: 10px 10px 5px;
+  margin-block: 16px;
+  outline: 0;
+  resize: none;
+  tab-size: 1;
+}
+
+.editor-placeholder {
+  position: absolute;
+  top: 50%;
+  left: 10px;
+  display: inline-block;
+
+  overflow: hidden;
+
+  color: var(--text-input-placeholder);
+  font-size: var(--font-size-xsmall);
+  font-weight: var(--font-weight-regular);
+  pointer-events: none;
+  text-overflow: ellipsis;
+  translate: 0 -50%;
+  user-select: none;
+}
+
+.editor-paragraph {
+  //margin: 0 0 15px 0;
+  position: relative;
+}
+
+.dropdown .item .icon {
+  display: flex;
+  width: 20px;
+  height: 20px;
+  margin-right: 12px;
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: contain;
+  line-height: 16px;
+  user-select: none;
+}
+
+.mentions-menu {
+  width: 250px;
+}
+
+.mention:focus {
+  box-shadow: rgb(180 213 255) 0px 0px 0px 2px;
+  outline: none;
+}
+
+.typeahead-popover {
+  border-radius: 8px;
+  margin-top: 25px;
+  background: #fff;
+  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.3);
+  //width: auto;
+
+  &.emoji-menu {
+    position: absolute;
+    width: 200px;
+  }
+}
+
+.typeahead-popover ul {
+  max-height: 200px;
+  padding: 0;
+  border-radius: 8px;
+  margin: 0;
+  list-style: none;
+  overflow-y: scroll;
+}
+
+.typeahead-popover ul::-webkit-scrollbar {
+  display: none;
+}
+
+.typeahead-popover ul {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+
+.typeahead-popover ul li {
+  min-width: 180px;
+  border-radius: 8px;
+  margin: 0;
+  cursor: pointer;
+  font-size: 14px;
+  outline: none;
+}
+
+.typeahead-popover ul li.selected {
+  background: #eee;
+}
+
+.typeahead-popover li {
+  display: flex;
+  flex-direction: row;
+  flex-shrink: 0;
+  align-content: center;
+  padding: 8px;
+  border: 0;
+  border-radius: 8px;
+  margin: 0 8px 0 8px;
+  background-color: #fff;
+  color: #050505;
+  cursor: pointer;
+  font-size: 15px;
+  line-height: 16px;
+}
+
+.typeahead-popover li.active {
+  display: flex;
+  width: 20px;
+  height: 20px;
+  background-size: contain;
+}
+
+.typeahead-popover li:first-child {
+  border-radius: 8px 8px 0px 0px;
+}
+
+.typeahead-popover li:last-child {
+  border-radius: 0px 0px 8px 8px;
+}
+
+.typeahead-popover li:hover {
+  background-color: #eee;
+}
+
+.typeahead-popover li .text {
+  display: flex;
+  min-width: 150px;
+  flex-grow: 1;
+  line-height: 20px;
+}
diff --git a/src/style/content/conversation/input-bar.less b/src/style/content/conversation/input-bar.less
index bbea72ec469..2bfef2eb8e2 100644
--- a/src/style/content/conversation/input-bar.less
+++ b/src/style/content/conversation/input-bar.less
@@ -32,15 +32,22 @@
     padding-right: 8px;
     background-color: var(--input-bar-bg);
 
-    &--editing {
+    &--editing,
+    &--editing .editor-container {
       background-color: var(--text-input-editing);
       transition: background-color @animation-timing-faster @ease-in-quad;
     }
   }
 }
 
-.conversation-input-bar-text,
-.shadow-input {
+.conversation-input-bar-text-placeholder::before {
+  padding-left: 8px;
+  color: var(--text-input-placeholder);
+  content: attr(data-placeholder);
+  .label-xs;
+}
+
+.conversation-input-bar-text {
   .accent-selection;
   .reset-textarea;
 
@@ -48,7 +55,7 @@
   max-width: calc(
     @conversation-max-width - @conversation-message-sender-width - var(--conversation-message-timestamp-width)
   );
-  height: @conversation-input-line-height;
+  height: auto;
   min-height: @conversation-input-line-height;
   max-height: @conversation-input-max-height;
   flex: 1 1;
@@ -61,6 +68,10 @@
   overflow-y: auto;
   text-rendering: optimizeLegibility;
 
+  .input-mention {
+    color: var(--accent-color);
+  }
+
   &::placeholder {
     .label-xs;
 
@@ -72,21 +83,9 @@
     }
   }
 
+  &--accent,
   &--accent::placeholder {
-    color: var(--accent-color);
-  }
-}
-
-@supports (caret-color: #000) {
-  .conversation-input-bar-text {
-    caret-color: var(--accent-color);
-    color: transparent;
-  }
-}
-
-@supports not (caret-color: #000) {
-  .conversation-input-bar-text {
-    -webkit-text-fill-color: transparent;
+    color: var(--accent-color) !important;
   }
 }
 
@@ -103,21 +102,6 @@
   width: 100%;
   flex: 1 1;
   align-items: center;
-
-  .shadow-input {
-    position: absolute;
-    top: 0;
-    right: 0;
-    left: 0;
-    height: auto;
-    overflow-wrap: break-word;
-    pointer-events: none;
-    white-space: pre-wrap;
-
-    .input-mention {
-      color: var(--accent-color);
-    }
-  }
 }
 
 .controls-right {
diff --git a/src/style/content/conversation/message-list.less b/src/style/content/conversation/message-list.less
index 491bc28b2a7..d9f852192d4 100644
--- a/src/style/content/conversation/message-list.less
+++ b/src/style/content/conversation/message-list.less
@@ -24,11 +24,11 @@
 }
 
 .messages {
-  max-width: @conversation-max-width;
   transform: translateZ(0);
   &.flex-center {
     margin: auto;
     & .message {
+      width: 100%;
       min-width: 75%;
     }
   }
@@ -47,29 +47,17 @@
     margin-bottom: 40px;
   }
 
-  .context-menu,
-  .time {
-    background-color: var(--app-bg);
-  }
-
   &.hover .time,
   &:hover .time,
-  &.hover .context-menu,
-  &:hover .context-menu,
-  &.hover .message-status-read,
-  &:hover .message-status-read,
   .show-timestamp.time {
     opacity: 1;
     pointer-events: auto;
   }
 
-  &.hover,
-  &:hover {
-    .message-status,
-    .message-status-read {
-      &::before {
-        content: '·';
-      }
+  &:hover .message-status-read {
+    opacity: 0;
+    &__show-on-hover {
+      opacity: 1;
     }
   }
 
@@ -79,10 +67,6 @@
     cursor: default;
   }
 
-  .context-menu {
-    cursor: pointer;
-  }
-
   &:not(:hover) {
     .message-status {
       opacity: 1;
@@ -115,8 +99,18 @@
   }
 }
 
+.content-message-wrapper {
+  &:hover,
+  &:focus-visible {
+    background-color: #fff;
+
+    body.theme-dark & {
+      background-color: var(--gray-90);
+    }
+  }
+}
+
 .message-marked {
-  .context-menu,
   .time {
     background-color: transparent;
   }
@@ -153,9 +147,10 @@
 
 .message-header-icon {
   .flex-center;
-
   width: @conversation-message-sender-width;
   max-height: @avatar-diameter-xs;
+
+  align-self: center;
   color: var(--background);
 
   &--svg {
@@ -172,7 +167,6 @@
   min-width: 0; // fixes ellipsis not working with flexbox (FF)
   flex: 1;
   align-items: center;
-  padding-right: var(--conversation-message-timestamp-width);
   font-size: @font-size-small;
   font-weight: @font-weight-regular;
   white-space: normal;
@@ -263,10 +257,6 @@
     max-height: 40px;
   }
 
-  &:not(.message-timestamp-visible) {
-    display: none;
-  }
-
   .message-unread-dot {
     .dot-md;
     background-color: var(--accent-color);
@@ -314,15 +304,25 @@
 // MESSAGE - BODY
 .message-body {
   position: relative;
-  padding-right: var(--conversation-message-timestamp-width);
+  display: flex;
+  max-width: @conversation-max-width;
+  justify-content: space-between;
   padding-left: @conversation-message-sender-width;
 
+  &-content {
+    width: calc(100% - var(--conversation-message-timestamp-width));
+    max-width: calc(
+      @conversation-max-width - @conversation-message-sender-width - var(--conversation-message-timestamp-width)
+    );
+  }
+
   .text {
     .text-selection;
     .accent-selection;
 
     display: inline-block;
     width: 100%;
+    min-width: 0;
     line-height: @line-height-lg;
     white-space: pre-wrap;
     word-wrap: break-word;
@@ -387,8 +387,7 @@
 .image-asset {
   position: relative;
   display: flex;
-  margin-top: 16px;
-  margin-bottom: 24px;
+  margin: 8px 0 24px;
   cursor: pointer;
 
   &--no-image {
@@ -499,18 +498,11 @@
 
 // MESSAGE - ACTIONS
 .message-body-actions {
-  position: absolute;
-  top: 0;
-  right: 0;
   display: flex;
-  width: var(--conversation-message-timestamp-width);
-  height: 24px;
-  align-items: center;
-
-  @media (max-width: @screen-md-min) {
-    height: 45px;
-    flex-direction: column;
-  }
+  min-width: var(--conversation-message-timestamp-width);
+  align-items: flex-start;
+  justify-content: flex-start;
+  padding: 5px;
 
   // actions pill
   .action-pill-style() {
@@ -523,31 +515,12 @@
     transition: opacity, 0.3s;
   }
 
-  // CONTEXT MENU
-  .context-menu {
-    .action-pill-style;
-    .button-icon-secondary;
-    .square(16px);
-
-    @media (min-width: @screen-md-min) {
-      position: absolute;
-      left: 8px;
-    }
-
-    min-width: 0;
-    min-height: 0;
-    justify-content: center;
-
-    &:focus,
-    &:focus-visible {
-      opacity: 1 !important;
-    }
-  }
-
   .message-status-read {
+    display: flex;
+    align-items: center;
     svg {
-      max-width: 12px;
-      max-height: 12px;
+      width: 12px;
+      min-height: 12px;
       fill: currentColor;
     }
 
@@ -559,56 +532,34 @@
     &:focus-visible {
       opacity: 1;
     }
+
+    @media (max-width: @screen-md-min) {
+      &__one-on-one {
+        height: 24px;
+        flex-direction: column;
+        .message-status-read__count {
+          margin-left: 0;
+        }
+      }
+    }
+  }
+
+  .time {
+    .action-pill-style;
   }
 
   .time,
   .message-status,
   .message-status-read {
-    .action-pill-style;
+    .subline;
     color: var(--gray-70);
     font-size: 12px !important;
     pointer-events: none;
     user-select: none;
 
-    @media (min-width: @screen-md-min) {
-      position: absolute;
-      bottom: 3px;
-    }
-
-    .subline;
-
     body.theme-dark & {
       color: var(--gray-60);
     }
-
-    &--clickable {
-      cursor: pointer;
-      pointer-events: all;
-    }
-  }
-  .message-status,
-  .message-status-read--visible {
-    opacity: 1;
-  }
-}
-
-@media (min-width: @screen-md-min) {
-  .time {
-    left: 32px;
-  }
-}
-.message-status,
-.message-status-read {
-  left: 83px;
-  &::before {
-    display: none;
-    @media (min-width: @screen-md-min) {
-      display: flex;
-      width: 16px;
-      align-items: center;
-      justify-content: center;
-      content: '';
-    }
   }
 }
 
@@ -818,8 +769,8 @@
 
 // MESSAGE SPACING
 .message-asset {
-  display: block;
-  margin-top: 16px;
+  flex: 1;
+  margin-top: 8px;
 }
 
 .message-call,
@@ -859,3 +810,57 @@
     fill: #fff;
   }
 }
+
+.overlay {
+  position: fixed;
+  z-index: @z-index-modal + 1;
+  right: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+}
+
+.reactionContainer {
+  display: flex;
+  padding: 1rem;
+  gap: 0.5rem;
+}
+
+.content-message-timestamp {
+  margin-left: 0.5rem;
+  color: var(--content-message-timestamp);
+}
+
+.overlay .EmojiPickerReact {
+  border-style: none !important;
+  background-color: var(--message-actions-background);
+  box-shadow: 1px 2px 6px rgba(0, 0, 0, 0.3);
+
+  body.theme-dark & {
+    box-shadow: 1px 2px 6px rgba(0, 0, 0, 0.3);
+  }
+}
+
+.overlay .EmojiPickerReact li.epr-emoji-category > .epr-emoji-category-label {
+  background-color: var(--message-actions-background);
+}
+
+.overlay .EmojiPickerReact .epr-preview {
+  border-top: 1px solid var(--message-actions-border-hover);
+}
+
+.EmojiPickerReact .epr-search-container input.epr-search {
+  body.theme-dark & {
+    border: 1px solid var(--gray-70);
+    border-radius: 12px;
+    background: var(--gray-100);
+  }
+}
+
+.overlay .EmojiPickerReact button.epr-emoji {
+  &:hover > *,
+  &:focus > *,
+  &:focus-visible > * {
+    background-color: var(--message-actions-background-hover);
+  }
+}
diff --git a/src/style/content/conversation/message-quote.less b/src/style/content/conversation/message-quote.less
index 53a4e33a659..458bd72bedb 100644
--- a/src/style/content/conversation/message-quote.less
+++ b/src/style/content/conversation/message-quote.less
@@ -1,7 +1,10 @@
 .message-quote {
   position: relative;
+  max-width: calc(
+    @conversation-max-width - var(--conversation-message-timestamp-width) - @conversation-message-sender-width - 16px
+  );
   padding-right: var(--conversation-message-timestamp-width);
-  padding-left: @conversation-message-sender-width + 16;
+  padding-left: 16px;
   margin-bottom: 10px;
   font-size: @font-size-medium;
   line-height: 1.5em;
@@ -18,7 +21,7 @@
     position: absolute;
     top: 0;
     bottom: 0;
-    left: @conversation-message-sender-width;
+    left: 0;
     display: block;
     width: 4px;
     height: 100%;
diff --git a/src/style/content/conversation/title-bar.less b/src/style/content/conversation/title-bar.less
index 8660cb6d40b..e697ae59f48 100644
--- a/src/style/content/conversation/title-bar.less
+++ b/src/style/content/conversation/title-bar.less
@@ -16,6 +16,9 @@
  * along with this program. If not, see http://www.gnu.org/licenses/.
  *
  */
+
+@button-group-width: 128px;
+
 #show-participants {
   min-width: 0; //needed for the truncation of long titles to work properly in flex-boxes
 }
@@ -38,7 +41,6 @@
   display: flex;
   height: 100%;
   flex-grow: 1;
-  margin-left: 10px;
   user-select: none;
 
   &--verified {
@@ -76,8 +78,12 @@ body.theme-dark {
 .conversation-title-bar-icons,
 .conversation-title-bar-library {
   display: flex;
+  min-width: @button-group-width;
   height: 100%;
   align-items: center;
+  @media (min-width: calc(@screen-sm-min * 2)) and (max-width: @screen-md-min) {
+    min-width: 0;
+  }
 }
 
 .conversation-title-bar-icons {
diff --git a/src/style/content/history-export-import.less b/src/style/content/history-export-import.less
index 4590d6da9d8..1caa222eed2 100644
--- a/src/style/content/history-export-import.less
+++ b/src/style/content/history-export-import.less
@@ -63,7 +63,7 @@
       justify-content: center;
       margin-top: 32px;
 
-      button + button {
+      button ~ button {
         margin-left: 16px;
       }
     }
diff --git a/src/style/foundation/main.less b/src/style/foundation/main.less
index e4d5a44b529..05274da0116 100644
--- a/src/style/foundation/main.less
+++ b/src/style/foundation/main.less
@@ -88,6 +88,7 @@
 @import '../components/calling/choose-screen';
 @import '../components/mention-suggestions';
 @import '../components/list/conversation-list-calling-cell';
+@import '../components/lexical-input';
 
 @import '../content/animations';
 @import '../content/collection';
diff --git a/src/style/foundation/themes.less b/src/style/foundation/themes.less
index 707eb4e6991..62ed10eb4d1 100644
--- a/src/style/foundation/themes.less
+++ b/src/style/foundation/themes.less
@@ -104,6 +104,12 @@ body.theme-default {
   // ----------------------------------------------------------------------------
   @group-creation-modal-teamname-input-bg: #fff;
 
+  // message actions menu
+  @message-actions-background: #fff;
+  @message-actions-border: @gray-40;
+  @message-actions-background-hover: @gray-20;
+  @message-actions-border-hover: @gray-50;
+
   .applyTheme();
 
   // Force the conversation list calling cell and the
@@ -189,6 +195,12 @@ body.theme-dark {
   @checkbox-border-disabled: @gray-70;
   @checkbox-alert: @red-dark-500;
 
+  // message actions menu
+  @message-actions-background: @gray-90;
+  @message-actions-border: @gray-100;
+  @message-actions-background-hover: @gray-80;
+  @message-actions-border-hover: @gray-70;
+
   // ----------------------------------------------------------------------------
   // Message Quote Vertical Bar
   // ----------------------------------------------------------------------------
diff --git a/src/types/NodeModules.d.ts b/src/types/NodeModules.d.ts
index c2cc54f71fc..1ca9d3d6621 100644
--- a/src/types/NodeModules.d.ts
+++ b/src/types/NodeModules.d.ts
@@ -20,6 +20,7 @@
 declare module '@koush/wrtc' {
   export const nonstandard: {
     RTCAudioSource: any;
+    RTCRtpSender: {prototype: {createEncodedVideoStreams: any; createEncodedStreams: any; transform: any}};
   };
   export const MediaStream: any;
 }
diff --git a/test/helper/ConversationGenerator.ts b/test/helper/ConversationGenerator.ts
new file mode 100644
index 00000000000..b65c457d2ba
--- /dev/null
+++ b/test/helper/ConversationGenerator.ts
@@ -0,0 +1,119 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {ConnectionStatus} from '@wireapp/api-client/lib/connection/';
+import {CONVERSATION_TYPE, CONVERSATION_ACCESS_ROLE} from '@wireapp/api-client/lib/conversation/';
+import {RECEIPT_MODE} from '@wireapp/api-client/lib/conversation/data';
+import {ConversationProtocol} from '@wireapp/api-client/lib/conversation/NewConversation';
+import {QualifiedId} from '@wireapp/api-client/lib/user';
+import {LegalHoldStatus} from '@wireapp/core/lib/conversation/content';
+
+import {ConnectionEntity} from 'src/script/connection/ConnectionEntity';
+import {ConversationDatabaseData, ConversationMapper} from 'src/script/conversation/ConversationMapper';
+import {ConversationStatus} from 'src/script/conversation/ConversationStatus';
+import {ConversationVerificationState} from 'src/script/conversation/ConversationVerificationState';
+import {Conversation} from 'src/script/entity/Conversation';
+import {User} from 'src/script/entity/User';
+import {createUuid} from 'Util/uuid';
+
+interface GenerateAPIConversationParams {
+  id?: QualifiedId;
+  type?: CONVERSATION_TYPE;
+  protocol?: ConversationProtocol;
+  overwites?: Partial<ConversationDatabaseData>;
+  name?: string;
+}
+
+function generateAPIConversation({
+  id = {id: createUuid(), domain: 'test.wire.link'},
+  type = CONVERSATION_TYPE.REGULAR,
+  protocol = ConversationProtocol.PROTEUS,
+  overwites = {},
+  name,
+}: GenerateAPIConversationParams): ConversationDatabaseData {
+  return {
+    id: id.id,
+    name,
+    type: type,
+    protocol: protocol,
+    qualified_id: id,
+    access: [],
+    verification_state: ConversationVerificationState.UNVERIFIED,
+    mlsVerificationState: ConversationVerificationState.UNVERIFIED,
+    receipt_mode: RECEIPT_MODE.ON,
+    team_id: '',
+    status: ConversationStatus.CURRENT_MEMBER,
+    is_guest: false,
+    archived_state: false,
+    archived_timestamp: 0,
+    last_event_timestamp: 0,
+    last_read_timestamp: 0,
+    last_server_timestamp: 0,
+    cleared_timestamp: 0,
+    ephemeral_timer: 0,
+    roles: {},
+    muted_state: 0,
+    muted_timestamp: 0,
+    others: [],
+    qualified_others: [],
+    legal_hold_status: LegalHoldStatus.DISABLED,
+    global_message_timer: 0,
+    group_id: '',
+    cipher_suite: 0,
+    epoch: 0,
+    domain: id.domain,
+    creator: '',
+    access_role: [CONVERSATION_ACCESS_ROLE.TEAM_MEMBER],
+    ...overwites,
+  };
+}
+
+interface GenerateConversationParams extends GenerateAPIConversationParams {
+  users?: User[];
+  status?: ConnectionStatus;
+}
+
+export function generateConversation({
+  type = CONVERSATION_TYPE.REGULAR,
+  status = ConnectionStatus.ACCEPTED,
+  protocol = ConversationProtocol.PROTEUS,
+  id,
+  name,
+  users = [],
+  overwites = {},
+}: GenerateConversationParams = {}): Conversation {
+  const apiConversation = generateAPIConversation({id, type, protocol, name, overwites});
+
+  const conversation = ConversationMapper.mapConversations([apiConversation])[0];
+  const connectionEntity = new ConnectionEntity();
+  connectionEntity.conversationId = conversation.qualifiedId;
+  connectionEntity.status(status);
+  conversation.connection(connectionEntity);
+  conversation.type(type);
+
+  if (protocol === ConversationProtocol.MLS) {
+    conversation.groupId = 'groupId';
+  }
+
+  if (users) {
+    conversation.participating_user_ets(users);
+  }
+
+  return conversation;
+}
diff --git a/test/helper/EventGenerator.ts b/test/helper/EventGenerator.ts
new file mode 100644
index 00000000000..b27bfab3f30
--- /dev/null
+++ b/test/helper/EventGenerator.ts
@@ -0,0 +1,98 @@
+/*
+ * Wire
+ * Copyright (C) 2023 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+
+import {AssetTransferState} from 'src/script/assets/AssetTransferState';
+import {AssetAddEvent, DeleteEvent, EventBuilder, MessageAddEvent} from 'src/script/conversation/EventBuilder';
+import {Conversation} from 'src/script/entity/Conversation';
+import {CONVERSATION} from 'src/script/event/Client';
+import {createUuid} from 'Util/uuid';
+
+export function createMessageAddEvent({
+  text = '',
+  overrides = {},
+  dataOverrides = {},
+}: {
+  text?: string;
+  overrides?: Partial<MessageAddEvent>;
+  dataOverrides?: Partial<MessageAddEvent['data']>;
+} = {}): MessageAddEvent {
+  const from = createUuid();
+  const conversation = new Conversation(createUuid(), 'domain');
+  const baseEvent = EventBuilder.buildMessageAdd(conversation, Date.now(), createUuid(), 'clientId');
+  return {
+    ...baseEvent,
+    data: {
+      ...baseEvent.data,
+      content: text,
+      previews: [],
+      ...dataOverrides,
+    },
+    from,
+    ...overrides,
+  };
+}
+
+export function createDeleteEvent(deleteMessageId: string, conversationId: string = createUuid()): DeleteEvent {
+  return {
+    conversation: conversationId,
+    data: {
+      deleted_time: 0,
+      message_id: deleteMessageId,
+      time: '',
+    },
+    from: createUuid(),
+    id: createUuid(),
+    qualified_conversation: {domain: '', id: conversationId},
+    time: new Date().toISOString(),
+    type: CONVERSATION.MESSAGE_DELETE,
+  };
+}
+
+export function createAssetAddEvent(overrides: Partial<AssetAddEvent> = {}): AssetAddEvent {
+  const from = createUuid();
+  return {
+    conversation: createUuid(),
+    data: {
+      content_type: '',
+      content_length: 0,
+      status: AssetTransferState.UPLOADING,
+      info: {name: 'test.png'},
+    },
+    from,
+    id: createUuid(),
+    time: new Date().toISOString(),
+    type: CONVERSATION.ASSET_ADD,
+    ...overrides,
+  };
+}
+
+/**
+ * will simulate en event that has been saved to the DB
+ * @param event
+ * @returns
+ */
+export function toSavedEvent<T extends MessageAddEvent | AssetAddEvent>(
+  event: T,
+): T & {primary_key: string; category: number} {
+  return {
+    primary_key: createUuid(),
+    category: 1,
+    ...event,
+  };
+}
diff --git a/test/helper/TestFactory.js b/test/helper/TestFactory.js
index a7d8776d358..41407011a88 100644
--- a/test/helper/TestFactory.js
+++ b/test/helper/TestFactory.js
@@ -68,6 +68,7 @@ import {UserService} from 'src/script/user/UserService';
 import {UserState} from 'src/script/user/UserState';
 
 import {entities} from '../api/payloads';
+import {SelfRepository} from 'src/script/self/SelfRepository';
 
 export class TestFactory {
   constructor() {
@@ -106,22 +107,9 @@ export class TestFactory {
    */
   async exposeClientActors() {
     await this.exposeCryptographyActors();
-    const clientEntity = new ClientEntity(false, null);
-    clientEntity.address = '192.168.0.1';
-    clientEntity.class = ClientClassification.DESKTOP;
-    clientEntity.id = '60aee26b7f55a99f';
-
-    const user = new User(entities.user.john_doe.id, null);
-    user.devices.push(clientEntity);
-    user.email(entities.user.john_doe.email);
-    user.isMe = true;
-    user.locale = entities.user.john_doe.locale;
-    user.name(entities.user.john_doe.name);
-    user.phone(entities.user.john_doe.phone);
 
     this.client_service = new ClientService(this.storage_service);
     this.client_repository = new ClientRepository(this.client_service, this.cryptography_repository, new ClientState());
-    this.client_repository.init(user);
 
     const currentClient = new ClientEntity(false, null);
     currentClient.address = '62.96.148.44';
@@ -135,7 +123,7 @@ export class TestFactory {
     currentClient.time = '2016-10-07T16:01:42.133Z';
     currentClient.type = ClientType.TEMPORARY;
 
-    this.client_repository['clientState'].currentClient(currentClient);
+    this.client_repository['clientState'].currentClient = currentClient;
 
     return this.client_repository;
   }
@@ -157,7 +145,6 @@ export class TestFactory {
       serverTimeHandler,
       this.user_repository['userState'],
     );
-    this.event_repository.currentClient = this.client_repository['clientState'].currentClient;
 
     return this.event_repository;
   }
@@ -176,6 +163,7 @@ export class TestFactory {
     const userState = new UserState();
     const selfUser = new User('self-id');
     selfUser.isMe = true;
+    userState.self(selfUser);
     userState.users([selfUser]);
 
     this.user_repository = new UserRepository(
@@ -222,15 +210,34 @@ export class TestFactory {
     this.team_service = new TeamService();
     this.team_service.getAllTeamFeatures = async () => ({});
     this.team_repository = new TeamRepository(
-      this.team_service,
       this.user_repository,
       this.assetRepository,
+      this.team_service,
       this.user_repository['userState'],
       new TeamState(this.user_repository['userState']),
     );
     return this.team_repository;
   }
 
+  /**
+   * @returns {Promise<SelfRepository>} The self repository.
+   */
+  async exposeSelfActors() {
+    await this.exposeUserActors();
+    await this.exposeTeamActors();
+    await this.exposeClientActors();
+
+    this.self_repository = new SelfRepository(
+      new SelfService(),
+      this.user_repository,
+      this.team_repository,
+      this.client_repository,
+      this.user_repository['userState'],
+    );
+
+    return this.self_repository;
+  }
+
   /**
    * @returns {Promise<ConversationRepository>} The conversation repository.
    */
@@ -254,7 +261,7 @@ export class TestFactory {
     clientEntity.class = ClientClassification.DESKTOP;
     clientEntity.id = '60aee26b7f55a99f';
     const clientState = new ClientState();
-    clientState.currentClient(clientEntity);
+    clientState.currentClient = clientEntity;
 
     this.message_repository = new MessageRepository(
       () => this.conversation_repository,
@@ -277,6 +284,7 @@ export class TestFactory {
       this.team_repository,
       this.user_repository,
       this.propertyRepository,
+      this.calling_repository,
       serverTimeHandler,
       this.user_repository['userState'],
       this.team_repository['teamState'],
diff --git a/test/helper/UserGenerator.ts b/test/helper/UserGenerator.ts
index eed6d71b07b..32a44806e95 100644
--- a/test/helper/UserGenerator.ts
+++ b/test/helper/UserGenerator.ts
@@ -47,7 +47,8 @@ export function generateAPIUser(
     ],
     handle: faker.internet.userName(),
     id: id.id,
-    name: faker.name.fullName(),
+    // replace special chars to avoid escaping problems with querying the DOM
+    name: faker.person.fullName().replace(/[^a-zA-Z ]/, ''),
     qualified_id: id,
     ...overwites,
   };
diff --git a/test/unit_tests/calling/videoGridHandlerSpec.js b/test/unit_tests/calling/videoGridHandlerSpec.js
index 22c97064b53..0c1a47891c3 100644
--- a/test/unit_tests/calling/videoGridHandlerSpec.js
+++ b/test/unit_tests/calling/videoGridHandlerSpec.js
@@ -73,7 +73,7 @@ describe('videoGridHandler', () => {
         selfParticipant.videoStream({});
         const call = new Call('', '', undefined, selfParticipant, CALL_TYPE.NORMAL, {
           currentAvailableDeviceId: {
-            audioOutput: ko.pureComputed(() => 'test'),
+            audiooutput: ko.pureComputed(() => 'test'),
           },
         });
         call.participants = participantsObs;
@@ -95,7 +95,7 @@ describe('videoGridHandler', () => {
         const selfParticipant = generateVideoParticipant('self', true);
         const call = new Call('', '', CONV_TYPE.ONEONONE, selfParticipant, CALL_TYPE.NORMAL, {
           currentAvailableDeviceId: {
-            audioOutput: ko.pureComputed(() => 'test'),
+            audiooutput: ko.pureComputed(() => 'test'),
           },
         });
         call.addParticipant(participants[0]);
@@ -111,7 +111,7 @@ describe('videoGridHandler', () => {
         const selfParticipant = generateVideoParticipant('self', true);
         const call = new Call('', '', CONV_TYPE.GROUP, selfParticipant, CALL_TYPE.NORMAL, {
           currentAvailableDeviceId: {
-            audioOutput: ko.pureComputed(() => 'test'),
+            audiooutput: ko.pureComputed(() => 'test'),
           },
         });
         call.addParticipant(participants[0]);
@@ -127,7 +127,7 @@ describe('videoGridHandler', () => {
         const selfParticipant = generateVideoParticipant('self', true);
         const call = new Call('', '', CONV_TYPE.GROUP, selfParticipant, CALL_TYPE.NORMAL, {
           currentAvailableDeviceId: {
-            audioOutput: ko.pureComputed(() => 'test'),
+            audiooutput: ko.pureComputed(() => 'test'),
           },
         });
         call.updatePages();
@@ -142,7 +142,7 @@ describe('videoGridHandler', () => {
         const selfParticipant = generateVideoParticipant('self', true);
         const call = new Call('', '', CONV_TYPE.GROUP, selfParticipant, CALL_TYPE.NORMAL, {
           currentAvailableDeviceId: {
-            audioOutput: ko.pureComputed(() => 'test'),
+            audiooutput: ko.pureComputed(() => 'test'),
           },
         });
         call.addParticipant(participants[0]);
diff --git a/test/unit_tests/entity/message/FileSpec.ts b/test/unit_tests/entity/message/FileSpec.ts
index 549ebcdc24e..c694f10365f 100644
--- a/test/unit_tests/entity/message/FileSpec.ts
+++ b/test/unit_tests/entity/message/FileSpec.ts
@@ -33,7 +33,7 @@ describe('FileAsset', () => {
       file.file_type = 'video/mp4';
       jest
         .spyOn(document, 'createElement')
-        .mockImplementationOnce(() => ({canPlayType: () => 'yes'} as unknown as HTMLElement));
+        .mockImplementationOnce(() => ({canPlayType: () => 'yes'}) as unknown as HTMLElement);
       expect(file.isVideo()).toBeTruthy();
     });
 
@@ -43,19 +43,19 @@ describe('FileAsset', () => {
       file.file_type = 'image/jpg';
       jest
         .spyOn(document, 'createElement')
-        .mockImplementationOnce(() => ({canPlayType: () => ''} as unknown as HTMLElement));
+        .mockImplementationOnce(() => ({canPlayType: () => ''}) as unknown as HTMLElement);
       expect(file.isVideo()).toBeFalsy();
 
       file.file_type = 'image/png';
       jest
         .spyOn(document, 'createElement')
-        .mockImplementationOnce(() => ({canPlayType: () => ''} as unknown as HTMLElement));
+        .mockImplementationOnce(() => ({canPlayType: () => ''}) as unknown as HTMLElement);
       expect(file.isVideo()).toBeFalsy();
 
       file.file_type = 'image/gif';
       jest
         .spyOn(document, 'createElement')
-        .mockImplementationOnce(() => ({canPlayType: () => ''} as unknown as HTMLElement));
+        .mockImplementationOnce(() => ({canPlayType: () => ''}) as unknown as HTMLElement);
       expect(file.isVideo()).toBeFalsy();
     });
   });
diff --git a/test/unit_tests/entity/message/MemberMessageSpec.js b/test/unit_tests/entity/message/MemberMessageSpec.js
deleted file mode 100644
index 6570e4130b1..00000000000
--- a/test/unit_tests/entity/message/MemberMessageSpec.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {AssetTransferState} from 'src/script/assets/AssetTransferState';
-import {ContentMessage} from 'src/script/entity/message/ContentMessage';
-import {FileAsset} from 'src/script/entity/message/FileAsset';
-import {MemberMessage} from 'src/script/entity/message/MemberMessage';
-import {Text} from 'src/script/entity/message/Text';
-import {User} from 'src/script/entity/User';
-import 'src/script/localization/Localizer';
-import {StatusType} from 'src/script/message/StatusType';
-import {createUuid} from 'Util/uuid';
-
-describe('Member Message', () => {
-  describe('generateNameString', () => {
-    let message_et = null;
-
-    beforeEach(() => {
-      message_et = new MemberMessage();
-    });
-
-    it('can return correct string for one user', () => {
-      const user_a = new User(createUuid());
-      user_a.name('John');
-      message_et.userEntities.push(user_a);
-      expect(message_et.generateNameString()).toBe('[bold]John[/bold]');
-    });
-
-    it('can return correct string for two users', () => {
-      const user_a = new User(createUuid(), null);
-      user_a.name('John');
-      const user_b = new User(createUuid(), null);
-      user_b.name('Jim');
-      message_et.userEntities.push(user_a, user_b);
-      expect(message_et.generateNameString()).toBe('[bold]Jim[/bold] and [bold]John[/bold]');
-    });
-
-    it('can return correct string for more than two users', () => {
-      const user_a = new User(createUuid());
-      user_a.name('John');
-      const user_b = new User(createUuid());
-      user_b.name('Jim');
-      const user_c = new User(createUuid());
-      user_c.name('Jill');
-      message_et.userEntities.push(user_a, user_b, user_c);
-
-      expect(message_et.generateNameString()).toBe('[bold]Jill[/bold], [bold]Jim[/bold], and [bold]John[/bold]');
-    });
-
-    it('can return correct string for more than one user without sender', () => {
-      const user_sender = new User(createUuid());
-      user_sender.name('Sender');
-      message_et.user(user_sender);
-
-      const user_a = new User(createUuid(), null);
-      user_a.name('John');
-      const user_b = new User(createUuid(), null);
-      user_b.name('Jim');
-      const user_c = new User(createUuid(), null);
-      user_c.name('Jill');
-      message_et.userEntities.push(user_sender, user_a, user_b, user_c);
-
-      expect(message_et.generateNameString()).toBe('[bold]Jill[/bold], [bold]Jim[/bold], and [bold]John[/bold]');
-    });
-  });
-
-  describe('isDeletable', () => {
-    let message_et = null;
-
-    beforeEach(() => {
-      message_et = new ContentMessage();
-    });
-
-    it('should be deletable when message is not sending', () => {
-      message_et.assets.push(new Text());
-
-      expect(message_et.isDeletable()).toBe(true);
-    });
-
-    it('should not be deletable while message is sending', () => {
-      message_et.assets.push(new Text());
-      message_et.status(StatusType.SENDING);
-
-      expect(message_et.isDeletable()).toBe(false);
-    });
-
-    it('should not be deletable when message is a file and uploading or downloading', () => {
-      const file_et = new FileAsset();
-      file_et.status(AssetTransferState.UPLOADING);
-      message_et.assets.push(file_et);
-
-      expect(message_et.isDeletable()).toBe(false);
-    });
-  });
-
-  describe('hasAssetFile', () => {
-    let message_et = null;
-
-    beforeEach(() => {
-      message_et = new ContentMessage();
-    });
-
-    it('should return false by default', () => {
-      expect(message_et.hasAssetFile()).toBeFalsy();
-    });
-
-    it('should return false for Text asset', () => {
-      message_et.assets.push(new Text());
-
-      expect(message_et.hasAssetFile()).toBeFalsy();
-    });
-
-    it('should return true for FileAsset asset', () => {
-      message_et.assets.push(new FileAsset());
-
-      expect(message_et.hasAssetFile()).toBeTruthy();
-    });
-  });
-});
diff --git a/test/unit_tests/event/EventServiceCommon.js b/test/unit_tests/event/EventServiceCommon.js
index 6baafe12fbf..0c60d834c29 100644
--- a/test/unit_tests/event/EventServiceCommon.js
+++ b/test/unit_tests/event/EventServiceCommon.js
@@ -350,6 +350,7 @@ const testEventServiceClass = (testedServiceName, className) => {
         const initialEvent = {
           id: 'event-id',
           data: {content: ''},
+          type: 'conversation.asset-add',
         };
         const reason = AssetTransferState.UPLOAD_FAILED;
         spyOn(testFactory.storage_service, 'load').and.returnValue(Promise.resolve(initialEvent));
diff --git a/test/unit_tests/event/preprocessor/QuotedMessageMiddlewareSpec.js b/test/unit_tests/event/preprocessor/QuotedMessageMiddlewareSpec.js
deleted file mode 100644
index 927d57cbde1..00000000000
--- a/test/unit_tests/event/preprocessor/QuotedMessageMiddlewareSpec.js
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {Quote} from '@wireapp/protocol-messaging';
-
-import {ClientEvent} from 'src/script/event/Client';
-import {QuotedMessageMiddleware} from 'src/script/event/preprocessor/QuotedMessageMiddleware';
-import {MessageHasher} from 'src/script/message/MessageHasher';
-import {QuoteEntity} from 'src/script/message/QuoteEntity';
-import {arrayToBase64} from 'Util/util';
-
-import {TestFactory} from '../../../helper/TestFactory';
-
-describe('QuotedMessageMiddleware', () => {
-  const testFactory = new TestFactory();
-  let quotedMessageMiddleware;
-
-  beforeEach(() => {
-    return testFactory.exposeEventActors().then(() => {
-      quotedMessageMiddleware = new QuotedMessageMiddleware(testFactory.event_service);
-    });
-  });
-
-  describe('processEvent', () => {
-    it('ignores messages that do not have quotes', () => {
-      const event = {
-        data: {
-          content: 'salut',
-          quote: undefined,
-        },
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-
-      return quotedMessageMiddleware.processEvent(event).then(decoratedEvent => {
-        expect(decoratedEvent).toBe(event);
-      });
-    });
-
-    it('adds an error if quoted message is not found', async () => {
-      spyOn(quotedMessageMiddleware.eventService, 'loadEvent').and.returnValue(Promise.resolve(undefined));
-
-      const expectedError = {
-        type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND,
-      };
-
-      const quote = new Quote({
-        quotedMessageId: 'invalid-message-uuid',
-        quotedMessageSha256: '',
-      });
-
-      const base64Quote = arrayToBase64(Quote.encode(quote).finish());
-
-      const event = {
-        conversation: 'c3dfbc39-4e61-42e3-ab31-62800a0faeeb',
-        data: {
-          content: 'salut',
-          quote: base64Quote,
-        },
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-
-      const parsedEvent = await quotedMessageMiddleware.processEvent(event);
-
-      expect(parsedEvent.data.quote.quotedMessageId).toBeUndefined();
-      expect(parsedEvent.data.quote.error).toEqual(expectedError);
-    });
-
-    it('decorates event with the quote metadata if validation is successful', async () => {
-      const quotedMessage = {
-        data: {
-          content: 'salut',
-        },
-        from: 'user-id',
-        time: 100,
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-      spyOn(MessageHasher, 'validateHash').and.returnValue(Promise.resolve(true));
-      spyOn(quotedMessageMiddleware.eventService, 'loadEvent').and.returnValue(Promise.resolve(quotedMessage));
-
-      const quote = new Quote({
-        quotedMessageId: 'message-uuid',
-        quotedMessageSha256: '7fec6710751f67587b6f6109782257cd7c56b5d29570824132e8543e18242f1b',
-      });
-
-      const base64Quote = arrayToBase64(Quote.encode(quote).finish());
-
-      const event = {
-        conversation: 'conversation-uuid',
-        data: {
-          content: 'salut',
-          quote: base64Quote,
-        },
-        time: 100,
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-
-      const parsedEvent = await quotedMessageMiddleware.processEvent(event);
-
-      expect(parsedEvent.data.quote.message_id).toEqual('message-uuid');
-      expect(parsedEvent.data.quote.user_id).toEqual('user-id');
-    });
-
-    it('updates quotes in DB when a message is edited', () => {
-      const originalMessage = {
-        data: {
-          content: 'hello',
-        },
-      };
-      const replies = [
-        {
-          data: {
-            content: 'bonjour',
-            quote: {
-              message_id: 'original-id',
-            },
-          },
-        },
-        {
-          data: {
-            content: 'hey',
-            quote: {
-              message_id: 'original-id',
-            },
-          },
-        },
-      ];
-      spyOn(quotedMessageMiddleware.eventService, 'loadEvent').and.returnValue(Promise.resolve(originalMessage));
-      spyOn(quotedMessageMiddleware.eventService, 'loadEventsReplyingToMessage').and.returnValue(
-        Promise.resolve(replies),
-      );
-      spyOn(quotedMessageMiddleware.eventService, 'replaceEvent').and.returnValue(Promise.resolve());
-
-      const event = {
-        conversation: 'conversation-uuid',
-        data: {
-          replacing_message_id: 'original-id',
-        },
-        id: 'new-id',
-        time: 100,
-        type: ClientEvent.CONVERSATION.MESSAGE_ADD,
-      };
-
-      jest.useFakeTimers();
-
-      return quotedMessageMiddleware.processEvent(event).then(() => {
-        jest.advanceTimersByTime(1);
-
-        expect(quotedMessageMiddleware.eventService.replaceEvent).toHaveBeenCalledWith(
-          jasmine.objectContaining({data: jasmine.objectContaining({quote: {message_id: 'new-id'}})}),
-        );
-        jest.useRealTimers();
-      });
-    });
-
-    it('invalidates quotes in DB when a message is deleted', () => {
-      const originalMessage = {
-        data: {
-          content: 'hello',
-        },
-      };
-      const replies = [
-        {
-          data: {
-            content: 'bonjour',
-            quote: {
-              message_id: 'original-id',
-            },
-          },
-        },
-        {
-          data: {
-            content: 'hey',
-            quote: {
-              message_id: 'original-id',
-            },
-          },
-        },
-      ];
-      spyOn(quotedMessageMiddleware.eventService, 'loadEvent').and.returnValue(Promise.resolve(originalMessage));
-      spyOn(quotedMessageMiddleware.eventService, 'loadEventsReplyingToMessage').and.returnValue(
-        Promise.resolve(replies),
-      );
-      spyOn(quotedMessageMiddleware.eventService, 'replaceEvent').and.returnValue(Promise.resolve());
-
-      const event = {
-        conversation: 'conversation-uuid',
-        data: {
-          replacing_message_id: 'original-id',
-        },
-        id: 'new-id',
-        time: 100,
-        type: ClientEvent.CONVERSATION.MESSAGE_DELETE,
-      };
-
-      return quotedMessageMiddleware.processEvent(event).then(() => {
-        expect(quotedMessageMiddleware.eventService.replaceEvent).toHaveBeenCalledWith(
-          jasmine.objectContaining({
-            data: jasmine.objectContaining({quote: {error: {type: QuoteEntity.ERROR.MESSAGE_NOT_FOUND}}}),
-          }),
-        );
-      });
-    });
-  });
-});
diff --git a/test/unit_tests/event/preprocessor/ReceiptsMiddlewareSpec.js b/test/unit_tests/event/preprocessor/ReceiptsMiddlewareSpec.js
deleted file mode 100644
index 3325af98ee0..00000000000
--- a/test/unit_tests/event/preprocessor/ReceiptsMiddlewareSpec.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {ClientEvent} from 'src/script/event/Client';
-import {ReceiptsMiddleware} from 'src/script/event/preprocessor/ReceiptsMiddleware';
-import {noop} from 'Util/util';
-import {createUuid} from 'Util/uuid';
-
-describe('ReceiptsMiddleware', () => {
-  const selfId = createUuid();
-  let readReceiptMiddleware;
-
-  beforeEach(async () => {
-    const eventService = {loadEvents: noop, replaceEvent: noop};
-    readReceiptMiddleware = new ReceiptsMiddleware(eventService, undefined, {
-      self: () => ({
-        id: selfId,
-      }),
-    });
-  });
-
-  describe('processEvent', () => {
-    it('ignores read receipt for which original message is not found', () => {
-      const event = createConfirmationEvent(3);
-
-      spyOn(readReceiptMiddleware.eventService, 'loadEvents').and.returnValue(Promise.resolve([]));
-      spyOn(readReceiptMiddleware.eventService, 'replaceEvent');
-
-      return readReceiptMiddleware.processEvent(event).then(() => {
-        expect(readReceiptMiddleware.eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [
-          event.data.message_id,
-        ]);
-        expect(readReceiptMiddleware.eventService.replaceEvent).not.toHaveBeenCalled();
-      });
-    });
-
-    it('ignores read receipt from user who already has read the message', () => {
-      const event = createConfirmationEvent(4);
-
-      const originalEvent = {from: selfId, read_receipts: [{time: '', userId: event.from}]};
-      spyOn(readReceiptMiddleware.eventService, 'loadEvents').and.returnValue(Promise.resolve([originalEvent]));
-      spyOn(readReceiptMiddleware.eventService, 'replaceEvent');
-
-      return readReceiptMiddleware.processEvent(event).then(() => {
-        expect(readReceiptMiddleware.eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [
-          event.data.message_id,
-        ]);
-        expect(readReceiptMiddleware.eventService.replaceEvent).not.toHaveBeenCalled();
-      });
-    });
-
-    it('ignores read receipts for messages that are not mine', () => {
-      const event = createConfirmationEvent(4);
-      const originaleEvent = {from: createUuid()};
-      spyOn(readReceiptMiddleware.eventService, 'loadEvents').and.returnValue(Promise.resolve([originaleEvent]));
-      spyOn(readReceiptMiddleware.eventService, 'replaceEvent');
-      return readReceiptMiddleware.processEvent(event).then(() => {
-        expect(readReceiptMiddleware.eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [
-          event.data.message_id,
-        ]);
-        expect(readReceiptMiddleware.eventService.replaceEvent).not.toHaveBeenCalled();
-      });
-    });
-
-    it('updates original message when read confirmation is received', () => {
-      const originalEvent = {from: selfId};
-      spyOn(readReceiptMiddleware.eventService, 'loadEvents').and.returnValue(Promise.resolve([originalEvent]));
-      spyOn(readReceiptMiddleware.eventService, 'replaceEvent').and.returnValue(Promise.resolve(originalEvent));
-
-      const event = createConfirmationEvent(4, [], selfId);
-
-      return readReceiptMiddleware.processEvent(event).then(() => {
-        expect(readReceiptMiddleware.eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [
-          event.data.message_id,
-        ]);
-        expect(readReceiptMiddleware.eventService.replaceEvent).toHaveBeenCalledWith({
-          from: selfId,
-          read_receipts: [{time: event.time, userId: event.from}],
-          status: event.data.status,
-        });
-      });
-    });
-
-    it('updates original message when delivered confirmation is received', () => {
-      const originalEvent = {from: selfId};
-      spyOn(readReceiptMiddleware.eventService, 'loadEvents').and.returnValue(Promise.resolve([originalEvent]));
-      spyOn(readReceiptMiddleware.eventService, 'replaceEvent').and.returnValue(Promise.resolve(originalEvent));
-
-      const event = createConfirmationEvent(3, [], selfId);
-
-      return readReceiptMiddleware.processEvent(event).then(() => {
-        expect(readReceiptMiddleware.eventService.loadEvents).toHaveBeenCalledWith(event.conversation, [
-          event.data.message_id,
-        ]);
-        expect(readReceiptMiddleware.eventService.replaceEvent).toHaveBeenCalledWith({
-          from: selfId,
-          status: event.data.status,
-        });
-      });
-    });
-  });
-});
-
-function createConfirmationEvent(status, moreMessageIds = [], fromId = createUuid()) {
-  return {
-    conversation: createUuid(),
-    data: {
-      message_id: createUuid(),
-      more_message_ids: moreMessageIds,
-      status,
-    },
-    from: fromId,
-    time: '12-12-12',
-    type: ClientEvent.CONVERSATION.CONFIRMATION,
-  };
-}
diff --git a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js b/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js
deleted file mode 100644
index 4283dd15ebe..00000000000
--- a/test/unit_tests/event/preprocessor/ServiceMiddlewareSpec.js
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {CONVERSATION_EVENT} from '@wireapp/api-client/lib/event/';
-
-import {Conversation} from 'src/script/entity/Conversation';
-import {ClientEvent} from 'src/script/event/Client';
-import {ServiceMiddleware} from 'src/script/event/preprocessor/ServiceMiddleware';
-
-import {TestFactory} from '../../../helper/TestFactory';
-
-describe('ServiceMiddleware', () => {
-  const testFactory = new TestFactory();
-  let serviceMiddleware;
-
-  beforeEach(() => {
-    return testFactory.exposeConversationActors().then(() => {
-      serviceMiddleware = new ServiceMiddleware(testFactory.conversation_repository, testFactory.user_repository);
-    });
-  });
-
-  describe('processEvent', () => {
-    describe('conversation.member-join events', () => {
-      it('adds meta when services are present in the event', () => {
-        const event = {
-          data: {
-            user_ids: ['not-a-service', 'a-service'],
-          },
-          type: CONVERSATION_EVENT.MEMBER_JOIN,
-        };
-
-        spyOn(serviceMiddleware['userState'], 'self').and.returnValue({id: 'self-id'});
-        const userEntities = [{}, {isService: true}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).toBe(true);
-        });
-      });
-
-      it('adds meta if I was added to a conversation including a service', () => {
-        const event = {
-          data: {
-            user_ids: ['self-id'],
-          },
-          type: CONVERSATION_EVENT.MEMBER_JOIN,
-        };
-
-        spyOn(serviceMiddleware['userState'], 'self').and.returnValue({id: 'self-id'});
-        const conversation = new Conversation();
-        spyOn(testFactory.conversation_repository, 'getConversationById').and.returnValue(
-          Promise.resolve(conversation),
-        );
-        const userEntities = [{}, {isService: true}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).toBe(true);
-        });
-      });
-
-      it('does not modify events not containing any service', () => {
-        const event = {
-          data: {
-            user_ids: ['not-a-service', 'another-not-a-service'],
-          },
-          type: CONVERSATION_EVENT.MEMBER_JOIN,
-        };
-        spyOn(serviceMiddleware['userState'], 'self').and.returnValue({id: 'self-id'});
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve([{}, {}]));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).not.toBeDefined();
-        });
-      });
-
-      it('adds meta when services are present in the event with qualified user ids', () => {
-        const event = {
-          data: {
-            users: [{qualified_id: {domain: '', id: 'not-a-service'}}, {qualified_id: {domain: '', id: 'a-service'}}],
-          },
-          type: CONVERSATION_EVENT.MEMBER_JOIN,
-        };
-
-        spyOn(serviceMiddleware['userState'], 'self').and.returnValue({id: 'self-id'});
-        const userEntities = [{}, {isService: true}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).toBe(true);
-        });
-      });
-    });
-
-    describe('conversation.one2one-creation events', () => {
-      it('adds meta when services are present in the event', () => {
-        const event = {
-          data: {
-            userIds: ['not-a-service', 'a-service'],
-          },
-          type: ClientEvent.CONVERSATION.ONE2ONE_CREATION,
-        };
-
-        const userEntities = [{}, {isService: true}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).toBe(true);
-        });
-      });
-
-      it('does not modify events not containing any service', () => {
-        const event = {
-          data: {
-            userIds: ['not-a-service', 'another-not-a-service'],
-          },
-          type: ClientEvent.CONVERSATION.ONE2ONE_CREATION,
-        };
-
-        const userEntities = [{}, {}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).not.toBeDefined();
-        });
-      });
-
-      it('adds meta when services are present in the event with qualified user ids', () => {
-        const event = {
-          data: {
-            userIds: [
-              {domain: '', id: 'not-a-service'},
-              {domain: '', id: 'a-service'},
-            ],
-          },
-          type: ClientEvent.CONVERSATION.ONE2ONE_CREATION,
-        };
-
-        const userEntities = [{}, {isService: true}];
-        spyOn(testFactory.user_repository, 'getUsersById').and.returnValue(Promise.resolve(userEntities));
-
-        return serviceMiddleware.processEvent(event).then(decoratedEvent => {
-          expect(decoratedEvent.data.has_service).toBe(true);
-        });
-      });
-    });
-  });
-});
diff --git a/test/unit_tests/extension/GiphyRepositorySpec.js b/test/unit_tests/extension/GiphyRepositorySpec.js
deleted file mode 100644
index e1b0d65cef3..00000000000
--- a/test/unit_tests/extension/GiphyRepositorySpec.js
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-import {StatusCodes as HTTP_STATUS, ReasonPhrases as HTTP_MESSAGE} from 'http-status-codes';
-import {container} from 'tsyringe';
-
-import {Config} from 'src/script/Config';
-import {GiphyRepository} from 'src/script/extension/GiphyRepository';
-import {GiphyService} from 'src/script/extension/GiphyService';
-import {APIClient} from 'src/script/service/APIClientSingleton';
-
-jest.deepUnmock('axios');
-
-describe('Giphy Repository', () => {
-  let server = null;
-
-  let giphyRepository = null;
-  let giphyService = null;
-
-  beforeEach(() => {
-    server = sinon.fakeServer.create();
-
-    giphyService = new GiphyService(container.resolve(APIClient));
-    giphyRepository = new GiphyRepository(giphyService);
-
-    spyOn(giphyService, 'getRandom').and.callThrough();
-    spyOn(giphyService, 'getById').and.callThrough();
-
-    const randomFooGif = `${Config.getConfig().BACKEND_REST}/proxy/giphy/v1/gifs/random?tag=foo`;
-    server.respondWith('GET', randomFooGif, [
-      HTTP_STATUS.OK,
-      {'Content-Type': 'application/json'},
-      JSON.stringify({
-        data: {
-          fixed_height_downsampled_height: '200',
-          fixed_height_downsampled_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/200_d.gif',
-          fixed_height_downsampled_width: '262',
-          fixed_height_small_height: '100',
-          fixed_height_small_still_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100_s.gif',
-          fixed_height_small_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100.gif',
-          fixed_height_small_width: '131',
-          fixed_width_downsampled_height: '153',
-          fixed_width_downsampled_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/200w_d.gif',
-          fixed_width_downsampled_width: '200',
-          fixed_width_small_height: '76',
-          fixed_width_small_still_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100w_s.gif',
-          fixed_width_small_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/100w.gif',
-          fixed_width_small_width: '100',
-          id: 'GKLmFicoabZrW',
-          image_frames: '10',
-          image_height: '244',
-          image_mp4_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.mp4',
-          image_original_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.gif',
-          image_url: 'http://s3.amazonaws.com/giphygifs/media/GKLmFicoabZrW/giphy.gif',
-          image_width: '320',
-          type: 'gif',
-          url: 'http://giphy.com/gifs/big-thank-indulging-GKLmFicoabZrW',
-        },
-        meta: {msg: HTTP_MESSAGE.OK, status: HTTP_STATUS.OK},
-      }),
-    ]);
-
-    const randomFooGifData = `${Config.getConfig().BACKEND_REST}/proxy/giphy/v1/gifs/GKLmFicoabZrW`;
-    server.respondWith('GET', randomFooGifData, [
-      HTTP_STATUS.OK,
-      {'Content-Type': 'application/json'},
-      JSON.stringify({
-        data: {
-          bitly_gif_url: 'http://gph.is/1Q95Wje',
-          bitly_url: 'http://gph.is/1Q95Wje',
-          caption: '',
-          content_url: '',
-          embed_url: 'https://giphy.com/embed/GKLmFicoabZrW',
-          id: 'GKLmFicoabZrW',
-          images: {
-            downsized: {
-              height: '244',
-              size: '514699',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.gif',
-              width: '320',
-            },
-            downsized_large: {
-              height: '0',
-              size: '0',
-              url: '',
-              width: '0',
-            },
-            downsized_still: {
-              height: '244',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy_s.gif',
-              width: '320',
-            },
-            fixed_height: {
-              height: '200',
-              mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.mp4',
-              mp4_size: '178927',
-              size: '0',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200.webp',
-              webp_size: '88838',
-              width: '262',
-            },
-            fixed_height_downsampled: {
-              height: '200',
-              size: '149525',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_d.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_d.webp',
-              webp_size: '53016',
-              width: '262',
-            },
-            fixed_height_small: {
-              height: '100',
-              mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.mp4',
-              mp4_size: '66464',
-              size: '0',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/100.webp',
-              webp_size: '32982',
-              width: '131',
-            },
-            fixed_height_small_still: {
-              height: '100',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100_s.gif',
-              width: '131',
-            },
-            fixed_height_still: {
-              height: '200',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200_s.gif',
-              width: '262',
-            },
-            fixed_width: {
-              height: '153',
-              mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.mp4',
-              mp4_size: '120356',
-              size: '0',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w.webp',
-              webp_size: '57810',
-              width: '200',
-            },
-            fixed_width_downsampled: {
-              height: '153',
-              size: '227351',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_d.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_d.webp',
-              webp_size: '34448',
-              width: '200',
-            },
-            fixed_width_small: {
-              height: '76',
-              mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.mp4',
-              mp4_size: '46951',
-              size: '0',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w.webp',
-              webp_size: '23174',
-              width: '100',
-            },
-            fixed_width_small_still: {
-              height: '76',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/100w_s.gif',
-              width: '100',
-            },
-            fixed_width_still: {
-              height: '153',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/200w_s.gif',
-              width: '200',
-            },
-            original: {
-              frames: '10',
-              height: '244',
-              mp4: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.mp4',
-              mp4_size: '710329',
-              size: '514699',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.gif',
-              webp: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy.webp',
-              webp_size: '116528',
-              width: '320',
-            },
-            original_still: {
-              height: '244',
-              url: 'https://media4.giphy.com/media/GKLmFicoabZrW/giphy_s.gif',
-              width: '320',
-            },
-          },
-          import_datetime: '2015-05-02 00:11:31',
-          rating: 'pg',
-          source: 'http://jezebel.com/big-sean-is-indulging-in-some-me-time-thank-you-1701548048',
-          trending_datetime: '2015-05-04 20:01:25',
-          type: 'gif',
-          url: 'https://giphy.com/gifs/big-thank-indulging-GKLmFicoabZrW',
-          username: '',
-        },
-        meta: {msg: HTTP_MESSAGE.OK, status: HTTP_STATUS.OK},
-      }),
-    ]);
-    server.autoRespond = true;
-  });
-
-  afterEach(() => {
-    server.restore();
-  });
-
-  describe('getRandomGif', () => {
-    it('can receive a random gif', async () => {
-      await giphyRepository.getRandomGif({tag: 'foo'});
-
-      expect(giphyService.getRandom).toHaveBeenCalled();
-      expect(giphyService.getById).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/test/unit_tests/media/MediaDevicesHandlerSpec.js b/test/unit_tests/media/MediaDevicesHandlerSpec.js
deleted file mode 100644
index 88fb988f69e..00000000000
--- a/test/unit_tests/media/MediaDevicesHandlerSpec.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * Wire
- * Copyright (C) 2018 Wire Swiss GmbH
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
- *
- */
-
-/* eslint-disable */
-import {MediaDeviceType} from 'src/script/media/MediaDeviceType';
-import {MediaDevicesHandler} from 'src/script/media/MediaDevicesHandler';
-
-/* yarn test:app --specs media/MediaDevicesHandler --nolegacy */
-describe('MediaDevicesHandler', () => {
-  /**
-   * Test data from a real-world scenario:
-   * - Laptop webcam (Lenovo EasyCamera)
-   * - Laptop microphone (Realtek High Definition Audio)
-   * - USB webcam (Logitech HD Webcam C270)
-   * - Bluetooth Headset (Bose QuietComfort)
-   * - Two external monitors (DELL U2713HM)
-   *
-   * In total:
-   * - 2 cameras
-   * - 3 microphones
-   * - 4 speakers
-   */
-  const realWorldTestSetup = {
-    microphones: [
-      {
-        'deviceId': 'default',
-        'groupId': '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
-        'kind': MediaDeviceType.AUDIO_INPUT,
-        'label': 'Default - Microphone (HD Webcam C270) (046d:0825)',
-      },
-      {
-        'deviceId': 'communications',
-        'groupId': 'af428bcaa9e9900c935395d334818e98062dd4e49f3eec6443ba1f0a09461132',
-        'kind': MediaDeviceType.AUDIO_INPUT,
-        'label': 'Communications - Headset (Bose QuietComfort Hands-Free) (Bluetooth)',
-      },
-      {
-        'deviceId': '38b330ab6fd0091eaca57eb00f4231418393d8e71ff8e55fb228dc218773f2bc',
-        'groupId': 'af428bcaa9e9900c935395d334818e98062dd4e49f3eec6443ba1f0a09461132',
-        'kind': MediaDeviceType.AUDIO_INPUT,
-        'label': 'Headset (Bose QuietComfort Hands-Free) (Bluetooth)',
-      },
-      {
-        'deviceId': '2a6eb6f699bffde4cb8eb3c0249b398fe6314669ab19b81e6993d232fcfd9b81',
-        'groupId': 'ea09ec3f5571b2b2268e8c6f9b98120a8a43bf29f3c38b344a96a23e8382b3f3',
-        'kind': MediaDeviceType.AUDIO_INPUT,
-        'label': 'Microphonearray (Realtek High Definition Audio)',
-      },
-      {
-        'deviceId': 'bf3908cde3bb950469ff594c76d0896beed01a2d670549549327e3f8f33d4f47',
-        'groupId': '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
-        'kind': MediaDeviceType.AUDIO_INPUT,
-        'label': 'Microphone (HD Webcam C270) (046d:0825)',
-      },
-    ],
-    cameras: [
-      {
-        'deviceId': '22aed33748e8832f9010ae0ae97b56dfda51ef42784dd354d11e068a14452d91',
-        'groupId': 'f07604beddf27565f236bf93eb2ab713db2ec2df03278d8c1eb14f4f1ce841d8',
-        'kind': MediaDeviceType.VIDEO_INPUT,
-        'label': 'Lenovo EasyCamera (5986:068c)',
-      },
-      {
-        'deviceId': 'd52247ce9f08ada2109f11906f00992f27f964ce850793460d34ed7981348c47',
-        'groupId': '9d8426d64dd15ca6966cb3182371e259283b1dcef969e2b624d26a4552c0b4d3',
-        'kind': MediaDeviceType.VIDEO_INPUT,
-        'label': 'Logitech HD Webcam C270 (046d:0825)',
-      },
-
-    ],
-    speakers: [
-      {
-        'deviceId': 'default',
-        'groupId': 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'Default - Headset (Bose QuietComfort Stereo) (Bluetooth)',
-      },
-      {
-        'deviceId': 'communications',
-        'groupId': 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'Communications - Headset (Bose QuietComfort Stereo) (Bluetooth)',
-      },
-      {
-        'deviceId': 'bb00aceb5a214799cca4d11f10827d60a3462069cd227f8c7874ef60c1401ef0',
-        'groupId': 'd16c859ff680089ca8e155e5ecae18aa2582f0ee4a53d02ca3ab1708fe5fb4d0',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'DELL U2713HM (Intel(R) Display-Audio)',
-      },
-      {
-        'deviceId': 'e6bc5cff184fcf11c10a1800c5079c24da038461facd73122e9bc9158afded26',
-        'groupId': 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'Headset (Bose QuietComfort Stereo) (Bluetooth)',
-      },
-      {
-        'deviceId': 'af7da4f952304dfeec3aa5a77141decb309f3e8a1f8e94834e9ec746205bf049',
-        'groupId': 'ea09ec3f5571b2b2268e8c6f9b98120a8a43bf29f3c38b344a96a23e8382b3f3',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'Speaker (Realtek High Definition Audio)',
-      },
-      {
-        'deviceId': '2bc694541adf32e336123e5027d991200d939209a13080818132409279b95afb',
-        'groupId': '3a7a22368d6425475421fc42cd9052bf3297b53d65e6b7b329f180a9cc90ae99',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'DELL U2713HM (Intel(R) Display-Audio)',
-      },
-      {
-        'deviceId': '1c8c3b8d8e33dc9cc2ea9dc3bc5144f717e2bc45d7d52a22a4148830ca44b7f9',
-        'groupId': 'bf1ec0df3fe711fab2128c22b19d3b86e0963d302deee84b171f84c9e2417858',
-        'kind': MediaDeviceType.AUDIO_OUTPUT,
-        'label': 'Headset (Bose QuietComfort Stereo) (Bluetooth)',
-      },
-    ],
-  };
-
-  const fakeWorldTestSetup = {
-    cameras: [
-      {deviceId: 'camera1', kind: MediaDeviceType.VIDEO_INPUT, label: 'Camera 1', groupId: '1'},
-      {deviceId: 'camera2', kind: MediaDeviceType.VIDEO_INPUT, label: 'Camera 2', groupId: '2'},
-    ],
-    speakers: [
-      {deviceId: 'speaker1', kind: MediaDeviceType.AUDIO_OUTPUT, label: 'Speaker 1', groupId: '1'},
-      {deviceId: 'speaker2', kind: MediaDeviceType.AUDIO_OUTPUT, label: 'Speaker 2', groupId: '2'},
-    ],
-    microphones: [
-      {deviceId: 'mic1', kind: MediaDeviceType.AUDIO_INPUT, label: 'Mic 1', groupId: '1'},
-      {deviceId: 'mic2', kind: MediaDeviceType.AUDIO_INPUT, label: 'Mic 2', groupId: '2'},
-    ],
-  };
-
-  describe('refreshMediaDevices', () => {
-    it('filters duplicate microphones and keeps the ones marked with "communications"', () => {
-      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
-        Promise.resolve([
-          {
-            'deviceId': 'default',
-            'groupId': 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
-            'kind': MediaDeviceType.AUDIO_INPUT,
-            'label': 'Default - Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
-          },
-          {
-            'deviceId': 'communications',
-            'groupId': 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
-            'kind': MediaDeviceType.AUDIO_INPUT,
-            'label': 'Communications - Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
-          },
-          {
-            'deviceId': 'c2f7f56ce1d142a4fe13d5bb42e355b7a0ed7de88d1aa93e196ab0b011a183cd',
-            'groupId': 'a7392890d1200b83c3c786d6a08f89b28908493694a2cf014d0cf74e62b4f404',
-            'kind': MediaDeviceType.AUDIO_INPUT,
-            'label': 'Desktop Microphone (Microsoft® LifeCam Studio(TM)) (045e:0772)',
-          },
-        ]),
-      );
-
-      const devicesHandler = new MediaDevicesHandler();
-
-      setTimeout(() => {
-        expect(devicesHandler.availableDevices.audioInput().length).toEqual(1);
-      });
-    });
-
-    it('filters duplicate speakers', () => {
-      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
-        Promise.resolve([...realWorldTestSetup.cameras, ...realWorldTestSetup.microphones, ...realWorldTestSetup.speakers]),
-      );
-
-      const devicesHandler = new MediaDevicesHandler();
-
-      expect(realWorldTestSetup.cameras.length).toEqual(2);
-      expect(realWorldTestSetup.microphones.length).toEqual(5);
-      expect(realWorldTestSetup.speakers.length).toEqual(7);
-
-      setTimeout(() => {
-        expect(devicesHandler.availableDevices.videoInput().length).toEqual(2);
-        expect(devicesHandler.availableDevices.audioInput().length).toEqual(3);
-        expect(devicesHandler.availableDevices.audioOutput().length).toEqual(4);
-      });
-    });
-  });
-
-  describe('constructor', () => {
-    it('loads available devices and listens to input devices changes', done => {
-      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
-        Promise.resolve([...fakeWorldTestSetup.cameras, ...fakeWorldTestSetup.microphones, ...fakeWorldTestSetup.speakers]),
-      );
-
-      const devicesHandler = new MediaDevicesHandler();
-      setTimeout(() => {
-        expect(navigator.mediaDevices.enumerateDevices).toHaveBeenCalledTimes(1);
-        expect(devicesHandler.availableDevices.videoInput()).toEqual(fakeWorldTestSetup.cameras);
-        expect(devicesHandler.availableDevices.audioOutput()).toEqual(fakeWorldTestSetup.speakers);
-
-        const newCameras = [{deviceId: 'newcamera', kind: MediaDeviceType.VIDEO_INPUT}];
-        navigator.mediaDevices.enumerateDevices.and.returnValue(Promise.resolve(newCameras));
-        navigator.mediaDevices.ondevicechange();
-
-        setTimeout(() => {
-          expect(navigator.mediaDevices.enumerateDevices).toHaveBeenCalledTimes(2);
-          expect(devicesHandler.availableDevices.videoInput()).toEqual(newCameras);
-          expect(devicesHandler.availableDevices.audioOutput()).toEqual([]);
-          done();
-        });
-      });
-    });
-  });
-
-  describe('currentAvailableDeviceId', () => {
-    it('only exposes available device', done => {
-      spyOn(navigator.mediaDevices, 'enumerateDevices').and.returnValue(
-        Promise.resolve([...fakeWorldTestSetup.cameras, ...fakeWorldTestSetup.microphones, ...fakeWorldTestSetup.speakers]),
-      );
-
-      const devicesHandler = new MediaDevicesHandler();
-      setTimeout(() => {
-        devicesHandler.currentDeviceId.videoInput(fakeWorldTestSetup.cameras[0].deviceId);
-
-        expect(devicesHandler.currentAvailableDeviceId.videoInput()).toBe(fakeWorldTestSetup.cameras[0].deviceId);
-
-        devicesHandler.currentDeviceId.videoInput('not-existing-id');
-        expect(devicesHandler.currentAvailableDeviceId.videoInput()).toBe(
-          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.videoInput,
-        );
-
-        devicesHandler.currentDeviceId.audioInput(fakeWorldTestSetup.microphones[0].deviceId);
-
-        expect(devicesHandler.currentAvailableDeviceId.audioInput()).toBe(fakeWorldTestSetup.microphones[0].deviceId);
-
-        devicesHandler.currentDeviceId.audioInput('not-existing-id');
-        expect(devicesHandler.currentAvailableDeviceId.audioInput()).toBe(
-          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.audioInput,
-        );
-
-        devicesHandler.currentDeviceId.audioOutput(fakeWorldTestSetup.speakers[0].deviceId);
-
-        expect(devicesHandler.currentAvailableDeviceId.audioOutput()).toBe(fakeWorldTestSetup.speakers[0].deviceId);
-
-        devicesHandler.currentDeviceId.audioOutput('inexistant-id');
-        expect(devicesHandler.currentAvailableDeviceId.audioOutput()).toBe(
-          MediaDevicesHandler.CONFIG.DEFAULT_DEVICE.audioOutput,
-        );
-        done();
-      });
-    });
-  });
-});
diff --git a/test/unit_tests/util/TimeUtilSpec.js b/test/unit_tests/util/TimeUtilSpec.js
index 6a296f6507c..bcd133a0b21 100644
--- a/test/unit_tests/util/TimeUtilSpec.js
+++ b/test/unit_tests/util/TimeUtilSpec.js
@@ -29,6 +29,7 @@ import {
   isThisYear,
   isToday,
   setDateLocale,
+  weeksPassedSinceDate,
 } from 'Util/TimeUtil';
 
 describe('TimeUtil', () => {
@@ -402,4 +403,31 @@ describe('TimeUtil', () => {
       setDateLocale('en');
     });
   });
+
+  const currentDate = new Date('2023-06-13T12:10:00Z');
+  describe(`weeksPassedSinceDate with current date ${currentDate}`, () => {
+    const cases = [
+      ['some date in the future', new Date('2023-06-14T12:10:00Z'), 1],
+      ['current date', currentDate, 1],
+      ['3 days ago', new Date('2023-06-10T12:10:00Z'), 1],
+      ['1 week ago', new Date('2023-06-06T12:10:00Z'), 1],
+      ['8 days ago', new Date('2023-06-05T12:10:00Z'), 2],
+      ['20 days ago', new Date('2023-05-24T12:10:00Z'), 3],
+      ['24 days ago', new Date('2023-05-20T12:10:00Z'), 4],
+      ['28 days ago', new Date('2023-05-16T12:10:00Z'), 4],
+      ['30 days ago', new Date('2023-05-14T12:10:00Z'), 5],
+    ];
+
+    beforeAll(() => {
+      jest.useFakeTimers();
+    });
+
+    afterAll(() => {
+      jest.useRealTimers();
+    });
+    it.each(cases)('for %s (%s) should return %s week(s)', (_, date, weeks) => {
+      jest.setSystemTime(currentDate);
+      expect(weeksPassedSinceDate(date)).toBe(weeks);
+    });
+  });
 });
diff --git a/tsconfig.json b/tsconfig.json
index 7131ddfcda0..fb56d4f0267 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -31,10 +31,10 @@
       "Resource/*": ["./resource/*"],
       "Util/*": ["./src/script/util/*"]
     },
+    "skipLibCheck": true,
     "resolveJsonModule": true,
     "rootDirs": ["src/script"],
     "target": "es2017",
-    "typeRoots": ["src/types", "node_modules/@types", "node_modules/amplify/typings"],
     "strict": true
   },
   "exclude": ["node_modules", "server/", "src/sw.js", "src/worker/"]
diff --git a/yarn.lock b/yarn.lock
index 7433ae1d8a2..77abeed1cbd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5,151 +5,99 @@ __metadata:
   version: 6
   cacheKey: 8
 
+"@aashutoshrathi/word-wrap@npm:^1.2.3":
+  version: 1.2.6
+  resolution: "@aashutoshrathi/word-wrap@npm:1.2.6"
+  checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd
+  languageName: node
+  linkType: hard
+
 "@ampproject/remapping@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@ampproject/remapping@npm:2.2.0"
+  version: 2.2.1
+  resolution: "@ampproject/remapping@npm:2.2.1"
   dependencies:
-    "@jridgewell/gen-mapping": ^0.1.0
+    "@jridgewell/gen-mapping": ^0.3.0
     "@jridgewell/trace-mapping": ^0.3.9
-  checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292
+  checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079
   languageName: node
   linkType: hard
 
 "@apideck/better-ajv-errors@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@apideck/better-ajv-errors@npm:0.3.1"
+  version: 0.3.6
+  resolution: "@apideck/better-ajv-errors@npm:0.3.6"
   dependencies:
     json-schema: ^0.4.0
     jsonpointer: ^5.0.0
     leven: ^3.1.0
   peerDependencies:
     ajv: ">=8"
-  checksum: e3debe385495a1212ad00a95a6b83ac5013c4f80786e2cad2096b15dd61ee977500f3dea5f16a8d98b00dc9d708a68664f7b3b5e7a348d233fa399cf3a96e311
-  languageName: node
-  linkType: hard
-
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6, @babel/code-frame@npm:^7.21.4":
-  version: 7.21.4
-  resolution: "@babel/code-frame@npm:7.21.4"
-  dependencies:
-    "@babel/highlight": ^7.18.6
-  checksum: e5390e6ec1ac58dcef01d4f18eaf1fd2f1325528661ff6d4a5de8979588b9f5a8e852a54a91b923846f7a5c681b217f0a45c2524eb9560553160cd963b7d592c
+  checksum: b70ec9aae3b30ba1ac06948e585cd96aabbfe7ef6a1c27dc51e56c425f01290a58e9beb19ed95ee64da9f32df3e9276cd1ea58e78792741d74a519cb56955491
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/code-frame@npm:7.22.5"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.13":
+  version: 7.22.13
+  resolution: "@babel/code-frame@npm:7.22.13"
   dependencies:
-    "@babel/highlight": ^7.22.5
-  checksum: cfe804f518f53faaf9a1d3e0f9f74127ab9a004912c3a16fda07fb6a633393ecb9918a053cb71804204c1b7ec3d49e1699604715e2cfb0c9f7bc4933d324ebb6
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.17.7, @babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.21.4":
-  version: 7.21.4
-  resolution: "@babel/compat-data@npm:7.21.4"
-  checksum: 5f8b98c66f2ffba9f3c3a82c0cf354c52a0ec5ad4797b370dc32bdcd6e136ac4febe5e93d76ce76e175632e2dbf6ce9f46319aa689fcfafa41b6e49834fa4b66
-  languageName: node
-  linkType: hard
-
-"@babel/compat-data@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/compat-data@npm:7.22.5"
-  checksum: eb1a47ebf79ae268b4a16903e977be52629339806e248455eb9973897c503a04b701f36a9de64e19750d6e081d0561e77a514c8dc470babbeba59ae94298ed18
+    "@babel/highlight": ^7.22.13
+    chalk: ^2.4.2
+  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
   languageName: node
   linkType: hard
 
-"@babel/core@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/core@npm:7.22.5"
-  dependencies:
-    "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.22.5
-    "@babel/generator": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.5
-    "@babel/helper-module-transforms": ^7.22.5
-    "@babel/helpers": ^7.22.5
-    "@babel/parser": ^7.22.5
-    "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.5
-    "@babel/types": ^7.22.5
-    convert-source-map: ^1.7.0
-    debug: ^4.1.0
-    gensync: ^1.0.0-beta.2
-    json5: ^2.2.2
-    semver: ^6.3.0
-  checksum: 173ae426958c90c7bbd7de622c6f13fcab8aef0fac3f138e2d47bc466d1cd1f86f71ca82ae0acb9032fd8794abed8efb56fea55c031396337eaec0d673b69d56
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/compat-data@npm:7.23.2"
+  checksum: d8dc27437d40907b271161d4c88ffe72ccecb034c730deb1960a417b59a14d7c5ebca8cd80dd458a01cd396a7a329eb48cddcc3791b5a84da33d7f278f7bec6a
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3":
-  version: 7.21.4
-  resolution: "@babel/core@npm:7.21.4"
+"@babel/core@npm:7.23.2, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3":
+  version: 7.23.2
+  resolution: "@babel/core@npm:7.23.2"
   dependencies:
     "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.21.4
-    "@babel/generator": ^7.21.4
-    "@babel/helper-compilation-targets": ^7.21.4
-    "@babel/helper-module-transforms": ^7.21.2
-    "@babel/helpers": ^7.21.0
-    "@babel/parser": ^7.21.4
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.21.4
-    "@babel/types": ^7.21.4
-    convert-source-map: ^1.7.0
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-compilation-targets": ^7.22.15
+    "@babel/helper-module-transforms": ^7.23.0
+    "@babel/helpers": ^7.23.2
+    "@babel/parser": ^7.23.0
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+    convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
-    json5: ^2.2.2
-    semver: ^6.3.0
-  checksum: a3beebb2cc79908a02f27a07dc381bcb34e8ecc58fa99f568ad0934c49e12111fc977ee9c5b51eb7ea2da66f63155d37c4dd96b6472eaeecfc35843ccb56bf3d
+    json5: ^2.2.3
+    semver: ^6.3.1
+  checksum: 003897718ded16f3b75632d63cd49486bf67ff206cc7ebd1a10d49e2456f8d45740910d5ec7e42e3faf0deec7a2e96b1a02e766d19a67a8309053f0d4e57c0fe
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/eslint-parser@npm:7.22.5"
+"@babel/eslint-parser@npm:7.22.15":
+  version: 7.22.15
+  resolution: "@babel/eslint-parser@npm:7.22.15"
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1
     eslint-visitor-keys: ^2.1.0
-    semver: ^6.3.0
+    semver: ^6.3.1
   peerDependencies:
-    "@babel/core": ">=7.11.0"
+    "@babel/core": ^7.11.0
     eslint: ^7.5.0 || ^8.0.0
-  checksum: d259a5c6bb11d2b99316a1aafb85be56fd290e2b7076b386a026cd0f8db4b27c0bf0c733bfa2006bb88d38abef323fc2c1352a3521e6e9865f8b205fef6ac845
-  languageName: node
-  linkType: hard
-
-"@babel/generator@npm:^7.21.4, @babel/generator@npm:^7.7.2":
-  version: 7.21.4
-  resolution: "@babel/generator@npm:7.21.4"
-  dependencies:
-    "@babel/types": ^7.21.4
-    "@jridgewell/gen-mapping": ^0.3.2
-    "@jridgewell/trace-mapping": ^0.3.17
-    jsesc: ^2.5.1
-  checksum: 9ffbb526a53bb8469b5402f7b5feac93809b09b2a9f82fcbfcdc5916268a65dae746a1f2479e03ba4fb0776facd7c892191f63baa61ab69b2cfdb24f7b92424d
+  checksum: efdc749164a40de1b68e3ed395f441dfb7864c85d0a2ee3e4bc4f06dd0b7f675acb9be97cdc9025b88b3e80d38749a2b30e392ce7f6a79313c3aaf82ba8ccd68
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/generator@npm:7.22.5"
+"@babel/generator@npm:^7.23.0, @babel/generator@npm:^7.7.2":
+  version: 7.23.0
+  resolution: "@babel/generator@npm:7.23.0"
   dependencies:
-    "@babel/types": ^7.22.5
+    "@babel/types": ^7.23.0
     "@jridgewell/gen-mapping": ^0.3.2
     "@jridgewell/trace-mapping": ^0.3.17
     jsesc: ^2.5.1
-  checksum: efa64da70ca88fe69f05520cf5feed6eba6d30a85d32237671488cc355fdc379fe2c3246382a861d49574c4c2f82a317584f8811e95eb024e365faff3232b49d
-  languageName: node
-  linkType: hard
-
-"@babel/helper-annotate-as-pure@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-annotate-as-pure@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 88ccd15ced475ef2243fdd3b2916a29ea54c5db3cd0cfabf9d1d29ff6e63b7f7cd1c27264137d7a40ac2e978b9b9a542c332e78f40eb72abe737a7400788fc1b
+  checksum: 8efe24adad34300f1f8ea2add420b28171a646edc70f2a1b3e1683842f23b8b7ffa7e35ef0119294e1901f45bfea5b3dc70abe1f10a1917ccdfb41bed69be5f1
   languageName: node
   linkType: hard
 
@@ -162,198 +110,89 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.18.6"
-  dependencies:
-    "@babel/helper-explode-assignable-expression": ^7.18.6
-    "@babel/types": ^7.18.6
-  checksum: c4d71356e0adbc20ce9fe7c1e1181ff65a78603f8bba7615745f0417fed86bad7dc0a54a840bc83667c66709b3cb3721edcb9be0d393a298ce4e9eb6d085f3c1
-  languageName: node
-  linkType: hard
-
 "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.5"
+  version: 7.22.15
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: d753acac62399fc6dd354cf1b9441bde0c331c2fe792a4c14904c5e5eafc3cac79478f6aa038e8a51c1148b0af6710a2e619855e4b5d54497ac972eaffed5884
-  languageName: node
-  linkType: hard
-
-"@babel/helper-compilation-targets@npm:^7.17.7, @babel/helper-compilation-targets@npm:^7.18.9, @babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.21.4":
-  version: 7.21.4
-  resolution: "@babel/helper-compilation-targets@npm:7.21.4"
-  dependencies:
-    "@babel/compat-data": ^7.21.4
-    "@babel/helper-validator-option": ^7.21.0
-    browserslist: ^4.21.3
-    lru-cache: ^5.1.1
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: bf9c7d3e7e6adff9222c05d898724cd4ee91d7eb9d52222c7ad2a22955620c2872cc2d9bdf0e047df8efdb79f4e3af2a06b53f509286145feccc4d10ddc318be
+    "@babel/types": ^7.22.15
+  checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-compilation-targets@npm:7.22.5"
+"@babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.5, @babel/helper-compilation-targets@npm:^7.22.6":
+  version: 7.22.15
+  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
   dependencies:
-    "@babel/compat-data": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.5
-    browserslist: ^4.21.3
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.15
+    browserslist: ^4.21.9
     lru-cache: ^5.1.1
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: a479460615acffa0f4fd0a29b740eafb53a93694265207d23a6038ccd18d183a382cacca515e77b7c9b042c3ba80b0aca0da5f1f62215140e81660d2cf721b68
+    semver: ^6.3.1
+  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.21.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.21.0
-    "@babel/helper-member-expression-to-functions": ^7.21.0
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/helper-replace-supers": ^7.20.7
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
-    "@babel/helper-split-export-declaration": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 3e781d91d1056ea9b3a0395f3017492594a8b86899119b4a1645227c31727b8bec9bc8f6b72e86b1c5cf2dd6690893d2e8c5baff4974c429e616ead089552a21
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-class-features-plugin@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.5"
+"@babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.15, @babel/helper-create-class-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.22.15"
   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.5
+    "@babel/helper-member-expression-to-functions": ^7.22.15
     "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.9
     "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.5
-    semver: ^6.3.0
+    "@babel/helper-split-export-declaration": ^7.22.6
+    semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: f1e91deae06dbee6dd956c0346bca600adfbc7955427795d9d8825f0439a3c3290c789ba2b4a02a1cdf6c1a1bd163dfa16d3d5e96b02a8efb639d2a774e88ed9
+  checksum: 52c500d8d164abb3a360b1b7c4b8fff77bc4a5920d3a2b41ae6e1d30617b0dc0b972c1f5db35b1752007e04a748908b4a99bc872b73549ae837e87dcdde005a3
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.20.5":
-  version: 7.21.4
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.21.4"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    regexpu-core: ^5.3.1
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 78334865db2cd1d64d103bd0d96dee2818b0387d10aa973c084e245e829df32652bca530803e397b7158af4c02b9b21d5a9601c29bdfbb8d54a3d4ad894e067b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.5"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
     regexpu-core: ^5.3.1
-    semver: ^6.3.0
+    semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 94932145beeb1f91856be25fea8de30b4b81b63fbc7c5a207ed97a5ddc34cd1e9b04041ed28bd24ec09cdcfbb62e8d66f820e4fe864672afe0aa2f357c784e11
-  languageName: node
-  linkType: hard
-
-"@babel/helper-define-polyfill-provider@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.17.7
-    "@babel/helper-plugin-utils": ^7.16.7
-    debug: ^4.1.1
-    lodash.debounce: ^4.0.8
-    resolve: ^1.14.2
-    semver: ^6.1.2
-  peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: 8e3fe75513302e34f6d92bd67b53890e8545e6c5bca8fe757b9979f09d68d7e259f6daea90dc9e01e332c4f8781bda31c5fe551c82a277f9bc0bec007aed497c
+  checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
   languageName: node
   linkType: hard
 
-"@babel/helper-define-polyfill-provider@npm:^0.4.0":
-  version: 0.4.0
-  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.0"
+"@babel/helper-define-polyfill-provider@npm:^0.4.3":
+  version: 0.4.3
+  resolution: "@babel/helper-define-polyfill-provider@npm:0.4.3"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.17.7
-    "@babel/helper-plugin-utils": ^7.16.7
+    "@babel/helper-compilation-targets": ^7.22.6
+    "@babel/helper-plugin-utils": ^7.22.5
     debug: ^4.1.1
     lodash.debounce: ^4.0.8
     resolve: ^1.14.2
-    semver: ^6.1.2
   peerDependencies:
-    "@babel/core": ^7.4.0-0
-  checksum: 5dca4c5e78457c5ced366bea601efa4e8c69bf5d53b0fe540283897575c49b1b88191c8ef062110de9046e886703ed3270fcda3a87f0886cdbb549204d3ff63f
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-environment-visitor@npm:7.18.9"
-  checksum: b25101f6162ddca2d12da73942c08ad203d7668e06663df685634a8fde54a98bc015f6f62938e8554457a592a024108d45b8f3e651fd6dcdb877275b73cc4420
-  languageName: node
-  linkType: hard
-
-"@babel/helper-environment-visitor@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-environment-visitor@npm:7.22.5"
-  checksum: 248532077d732a34cd0844eb7b078ff917c3a8ec81a7f133593f71a860a582f05b60f818dc5049c2212e5baa12289c27889a4b81d56ef409b4863db49646c4b1
-  languageName: node
-  linkType: hard
-
-"@babel/helper-explode-assignable-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-explode-assignable-expression@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: 225cfcc3376a8799023d15dc95000609e9d4e7547b29528c7f7111a0e05493ffb12c15d70d379a0bb32d42752f340233c4115bded6d299bc0c3ab7a12be3d30f
-  languageName: node
-  linkType: hard
-
-"@babel/helper-function-name@npm:^7.18.9, @babel/helper-function-name@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/helper-function-name@npm:7.21.0"
-  dependencies:
-    "@babel/template": ^7.20.7
-    "@babel/types": ^7.21.0
-  checksum: d63e63c3e0e3e8b3138fa47b0cd321148a300ef12b8ee951196994dcd2a492cc708aeda94c2c53759a5c9177fffaac0fd8778791286746f72a000976968daf4e
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 5d21e3f47b320e4b5b644195ec405e7ebc3739e48e65899efc808c5fa9c3bf5b06ce0d8ff5246ca99d1411e368f4557bc66730196c5781a5c4e986ee703bee79
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-function-name@npm:7.22.5"
-  dependencies:
-    "@babel/template": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a
+"@babel/helper-environment-visitor@npm:^7.22.20, @babel/helper-environment-visitor@npm:^7.22.5":
+  version: 7.22.20
+  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
+  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-hoist-variables@npm:7.18.6"
+"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-function-name@npm:7.23.0"
   dependencies:
-    "@babel/types": ^7.18.6
-  checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.23.0
+  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
   languageName: node
   linkType: hard
 
@@ -366,80 +205,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.20.7, @babel/helper-member-expression-to-functions@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.21.0"
+"@babel/helper-member-expression-to-functions@npm:^7.22.15":
+  version: 7.23.0
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
   dependencies:
-    "@babel/types": ^7.21.0
-  checksum: 49cbb865098195fe82ba22da3a8fe630cde30dcd8ebf8ad5f9a24a2b685150c6711419879cf9d99b94dad24cff9244d8c2a890d3d7ec75502cd01fe58cff5b5d
+    "@babel/types": ^7.23.0
+  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.22.5"
-  dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 4bd5791529c280c00743e8bdc669ef0d4cd1620d6e3d35e0d42b862f8262bc2364973e5968007f960780344c539a4b9cf92ab41f5b4f94560a9620f536de2a39
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-module-imports@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-imports@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-module-imports@npm:7.22.5"
+"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/helper-module-imports@npm:7.22.15"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 9ac2b0404fa38b80bdf2653fbeaf8e8a43ccb41bd505f9741d820ed95d3c4e037c62a1bcdcb6c9527d7798d2e595924c4d025daed73283badc180ada2c9c49ad
-  languageName: node
-  linkType: hard
-
-"@babel/helper-module-transforms@npm:^7.18.6, @babel/helper-module-transforms@npm:^7.20.11, @babel/helper-module-transforms@npm:^7.21.2":
-  version: 7.21.2
-  resolution: "@babel/helper-module-transforms@npm:7.21.2"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-simple-access": ^7.20.2
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/helper-validator-identifier": ^7.19.1
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.21.2
-    "@babel/types": ^7.21.2
-  checksum: 8a1c129a4f90bdf97d8b6e7861732c9580f48f877aaaafbc376ce2482febebcb8daaa1de8bc91676d12886487603f8c62a44f9e90ee76d6cac7f9225b26a49e1
+    "@babel/types": ^7.22.15
+  checksum: ecd7e457df0a46f889228f943ef9b4a47d485d82e030676767e6a2fdcbdaa63594d8124d4b55fd160b41c201025aec01fc27580352b1c87a37c9c6f33d116702
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-module-transforms@npm:7.22.5"
+"@babel/helper-module-transforms@npm:^7.22.5, @babel/helper-module-transforms@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/helper-module-transforms@npm:7.23.0"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-module-imports": ^7.22.5
+    "@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.5
-    "@babel/helper-validator-identifier": ^7.22.5
-    "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: 8985dc0d971fd17c467e8b84fe0f50f3dd8610e33b6c86e5b3ca8e8859f9448bcc5c84e08a2a14285ef388351c0484797081c8f05a03770bf44fc27bf4900e68
-  languageName: node
-  linkType: hard
-
-"@babel/helper-optimise-call-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-optimise-call-expression@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: e518fe8418571405e21644cfb39cf694f30b6c47b10b006609a92469ae8b8775cbff56f0b19732343e2ea910641091c5a2dc73b56ceba04e116a33b0f8bd2fbd
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-validator-identifier": ^7.22.20
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 6e2afffb058cf3f8ce92f5116f710dda4341c81cfcd872f9a0197ea594f7ce0ab3cb940b0590af2fe99e60d2e5448bfba6bca8156ed70a2ed4be2adc8586c891
   languageName: node
   linkType: hard
 
@@ -452,82 +247,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.20.2
-  resolution: "@babel/helper-plugin-utils@npm:7.20.2"
-  checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-plugin-utils@npm:^7.22.5":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
   checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-wrap-function": ^7.18.9
-    "@babel/types": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 4be6076192308671b046245899b703ba090dbe7ad03e0bea897bb2944ae5b88e5e85853c9d1f83f643474b54c578d8ac0800b80341a86e8538264a725fbbefec
-  languageName: node
-  linkType: hard
-
-"@babel/helper-remap-async-to-generator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.5"
+"@babel/helper-remap-async-to-generator@npm:^7.22.20, @babel/helper-remap-async-to-generator@npm:^7.22.5":
+  version: 7.22.20
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-wrap-function": ^7.22.5
-    "@babel/types": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-wrap-function": ^7.22.20
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 1e51dcff1c22e97ea3d22034b77788048eb6d8c6860325bd7a1046b7a7135730cefd93b5c96fd9839d76031095d5ffb6f0cd6ee90a5d69a4c7de980d7f4623d9
+  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/helper-replace-supers@npm:7.20.7"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-member-expression-to-functions": ^7.20.7
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.20.7
-    "@babel/types": ^7.20.7
-  checksum: b8e0087c9b0c1446e3c6f3f72b73b7e03559c6b570e2cfbe62c738676d9ebd8c369a708cf1a564ef88113b4330750a50232ee1131d303d478b7a5e65e46fbc7c
-  languageName: node
-  linkType: hard
-
-"@babel/helper-replace-supers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-replace-supers@npm:7.22.5"
+"@babel/helper-replace-supers@npm:^7.22.20, @babel/helper-replace-supers@npm:^7.22.5, @babel/helper-replace-supers@npm:^7.22.9":
+  version: 7.22.20
+  resolution: "@babel/helper-replace-supers@npm:7.22.20"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-member-expression-to-functions": ^7.22.5
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-member-expression-to-functions": ^7.22.15
     "@babel/helper-optimise-call-expression": ^7.22.5
-    "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: af29deff6c6dc3fa2d1a517390716aa3f4d329855e8689f1d5c3cb07c1b898e614a5e175f1826bb58e9ff1480e6552885a71a9a0ba5161787aaafa2c79b216cc
-  languageName: node
-  linkType: hard
-
-"@babel/helper-simple-access@npm:^7.20.2":
-  version: 7.20.2
-  resolution: "@babel/helper-simple-access@npm:7.20.2"
-  dependencies:
-    "@babel/types": ^7.20.2
-  checksum: ad1e96ee2e5f654ffee2369a586e5e8d2722bf2d8b028a121b4c33ebae47253f64d420157b9f0a8927aea3a9e0f18c0103e74fdd531815cf3650a0a4adca11a1
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: a0008332e24daedea2e9498733e3c39b389d6d4512637e000f96f62b797e702ee24a407ccbcd7a236a551590a38f31282829a8ef35c50a3c0457d88218cae639
   languageName: node
   linkType: hard
 
@@ -540,15 +289,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0":
-  version: 7.20.0
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0"
-  dependencies:
-    "@babel/types": ^7.20.0
-  checksum: 34da8c832d1c8a546e45d5c1d59755459ffe43629436707079989599b91e8c19e50e73af7a4bd09c95402d389266731b0d9c5f69e372d8ebd3a709c05c80d7dd
-  languageName: node
-  linkType: hard
-
 "@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
@@ -558,28 +298,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.18.6"
-  dependencies:
-    "@babel/types": ^7.18.6
-  checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b
-  languageName: node
-  linkType: hard
-
-"@babel/helper-split-export-declaration@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.5"
+"@babel/helper-split-export-declaration@npm:^7.22.6":
+  version: 7.22.6
+  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
   dependencies:
     "@babel/types": ^7.22.5
-  checksum: d10e05a02f49c1f7c578cea63d2ac55356501bbf58856d97ac9bfde4957faee21ae97c7f566aa309e38a256eef58b58e5b670a7f568b362c00e93dfffe072650
-  languageName: node
-  linkType: hard
-
-"@babel/helper-string-parser@npm:^7.19.4":
-  version: 7.19.4
-  resolution: "@babel/helper-string-parser@npm:7.19.4"
-  checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943
+  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
   languageName: node
   linkType: hard
 
@@ -590,343 +314,98 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1":
-  version: 7.19.1
-  resolution: "@babel/helper-validator-identifier@npm:7.19.1"
-  checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a
+"@babel/helper-validator-identifier@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
+  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-validator-identifier@npm:7.22.5"
-  checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/helper-validator-option@npm:7.21.0"
-  checksum: 8ece4c78ffa5461fd8ab6b6e57cc51afad59df08192ed5d84b475af4a7193fc1cb794b59e3e7be64f3cdc4df7ac78bf3dbb20c129d7757ae078e6279ff8c2f07
-  languageName: node
-  linkType: hard
-
-"@babel/helper-validator-option@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-validator-option@npm:7.22.5"
-  checksum: bbeca8a85ee86990215c0424997438b388b8d642d69b9f86c375a174d3cdeb270efafd1ff128bc7a1d370923d13b6e45829ba8581c027620e83e3a80c5c414b3
-  languageName: node
-  linkType: hard
-
-"@babel/helper-wrap-function@npm:^7.18.9":
-  version: 7.18.11
-  resolution: "@babel/helper-wrap-function@npm:7.18.11"
-  dependencies:
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/template": ^7.18.10
-    "@babel/traverse": ^7.18.11
-    "@babel/types": ^7.18.10
-  checksum: e2fb909cdeb5c8688513261202cdeab7c6a8ac1f30daa5a1e0111631f270c26118c2e6b27014fc9f5d2c0ee1182fc40a3db2d30e45425587067f49dcae737dc9
+"@babel/helper-validator-option@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-validator-option@npm:7.22.15"
+  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-wrap-function@npm:7.22.5"
+"@babel/helper-wrap-function@npm:^7.22.20":
+  version: 7.22.20
+  resolution: "@babel/helper-wrap-function@npm:7.22.20"
   dependencies:
     "@babel/helper-function-name": ^7.22.5
-    "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: a4ba2d7577ad3ce92fadaa341ffce3b0e4b389808099b07c80847f9be0852f4b42344612bc1b3d1b796ffb75be56d5957c5c56a1734f6aee5ccbb7cd9ab12691
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/helpers@npm:7.21.0"
-  dependencies:
-    "@babel/template": ^7.20.7
-    "@babel/traverse": ^7.21.0
-    "@babel/types": ^7.21.0
-  checksum: 9370dad2bb665c551869a08ac87c8bdafad53dbcdce1f5c5d498f51811456a3c005d9857562715151a0f00b2e912ac8d89f56574f837b5689f5f5072221cdf54
-  languageName: node
-  linkType: hard
-
-"@babel/helpers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helpers@npm:7.22.5"
-  dependencies:
-    "@babel/template": ^7.22.5
-    "@babel/traverse": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: a96e785029dff72f171190943df895ab0f76e17bf3881efd630bc5fae91215042d1c2e9ed730e8e4adf4da6f28b24bd1f54ed93b90ffbca34c197351872a084e
+    "@babel/template": ^7.22.15
+    "@babel/types": ^7.22.19
+  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/highlight@npm:7.18.6"
+"@babel/helpers@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/helpers@npm:7.23.2"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.18.6
-    chalk: ^2.0.0
-    js-tokens: ^4.0.0
-  checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/highlight@npm:7.22.5"
+"@babel/highlight@npm:^7.22.13":
+  version: 7.22.20
+  resolution: "@babel/highlight@npm:7.22.20"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.22.5
-    chalk: ^2.0.0
+    "@babel/helper-validator-identifier": ^7.22.20
+    chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: f61ae6de6ee0ea8d9b5bcf2a532faec5ab0a1dc0f7c640e5047fc61630a0edb88b18d8c92eb06566d30da7a27db841aca11820ecd3ebe9ce514c9350fbed39c4
-  languageName: node
-  linkType: hard
-
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.9.4":
-  version: 7.21.4
-  resolution: "@babel/parser@npm:7.21.4"
-  bin:
-    parser: ./bin/babel-parser.js
-  checksum: de610ecd1bff331766d0c058023ca11a4f242bfafefc42caf926becccfb6756637d167c001987ca830dd4b34b93c629a4cef63f8c8c864a8564cdfde1989ac77
+  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/parser@npm:7.22.5"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.9.4":
+  version: 7.23.0
+  resolution: "@babel/parser@npm:7.23.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 470ebba516417ce8683b36e2eddd56dcfecb32c54b9bb507e28eb76b30d1c3e618fd0cfeee1f64d8357c2254514e1a19e32885cfb4e73149f4ae875436a6d59c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 845bd280c55a6a91d232cfa54eaf9708ec71e594676fe705794f494bb8b711d833b752b59d1a5c154695225880c23dbc9cab0e53af16fd57807976cd3ff41b8d
+  checksum: 453fdf8b9e2c2b7d7b02139e0ce003d1af21947bbc03eb350fb248ee335c9b85e4ab41697ddbdd97079698de825a265e45a0846bb2ed47a2c7c1df833f42a354
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.5"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.22.15"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 1e353a060fb2cd8f1256d28cd768f16fb02513f905b9b6d656fb0242c96c341a196fa188b27c2701506a6e27515359fbcc1a5ca7fa8b9b530cf88fbd137baefc
+  checksum: 8910ca21a7ec7c06f7b247d4b86c97c5aa15ef321518f44f6f490c5912fdf82c605aaa02b90892e375d82ccbedeadfdeadd922c1b836c9dd4c596871bf654753
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
-    "@babel/plugin-proposal-optional-chaining": ^7.20.7
-  peerDependencies:
-    "@babel/core": ^7.13.0
-  checksum: d610f532210bee5342f5b44a12395ccc6d904e675a297189bc1e401cc185beec09873da523466d7fec34ae1574f7a384235cba1ccc9fe7b89ba094167897c845
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.5"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.22.15"
   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.22.15
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 16e7a5f3bf2f2ac0ca032a70bf0ebd7e886d84dbb712b55c0643c04c495f0f221fbcbca14b5f8f8027fa6c87a3dafae0934022ad2b409384af6c5c356495b7bd
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-async-generator-functions@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.7"
-  dependencies:
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-remap-async-to-generator": ^7.18.9
-    "@babel/plugin-syntax-async-generators": ^7.8.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 111109ee118c9e69982f08d5e119eab04190b36a0f40e22e873802d941956eee66d2aa5a15f5321e51e3f9aa70a91136451b987fe15185ef8cc547ac88937723
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-class-properties@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 49a78a2773ec0db56e915d9797e44fd079ab8a9b2e1716e0df07c92532f2c65d76aeda9543883916b8e0ff13606afeffa67c5b93d05b607bc87653ad18a91422
+  checksum: fbefedc0da014c37f1a50a8094ce7dbbf2181ae93243f23d6ecba2499b5b20196c2124d6a4dfe3e9e0125798e80593103e456352a4beb4e5c6f7c75efb80fdac
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-class-static-block@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-proposal-class-static-block@npm:7.21.0"
+"@babel/plugin-proposal-decorators@npm:7.23.2":
+  version: 7.23.2
+  resolution: "@babel/plugin-proposal-decorators@npm:7.23.2"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.21.0
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/plugin-syntax-class-static-block": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.12.0
-  checksum: 236c0ad089e7a7acab776cc1d355330193314bfcd62e94e78f2df35817c6144d7e0e0368976778afd6b7c13e70b5068fa84d7abbf967d4f182e60d03f9ef802b
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-decorators@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-proposal-decorators@npm:7.22.5"
-  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/helper-replace-supers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.5
-    "@babel/plugin-syntax-decorators": ^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
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b3807b92b6ffcaba7519a9b2bb59e4b5530873234cd170ff5727414939334fbcae17bbe523df846a103e2fc8ed2d2890d0d9408f073cfc1e90c28ab565c358e5
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-dynamic-import@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-dynamic-import@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-dynamic-import": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 96b1c8a8ad8171d39e9ab106be33bde37ae09b22fb2c449afee9a5edf3c537933d79d963dcdc2694d10677cb96da739cdf1b53454e6a5deab9801f28a818bb2f
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-export-namespace-from@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-proposal-export-namespace-from@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-    "@babel/plugin-syntax-export-namespace-from": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 84ff22bacc5d30918a849bfb7e0e90ae4c5b8d8b65f2ac881803d1cf9068dffbe53bd657b0e4bc4c20b4db301b1c85f1e74183cf29a0dd31e964bd4e97c363ef
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-json-strings@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-json-strings@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 25ba0e6b9d6115174f51f7c6787e96214c90dd4026e266976b248a2ed417fe50fddae72843ffb3cbe324014a18632ce5648dfac77f089da858022b49fd608cb3
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-logical-assignment-operators@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-logical-assignment-operators@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cdd7b8136cc4db3f47714d5266f9e7b592a2ac5a94a5878787ce08890e97c8ab1ca8e94b27bfeba7b0f2b1549a026d9fc414ca2196de603df36fb32633bbdc19
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 949c9ddcdecdaec766ee610ef98f965f928ccc0361dd87cf9f88cf4896a6ccd62fce063d4494778e50da99dea63d270a1be574a62d6ab81cbe9d85884bf55a7d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-numeric-separator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-numeric-separator@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f370ea584c55bf4040e1f78c80b4eeb1ce2e6aaa74f87d1a48266493c33931d0b6222d8cee3a082383d6bb648ab8d6b7147a06f974d3296ef3bc39c7851683ec
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-object-rest-spread@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-proposal-object-rest-spread@npm:7.20.7"
-  dependencies:
-    "@babel/compat-data": ^7.20.5
-    "@babel/helper-compilation-targets": ^7.20.7
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.20.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1329db17009964bc644484c660eab717cb3ca63ac0ab0f67c651a028d1bc2ead51dc4064caea283e46994f1b7221670a35cbc0b4beb6273f55e915494b5aa0b2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-catch-binding@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-optional-catch-binding@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7b5b39fb5d8d6d14faad6cb68ece5eeb2fd550fb66b5af7d7582402f974f5bc3684641f7c192a5a57e0f59acfae4aada6786be1eba030881ddc590666eff4d1e
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-optional-chaining@npm:^7.20.7, @babel/plugin-proposal-optional-chaining@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 11c5449e01b18bb8881e8e005a577fa7be2fe5688e2382c8822d51f8f7005342a301a46af7b273b1f5645f9a7b894c428eee8526342038a275ef6ba4c8d8d746
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-private-methods@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-private-methods@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 22d8502ee96bca99ad2c8393e8493e2b8d4507576dd054490fd8201a36824373440106f5b098b6d821b026c7e72b0424ff4aeca69ed5f42e48f029d3a156d5ad
+  checksum: a8f63451c4678ce34268a0493aa4bc702d0ee164b39b53c12d33619ff3b47518c4369163ef49602cde7f0674db6e6e8584ee3d6a414ea0bbc3dc16c0304ef413
   languageName: node
   linkType: hard
 
@@ -939,32 +418,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-proposal-private-property-in-object@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-proposal-private-property-in-object@npm:7.21.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-create-class-features-plugin": ^7.21.0
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: add881a6a836635c41d2710551fdf777e2c07c0b691bf2baacc5d658dd64107479df1038680d6e67c468bfc6f36fb8920025d6bac2a1df0a81b867537d40ae78
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-proposal-unicode-property-regex@npm:^7.18.6, @babel/plugin-proposal-unicode-property-regex@npm:^7.4.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-proposal-unicode-property-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: a8575ecb7ff24bf6c6e94808d5c84bb5a0c6dd7892b54f09f4646711ba0ee1e1668032b3c43e3e1dfec2c5716c302e851ac756c1645e15882d73df6ad21ae951
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-async-generators@npm:^7.8.4":
   version: 7.8.4
   resolution: "@babel/plugin-syntax-async-generators@npm:7.8.4"
@@ -1009,14 +462,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-decorators@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-syntax-decorators@npm:7.22.5"
+"@babel/plugin-syntax-decorators@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-syntax-decorators@npm:7.22.10"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 643c75a3b603320c499a0542ca97b5cced81e99de02ae9cbfca1a1ec6d938467546a65023b13df742e1b2f94ffe352ddfe908d14b9303fae7514ed9325886a97
+  checksum: baaa10fa52d76ee8b9447f7aedb1c8df7cf2ef83ae29c085c07444e691685aa8b1a326dfb7a3a0e3ae4d5f9fd083175e46ea5e2316d8200f0278f3fd54a58696
   languageName: node
   linkType: hard
 
@@ -1042,17 +495,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.20.0":
-  version: 7.20.0
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.20.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.19.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6a86220e0aae40164cd3ffaf80e7c076a1be02a8f3480455dddbae05fda8140f429290027604df7a11b3f3f124866e8a6d69dbfa1dda61ee7377b920ad144d5b
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-import-assertions@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-syntax-import-assertions@npm:7.22.5"
@@ -1097,25 +539,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.22.5":
+"@babel/plugin-syntax-jsx@npm:^7.22.5, @babel/plugin-syntax-jsx@npm:^7.7.2":
   version: 7.22.5
-  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-syntax-jsx@npm:^7.7.2":
-  version: 7.21.4
-  resolution: "@babel/plugin-syntax-jsx@npm:7.21.4"
+  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
+    "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bb7309402a1d4e155f32aa0cf216e1fa8324d6c4cfd248b03280028a015a10e46b6efd6565f515f8913918a3602b39255999c06046f7d4b8a5106be2165d724a
+  checksum: 8829d30c2617ab31393d99cec2978e41f014f4ac6f01a1cecf4c4dd8320c3ec12fdc3ce121126b2d8d32f6887e99ca1a0bad53dedb1e6ad165640b92b24980ce
   languageName: node
   linkType: hard
 
@@ -1207,7 +638,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.22.5":
+"@babel/plugin-syntax-typescript@npm:^7.22.5, @babel/plugin-syntax-typescript@npm:^7.7.2":
   version: 7.22.5
   resolution: "@babel/plugin-syntax-typescript@npm:7.22.5"
   dependencies:
@@ -1218,17 +649,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.7.2":
-  version: 7.20.0
-  resolution: "@babel/plugin-syntax-typescript@npm:7.20.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.19.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6189c0b5c32ba3c9a80a42338bd50719d783b20ef29b853d4f03929e971913d3cefd80184e924ae98ad6db09080be8fe6f1ffde9a6db8972523234f0274d36f7
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-syntax-unicode-sets-regex@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-syntax-unicode-sets-regex@npm:7.18.6"
@@ -1241,17 +661,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b43cabe3790c2de7710abe32df9a30005eddb2050dadd5d122c6872f679e5710e410f1b90c8f99a2aff7b614cccfecf30e7fd310236686f60d3ed43fd80b9847
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-arrow-functions@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-arrow-functions@npm:7.22.5"
@@ -1263,30 +672,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.5"
+"@babel/plugin-transform-async-generator-functions@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.2"
   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.5
+    "@babel/helper-remap-async-to-generator": ^7.22.20
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 32890b69ec5627eb46ee8e084bddc6b98d85b66cae5e015f3a23924611a759789d2ff836406605f5293b5c2bad306b20cb1f5b7a46ed549b07bfec634bcd31f9
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-async-to-generator@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.20.7"
-  dependencies:
-    "@babel/helper-module-imports": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-remap-async-to-generator": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: fe9ee8a5471b4317c1b9ea92410ace8126b52a600d7cfbfe1920dcac6fb0fad647d2e08beb4fd03c630eb54430e6c72db11e283e3eddc49615c68abd39430904
+  checksum: e1abae0edcda7304d7c17702ac25a127578791b89c4f767d60589249fa3e50ec33f8c9ff39d3d8d41f00b29947654eaddd4fd586e04c4d598122db745fab2868
   languageName: node
   linkType: hard
 
@@ -1303,17 +699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 0a0df61f94601e3666bf39f2cc26f5f7b22a94450fb93081edbed967bd752ce3f81d1227fefd3799f5ee2722171b5e28db61379234d1bb85b6ec689589f99d7e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-block-scoped-functions@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.22.5"
@@ -1325,25 +710,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.21.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 15aacaadbecf96b53a750db1be4990b0d89c7f5bc3e1794b63b49fb219638c1fd25d452d15566d7e5ddf5b5f4e1a0a0055c35c1c7aee323c7b114bf49f66f4b0
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-block-scoping@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.22.5"
+"@babel/plugin-transform-block-scoping@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.23.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 26987002cfe6e24544e60fa35f07052b6557f590c1a1cc5cf35d6dc341d7fea163c1222a2d70d5d2692f0b9860d942fd3ba979848b2995d4debffa387b9b19ae
+  checksum: 0cfe925cc3b5a3ad407e2253fab3ceeaa117a4b291c9cb245578880872999bca91bd83ffa0128ae9ca356330702e1ef1dcb26804f28d2cef678239caf629f73e
   languageName: node
   linkType: hard
 
@@ -1359,66 +733,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.5"
+"@babel/plugin-transform-class-static-block@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.11
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-class-static-block": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: bc48b92dbaf625a14f2bf62382384eef01e0515802426841636ae9146e27395d068c7a8a45e9e15699491b0a01d990f38f179cbc9dc89274a393f85648772f12
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-classes@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-transform-classes@npm:7.21.0"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.18.6
-    "@babel/helper-compilation-targets": ^7.20.7
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.21.0
-    "@babel/helper-optimise-call-expression": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-replace-supers": ^7.20.7
-    "@babel/helper-split-export-declaration": ^7.18.6
-    globals: ^11.1.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 088ae152074bd0e90f64659169255bfe50393e637ec8765cb2a518848b11b0299e66b91003728fd0a41563a6fdc6b8d548ece698a314fd5447f5489c22e466b7
+  checksum: 69f040506fad66f1c6918d288d0e0edbc5c8a07c8b4462c1184ad2f9f08995d68b057126c213871c0853ae0c72afc60ec87492049dfacb20902e32346a448bcb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-classes@npm:7.22.5"
+"@babel/plugin-transform-classes@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-classes@npm:7.22.15"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/helper-compilation-targets": ^7.22.15
     "@babel/helper-environment-visitor": ^7.22.5
     "@babel/helper-function-name": ^7.22.5
     "@babel/helper-optimise-call-expression": ^7.22.5
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-replace-supers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.5
+    "@babel/helper-replace-supers": ^7.22.9
+    "@babel/helper-split-export-declaration": ^7.22.6
     globals: ^11.1.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 124b1b79180524cc9d08155cecde92c7f2ab0db02cbe0f8befa187ef3c7320909ce1a6d6daf5ce73e8330f9b40cf9991f424c6e572b8dddc1f14e2758fa80d20
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-computed-properties@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/template": ^7.20.7
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: be70e54bda8b469146459f429e5f2bd415023b87b2d5af8b10e48f465ffb02847a3ed162ca60378c004b82db848e4d62e90010d41ded7e7176b6d8d1c2911139
+  checksum: d3f4d0c107dd8a3557ea3575cc777fab27efa92958b41e4a9822f7499725c1f554beae58855de16ddec0a7b694e45f59a26cea8fbde4275563f72f09c6e039a0
   languageName: node
   linkType: hard
 
@@ -1434,37 +777,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.21.3":
-  version: 7.21.3
-  resolution: "@babel/plugin-transform-destructuring@npm:7.21.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 43ebbe0bfa20287e34427be7c2200ce096c20913775ea75268fb47fe0e55f9510800587e6052c42fe6dffa0daaad95dd465c3e312fd1ef9785648384c45417ac
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-destructuring@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-destructuring@npm:7.22.5"
+"@babel/plugin-transform-destructuring@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-destructuring@npm:7.23.0"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 76f6ea2aee1fcfa1c3791eb7a5b89703c6472650b993e8666fff0f1d6e9d737a84134edf89f63c92297f3e75064c1263219463b02dd9bc7434b6e5b9935e3f20
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-dotall-regex@npm:^7.18.6, @babel/plugin-transform-dotall-regex@npm:^7.4.4":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: cbe5d7063eb8f8cca24cd4827bc97f5641166509e58781a5f8aa47fb3d2d786ce4506a30fca2e01f61f18792783a5cb5d96bf5434c3dd1ad0de8c9cc625a53da
+  checksum: cd6dd454ccc2766be551e4f8a04b1acc2aa539fa19e5c7501c56cc2f8cc921dd41a7ffb78455b4c4b2f954fcab8ca4561ba7c9c7bd5af9f19465243603d18cc3
   languageName: node
   linkType: hard
 
@@ -1480,17 +800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 220bf4a9fec5c4d4a7b1de38810350260e8ea08481bf78332a464a21256a95f0df8cd56025f346238f09b04f8e86d4158fafc9f4af57abaef31637e3b58bd4fe
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-duplicate-keys@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-duplicate-keys@npm:7.22.5"
@@ -1502,27 +811,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.5"
+"@babel/plugin-transform-dynamic-import@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 186a6d59f36eb3c5824739fc9c22ed0f4ca68e001662aa3a302634346a8b785cb9579b23b0c158f4570604d697d19598ca09b58c60a7fa2894da1163c4eb1907
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-exponentiation-operator@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.18.6"
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7f70222f6829c82a36005508d34ddbe6fd0974ae190683a8670dd6ff08669aaf51fef2209d7403f9bd543cb2d12b18458016c99a6ed0332ccedb3ea127b01229
+  checksum: 78fc9c532210bf9e8f231747f542318568ac360ee6c27e80853962c984283c73da3f8f8aebe83c2096090a435b356b092ed85de617a156cbe0729d847632be45
   languageName: node
   linkType: hard
 
@@ -1538,50 +835,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.5"
+"@babel/plugin-transform-export-namespace-from@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3d197b788758044983c96b9c49bed4b456055f35a388521a405968db0f6e2ffb6fd59110e3931f4dcc5e126ae9e5e00e154a0afb47a7ea359d8d0dea79f480d7
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-for-of@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-transform-for-of@npm:7.21.0"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 2f3f86ca1fab2929fcda6a87e4303d5c635b5f96dc9a45fd4ca083308a3020c79ac33b9543eb4640ef2b79f3586a00ab2d002a7081adb9e9d7440dce30781034
+  checksum: 73af5883a321ed56a4bfd43c8a7de0164faebe619287706896fc6ee2f7a4e69042adaa1338c0b8b4bdb9f7e5fdceb016fb1d40694cb43ca3b8827429e8aac4bf
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-for-of@npm:7.22.5"
+"@babel/plugin-transform-for-of@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-for-of@npm:7.22.15"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d7b8d4db010bce7273674caa95c4e6abd909362866ce297e86a2ecaa9ae636e05d525415811db9b3c942155df7f3651d19b91dd6c41f142f7308a97c7cb06023
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-function-name@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-function-name@npm:7.18.9"
-  dependencies:
-    "@babel/helper-compilation-targets": ^7.18.9
-    "@babel/helper-function-name": ^7.18.9
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 62dd9c6cdc9714704efe15545e782ee52d74dc73916bf954b4d3bee088fb0ec9e3c8f52e751252433656c09f744b27b757fc06ed99bcde28e8a21600a1d8e597
+  checksum: f395ae7bce31e14961460f56cf751b5d6e37dd27d7df5b1f4e49fec1c11b6f9cf71991c7ffbe6549878591e87df0d66af798cf26edfa4bfa6b4c3dba1fb2f73a
   languageName: node
   linkType: hard
 
@@ -1598,26 +871,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-json-strings@npm:7.22.5"
+"@babel/plugin-transform-json-strings@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-json-strings@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4e00b902487a670b6c8948f33f9108133fd745cf9d1478aca515fb460b9b2f12e137988ebc1663630fb82070a870aed8b0c1aa4d007a841c18004619798f255c
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-literals@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-literals@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3458dd2f1a47ac51d9d607aa18f3d321cbfa8560a985199185bed5a906bb0c61ba85575d386460bac9aed43fdd98940041fae5a67dff286f6f967707cff489f8
+  checksum: 50665e5979e66358c50e90a26db53c55917f78175127ac2fa05c7888d156d418ffb930ec0a109353db0a7c5f57c756ce01bfc9825d24cbfd2b3ec453f2ed8cba
   languageName: node
   linkType: hard
 
@@ -1632,26 +894,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.5"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 18748e953c08f64885f18c224eac58df10a13eac4d845d16b5d9b6276907da7ca2530dfebe6ed41cdc5f8a75d9db3e36d8eb54ddce7cd0364af1cab09b435302
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-member-expression-literals@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 35a3d04f6693bc6b298c05453d85ee6e41cc806538acb6928427e0e97ae06059f97d2f07d21495fcf5f70d3c13a242e2ecbd09d5c1fcb1b1a73ff528dcb0b695
+  checksum: c664e9798e85afa7f92f07b867682dee7392046181d82f5d21bae6f2ca26dfe9c8375cdc52b7483c3fc09a983c1989f60eff9fbc4f373b0c0a74090553d05739
   languageName: node
   linkType: hard
 
@@ -1666,93 +917,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.20.11":
-  version: 7.20.11
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.20.11"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.20.11
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 23665c1c20c8f11c89382b588fb9651c0756d130737a7625baeaadbd3b973bc5bfba1303bedffa8fb99db1e6d848afb01016e1df2b69b18303e946890c790001
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-amd@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.22.5"
+"@babel/plugin-transform-modules-amd@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.23.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.0
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7da4c4ebbbcf7d182abb59b2046b22d86eee340caf8a22a39ef6a727da2d8acfec1f714fcdcd5054110b280e4934f735e80a6848d192b6834c5d4459a014f04d
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-commonjs@npm:^7.21.2":
-  version: 7.21.2
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.21.2"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.21.2
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-simple-access": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 65aa06e3e3792f39b99eb5f807034693ff0ecf80438580f7ae504f4c4448ef04147b1889ea5e6f60f3ad4a12ebbb57c6f1f979a249dadbd8d11fe22f4441918b
+  checksum: 5d92875170a37b8282d4bcd805f55829b8fab0f9c8d08b53d32a7a0bfdc62b868e489b52d329ae768ecafc0c993eed0ad7a387baa673ac33211390a9f833ab5d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.5"
+"@babel/plugin-transform-modules-commonjs@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.0"
   dependencies:
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.0
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/helper-simple-access": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2067aca8f6454d54ffcce69b02c457cfa61428e11372f6a1d99ff4fcfbb55c396ed2ca6ca886bf06c852e38c1a205b8095921b2364fd0243f3e66bc1dda61caa
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-systemjs@npm:^7.20.11":
-  version: 7.20.11
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.20.11"
-  dependencies:
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-module-transforms": ^7.20.11
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-validator-identifier": ^7.19.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 4546c47587f88156d66c7eb7808e903cf4bb3f6ba6ac9bc8e3af2e29e92eb9f0b3f44d52043bfd24eb25fa7827fd7b6c8bfeac0cac7584e019b87e1ecbd0e673
+  checksum: 7fb25997194053e167c4207c319ff05362392da841bd9f42ddb3caf9c8798a5d203bd926d23ddf5830fdf05eddc82c2810f40d1287e3a4f80b07eff13d1024b5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.22.5"
+"@babel/plugin-transform-modules-systemjs@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.23.0"
   dependencies:
     "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.22.5
+    "@babel/helper-module-transforms": ^7.23.0
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 04f4178589543396b3c24330a67a59c5e69af5e96119c9adda730c0f20122deaff54671ebbc72ad2df6495a5db8a758bd96942de95fba7ad427de9c80b1b38c8
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-modules-umd@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.18.6"
-  dependencies:
-    "@babel/helper-module-transforms": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
+    "@babel/helper-validator-identifier": ^7.22.20
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c3b6796c6f4579f1ba5ab0cdcc73910c1e9c8e1e773c507c8bb4da33072b3ae5df73c6d68f9126dab6e99c24ea8571e1563f8710d7c421fac1cde1e434c20153
+  checksum: 2d481458b22605046badea2317d5cc5c94ac3031c2293e34c96f02063f5b02af0979c4da6a8fbc67cc249541575dc9c6d710db6b919ede70b7337a22d9fd57a7
   languageName: node
   linkType: hard
 
@@ -1768,18 +968,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.20.5":
-  version: 7.20.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.20.5"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.20.5
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0
-  checksum: 528c95fb1087e212f17e1c6456df041b28a83c772b9c93d2e407c9d03b72182b0d9d126770c1d6e0b23aab052599ceaf25ed6a2c0627f4249be34a83f6fae853
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
@@ -1792,17 +980,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-new-target@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: bd780e14f46af55d0ae8503b3cb81ca86dcc73ed782f177e74f498fff934754f9e9911df1f8f3bd123777eed7c1c1af4d66abab87c8daae5403e7719a6b845d1
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-new-target@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-new-target@npm:7.22.5"
@@ -1814,54 +991,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.5"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e6a059169d257fc61322d0708edae423072449b7c33de396261e68dee582aec5396789a1c22bce84e5bd88a169623c2e750b513fc222930979e6accd52a44bf2
+  checksum: 167babecc8b8fe70796a7b7d34af667ebbf43da166c21689502e5e8cc93180b7a85979c77c9f64b7cce431b36718bd0a6df9e5e0ffea4ae22afb22cfef886372
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.5"
+"@babel/plugin-transform-numeric-separator@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9e7837d4eae04f211ebaa034fe5003d2927b6bf6d5b9dc09f2b1183c01482cdde5a75b8bd5c7ff195c2abc7b923339eb0b2a9d27cb78359d38248a3b2c2367c4
+  checksum: af064d06a4a041767ec396a5f258103f64785df290e038bba9f0ef454e6c914f2ac45d862bbdad8fac2c7ad47fa4e95356f29053c60c100a0160b02a995fe2a3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.5"
+"@babel/plugin-transform-object-rest-spread@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15"
   dependencies:
-    "@babel/compat-data": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/compat-data": ^7.22.9
+    "@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
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3b5e091f0dc67108f2e41ed5a97e15bbe4381a19d9a7eea80b71c7de1d8169fd28784e1e41a3d2ad12709ab212e58fc481282a5bb65d591fae7b443048de3330
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-object-super@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-object-super@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-    "@babel/helper-replace-supers": ^7.18.6
+    "@babel/plugin-transform-parameters": ^7.22.15
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0fcb04e15deea96ae047c21cb403607d49f06b23b4589055993365ebd7a7d7541334f06bf9642e90075e66efce6ebaf1eb0ef066fbbab802d21d714f1aac3aef
+  checksum: 62197a6f12289c1c1bd57f3bed9f0f765ca32390bfe91e0b5561dd94dd9770f4480c4162dec98da094bc0ba99d2c2ebba68de47c019454041b0b7a68ba2ec66d
   languageName: node
   linkType: hard
 
@@ -1877,50 +1042,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.5"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b0e8b4233ff06b5c9d285257f49c5bd441f883189b24282e6200f9ebdf5db29aeeebbffae57fbbcd5df9f4387b3e66e5d322aaae5652a78e89685ddbae46bbd1
+  checksum: f17abd90e1de67c84d63afea29c8021c74abb2794d3a6eeafb0bbe7372d3db32aefca386e392116ec63884537a4a2815d090d26264d259bacc08f6e3ed05294c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.5"
+"@babel/plugin-transform-optional-chaining@npm:^7.22.15, @babel/plugin-transform-optional-chaining@npm:^7.23.0":
+  version: 7.23.0
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.0"
   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
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 57b9c05fb22ae881b8a334b184fc6ee966661ed5d1eb4eed8c2fb9a12e68150d90b229efcb1aa777e246999830844fee06d7365f8bb4bb262fdcd23876ff3ea2
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-parameters@npm:^7.20.7, @babel/plugin-transform-parameters@npm:^7.21.3":
-  version: 7.21.3
-  resolution: "@babel/plugin-transform-parameters@npm:7.21.3"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c92128d7b1fcf54e2cab186c196bbbf55a9a6de11a83328dc2602649c9dc6d16ef73712beecd776cd49bfdc624b5f56740f4a53568d3deb9505ec666bc869da3
+  checksum: f702634f2b97e5260dbec0d4bde05ccb6f4d96d7bfa946481aeacfa205ca846cb6e096a38312f9d51fdbdac1f258f211138c5f7075952e46a5bf8574de6a1329
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-parameters@npm:7.22.5"
+"@babel/plugin-transform-parameters@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-parameters@npm:7.22.15"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b44f89cf97daf23903776ba27c2ab13b439d80d8c8a95be5c476ab65023b1e0c0e94c28d3745f3b60a58edc4e590fa0cd4287a0293e51401ca7d29a2ddb13b8e
+  checksum: 541188bb7d1876cad87687b5c7daf90f63d8208ae83df24acb1e2b05020ad1c78786b2723ca4054a83fcb74fb6509f30c4cacc5b538ee684224261ad5fb047c1
   languageName: node
   linkType: hard
 
@@ -1936,28 +1090,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.5"
+"@babel/plugin-transform-private-property-in-object@npm:^7.22.11":
+  version: 7.22.11
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.11"
   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.11
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 9ac019fb2772f3af6278a7f4b8b14b0663accb3fd123d87142ceb2fbc57fd1afa07c945d1329029b026b9ee122096ef71a3f34f257a9e04cf4245b87298c38b4
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-property-literals@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-property-literals@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 1c16e64de554703f4b547541de2edda6c01346dd3031d4d29e881aa7733785cd26d53611a4ccf5353f4d3e69097bb0111c0a93ace9e683edd94fea28c4484144
+  checksum: 4d029d84901e53c46dead7a46e2990a7bc62470f4e4ca58a0d063394f86652fd58fe4eea1eb941da3669cd536b559b9d058b342b59300026346b7a2a51badac8
   languageName: node
   linkType: hard
 
@@ -1994,18 +1137,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.5"
+"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15"
   dependencies:
     "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-module-imports": ^7.22.5
+    "@babel/helper-module-imports": ^7.22.15
     "@babel/helper-plugin-utils": ^7.22.5
     "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/types": ^7.22.5
+    "@babel/types": ^7.22.15
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: c8f93f29f32cf79683ca2b8958fd62f38155674846ef27a7d4b6fbeb8713c37257418391731b58ff8024ec37b888bed5960e615a3f552e28245d2082e7f2a2df
+  checksum: 3899054e89550c3a0ef041af7c47ee266e2e934f498ee80fefeda778a6aa177b48aa8b4d2a8bf5848de977fec564571699ab952d9fa089c4c19b45ddb121df09
   languageName: node
   linkType: hard
 
@@ -2021,38 +1164,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.20.5":
-  version: 7.20.5
-  resolution: "@babel/plugin-transform-regenerator@npm:7.20.5"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    regenerator-transform: ^0.15.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 13164861e71fb23d84c6270ef5330b03c54d5d661c2c7468f28e21c4f8598558ca0c8c3cb1d996219352946e849d270a61372bc93c8fbe9676e78e3ffd0dea07
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-regenerator@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-regenerator@npm:7.22.5"
+"@babel/plugin-transform-regenerator@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-regenerator@npm:7.22.10"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
-    regenerator-transform: ^0.15.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: f7c5ca5151321963df777cc02725d10d1ccc3b3b8323da0423aecd9ac6144cbdd2274af5281a5580db2fc2f8b234e318517b5d76b85669118906533a559f2b6a
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-reserved-words@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
+    regenerator-transform: ^0.15.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0738cdc30abdae07c8ec4b233b30c31f68b3ff0eaa40eddb45ae607c066127f5fa99ddad3c0177d8e2832e3a7d3ad115775c62b431ebd6189c40a951b867a80c
+  checksum: e13678d62d6fa96f11cb8b863f00e8693491e7adc88bfca3f2820f80cbac8336e7dec3a596eee6a1c4663b7ececc3564f2cd7fb44ed6d4ce84ac2bb7f39ecc6e
   languageName: node
   linkType: hard
 
@@ -2067,17 +1187,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: b8e4e8acc2700d1e0d7d5dbfd4fdfb935651913de6be36e6afb7e739d8f9ca539a5150075a0f9b79c88be25ddf45abb912fe7abf525f0b80f5b9d9860de685d7
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-shorthand-properties@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-shorthand-properties@npm:7.22.5"
@@ -2089,18 +1198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.20.7":
-  version: 7.20.7
-  resolution: "@babel/plugin-transform-spread@npm:7.20.7"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8ea698a12da15718aac7489d4cde10beb8a3eea1f66167d11ab1e625033641e8b328157fd1a0b55dd6531933a160c01fc2e2e61132a385cece05f26429fd0cc2
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-spread@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-spread@npm:7.22.5"
@@ -2113,17 +1210,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 68ea18884ae9723443ffa975eb736c8c0d751265859cd3955691253f7fee37d7a0f7efea96c8a062876af49a257a18ea0ed5fea0d95a7b3611ce40f7ee23aee3
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-sticky-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-sticky-regex@npm:7.22.5"
@@ -2135,17 +1221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-template-literals@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 3d2fcd79b7c345917f69b92a85bdc3ddd68ce2c87dc70c7d61a8373546ccd1f5cb8adc8540b49dfba08e1b82bb7b3bbe23a19efdb2b9c994db2db42906ca9fb2
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-template-literals@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-template-literals@npm:7.22.5"
@@ -2157,17 +1232,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.18.9":
-  version: 7.18.9
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.18.9"
-  dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: e754e0d8b8a028c52e10c148088606e3f7a9942c57bd648fc0438e5b4868db73c386a5ed47ab6d6f0594aae29ee5ffc2ffc0f7ebee7fae560a066d6dea811cd4
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-typeof-symbol@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-typeof-symbol@npm:7.22.5"
@@ -2175,43 +1239,32 @@ __metadata:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
-  languageName: node
-  linkType: hard
-
-"@babel/plugin-transform-typescript@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-typescript@npm:7.22.5"
-  dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/plugin-syntax-typescript": ^7.22.5
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d12f1ca1ef1f2a54432eb044d2999705d1205ebe211c2a7f05b12e8eb2d2a461fd7657b5486b2f2f1efe7c0c0dc8e80725b767073d40fe4ae059a7af057b05e4
+  checksum: 82a53a63ffc3010b689ca9a54e5f53b2718b9f4b4a9818f36f9b7dba234f38a01876680553d2716a645a61920b5e6e4aaf8d4a0064add379b27ca0b403049512
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.18.10":
-  version: 7.18.10
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.18.10"
+"@babel/plugin-transform-typescript@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/plugin-transform-typescript@npm:7.22.15"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.18.9
+    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-create-class-features-plugin": ^7.22.15
+    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/plugin-syntax-typescript": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f5baca55cb3c11bc08ec589f5f522d85c1ab509b4d11492437e45027d64ae0b22f0907bd1381e8d7f2a436384bb1f9ad89d19277314242c5c2671a0f91d0f9cd
+  checksum: c5d96cdbf0e1512707aa1c1e3ac6b370a25fd9c545d26008ce44eb13a47bd7fd67a1eb799c98b5ccc82e33a345fda55c0055e1fe3ed97646ed405dd13020b226
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.5"
+"@babel/plugin-transform-unicode-escapes@npm:^7.22.10":
+  version: 7.22.10
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.22.10"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: da5e85ab3bb33a75cbf6181bfd236b208dc934702fd304db127232f17b4e0f42c6d3f238de8589470b4190906967eea8ca27adf3ae9d8ee4de2a2eae906ed186
+  checksum: 807f40ed1324c8cb107c45358f1903384ca3f0ef1d01c5a3c5c9b271c8d8eec66936a3dcc8d75ddfceea9421420368c2e77ae3adef0a50557e778dfe296bf382
   languageName: node
   linkType: hard
 
@@ -2227,18 +1280,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.18.6":
-  version: 7.18.6
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.18.6"
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.18.6
-    "@babel/helper-plugin-utils": ^7.18.6
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: d9e18d57536a2d317fb0b7c04f8f55347f3cfacb75e636b4c6fa2080ab13a3542771b5120e726b598b815891fc606d1472ac02b749c69fd527b03847f22dc25e
-  languageName: node
-  linkType: hard
-
 "@babel/plugin-transform-unicode-regex@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/plugin-transform-unicode-regex@npm:7.22.5"
@@ -2263,16 +1304,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/preset-env@npm:7.22.5"
+"@babel/preset-env@npm:7.23.2, @babel/preset-env@npm:^7.11.0":
+  version: 7.23.2
+  resolution: "@babel/preset-env@npm:7.23.2"
   dependencies:
-    "@babel/compat-data": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.22.5
+    "@babel/compat-data": ^7.23.2
+    "@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.22.15
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.22.15
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.22.15
     "@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
@@ -2293,194 +1334,107 @@ __metadata:
     "@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.5
+    "@babel/plugin-transform-async-generator-functions": ^7.23.2
     "@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.5
+    "@babel/plugin-transform-block-scoping": ^7.23.0
     "@babel/plugin-transform-class-properties": ^7.22.5
-    "@babel/plugin-transform-class-static-block": ^7.22.5
-    "@babel/plugin-transform-classes": ^7.22.5
+    "@babel/plugin-transform-class-static-block": ^7.22.11
+    "@babel/plugin-transform-classes": ^7.22.15
     "@babel/plugin-transform-computed-properties": ^7.22.5
-    "@babel/plugin-transform-destructuring": ^7.22.5
+    "@babel/plugin-transform-destructuring": ^7.23.0
     "@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-dynamic-import": ^7.22.11
     "@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-export-namespace-from": ^7.22.11
+    "@babel/plugin-transform-for-of": ^7.22.15
     "@babel/plugin-transform-function-name": ^7.22.5
-    "@babel/plugin-transform-json-strings": ^7.22.5
+    "@babel/plugin-transform-json-strings": ^7.22.11
     "@babel/plugin-transform-literals": ^7.22.5
-    "@babel/plugin-transform-logical-assignment-operators": ^7.22.5
+    "@babel/plugin-transform-logical-assignment-operators": ^7.22.11
     "@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-amd": ^7.23.0
+    "@babel/plugin-transform-modules-commonjs": ^7.23.0
+    "@babel/plugin-transform-modules-systemjs": ^7.23.0
     "@babel/plugin-transform-modules-umd": ^7.22.5
     "@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-nullish-coalescing-operator": ^7.22.11
+    "@babel/plugin-transform-numeric-separator": ^7.22.11
+    "@babel/plugin-transform-object-rest-spread": ^7.22.15
     "@babel/plugin-transform-object-super": ^7.22.5
-    "@babel/plugin-transform-optional-catch-binding": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.22.5
-    "@babel/plugin-transform-parameters": ^7.22.5
+    "@babel/plugin-transform-optional-catch-binding": ^7.22.11
+    "@babel/plugin-transform-optional-chaining": ^7.23.0
+    "@babel/plugin-transform-parameters": ^7.22.15
     "@babel/plugin-transform-private-methods": ^7.22.5
-    "@babel/plugin-transform-private-property-in-object": ^7.22.5
+    "@babel/plugin-transform-private-property-in-object": ^7.22.11
     "@babel/plugin-transform-property-literals": ^7.22.5
-    "@babel/plugin-transform-regenerator": ^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.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/preset-modules": ^0.1.5
-    "@babel/types": ^7.22.5
-    babel-plugin-polyfill-corejs2: ^0.4.3
-    babel-plugin-polyfill-corejs3: ^0.8.1
-    babel-plugin-polyfill-regenerator: ^0.5.0
-    core-js-compat: ^3.30.2
-    semver: ^6.3.0
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 6d9d09010ababef2ab48c8830770b2a8f45d6cce51db0924a98b0d95a5b1248a99ee07ee61cb5446d8b05b562db99a8af30b3ed194546419fb9b2889b8fd1ed3
-  languageName: node
-  linkType: hard
-
-"@babel/preset-env@npm:^7.11.0":
-  version: 7.21.4
-  resolution: "@babel/preset-env@npm:7.21.4"
-  dependencies:
-    "@babel/compat-data": ^7.21.4
-    "@babel/helper-compilation-targets": ^7.21.4
-    "@babel/helper-plugin-utils": ^7.20.2
-    "@babel/helper-validator-option": ^7.21.0
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.18.6
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.20.7
-    "@babel/plugin-proposal-async-generator-functions": ^7.20.7
-    "@babel/plugin-proposal-class-properties": ^7.18.6
-    "@babel/plugin-proposal-class-static-block": ^7.21.0
-    "@babel/plugin-proposal-dynamic-import": ^7.18.6
-    "@babel/plugin-proposal-export-namespace-from": ^7.18.9
-    "@babel/plugin-proposal-json-strings": ^7.18.6
-    "@babel/plugin-proposal-logical-assignment-operators": ^7.20.7
-    "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6
-    "@babel/plugin-proposal-numeric-separator": ^7.18.6
-    "@babel/plugin-proposal-object-rest-spread": ^7.20.7
-    "@babel/plugin-proposal-optional-catch-binding": ^7.18.6
-    "@babel/plugin-proposal-optional-chaining": ^7.21.0
-    "@babel/plugin-proposal-private-methods": ^7.18.6
-    "@babel/plugin-proposal-private-property-in-object": ^7.21.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.18.6
-    "@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.20.0
-    "@babel/plugin-syntax-json-strings": ^7.8.3
-    "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
-    "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
-    "@babel/plugin-syntax-numeric-separator": ^7.10.4
-    "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
-    "@babel/plugin-syntax-optional-chaining": ^7.8.3
-    "@babel/plugin-syntax-private-property-in-object": ^7.14.5
-    "@babel/plugin-syntax-top-level-await": ^7.14.5
-    "@babel/plugin-transform-arrow-functions": ^7.20.7
-    "@babel/plugin-transform-async-to-generator": ^7.20.7
-    "@babel/plugin-transform-block-scoped-functions": ^7.18.6
-    "@babel/plugin-transform-block-scoping": ^7.21.0
-    "@babel/plugin-transform-classes": ^7.21.0
-    "@babel/plugin-transform-computed-properties": ^7.20.7
-    "@babel/plugin-transform-destructuring": ^7.21.3
-    "@babel/plugin-transform-dotall-regex": ^7.18.6
-    "@babel/plugin-transform-duplicate-keys": ^7.18.9
-    "@babel/plugin-transform-exponentiation-operator": ^7.18.6
-    "@babel/plugin-transform-for-of": ^7.21.0
-    "@babel/plugin-transform-function-name": ^7.18.9
-    "@babel/plugin-transform-literals": ^7.18.9
-    "@babel/plugin-transform-member-expression-literals": ^7.18.6
-    "@babel/plugin-transform-modules-amd": ^7.20.11
-    "@babel/plugin-transform-modules-commonjs": ^7.21.2
-    "@babel/plugin-transform-modules-systemjs": ^7.20.11
-    "@babel/plugin-transform-modules-umd": ^7.18.6
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.20.5
-    "@babel/plugin-transform-new-target": ^7.18.6
-    "@babel/plugin-transform-object-super": ^7.18.6
-    "@babel/plugin-transform-parameters": ^7.21.3
-    "@babel/plugin-transform-property-literals": ^7.18.6
-    "@babel/plugin-transform-regenerator": ^7.20.5
-    "@babel/plugin-transform-reserved-words": ^7.18.6
-    "@babel/plugin-transform-shorthand-properties": ^7.18.6
-    "@babel/plugin-transform-spread": ^7.20.7
-    "@babel/plugin-transform-sticky-regex": ^7.18.6
-    "@babel/plugin-transform-template-literals": ^7.18.9
-    "@babel/plugin-transform-typeof-symbol": ^7.18.9
-    "@babel/plugin-transform-unicode-escapes": ^7.18.10
-    "@babel/plugin-transform-unicode-regex": ^7.18.6
-    "@babel/preset-modules": ^0.1.5
-    "@babel/types": ^7.21.4
-    babel-plugin-polyfill-corejs2: ^0.3.3
-    babel-plugin-polyfill-corejs3: ^0.6.0
-    babel-plugin-polyfill-regenerator: ^0.4.1
-    core-js-compat: ^3.25.1
-    semver: ^6.3.0
+    "@babel/preset-modules": 0.1.6-no-external-plugins
+    "@babel/types": ^7.23.0
+    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
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 1e328674c4b39e985fa81e5a8eee9aaab353dea4ff1f28f454c5e27a6498c762e25d42e827f5bfc9d7acf6c9b8bc317b5283aa7c83d9fd03c1a89e5c08f334f9
+  checksum: 49327ef584b529b56aedd6577937b80c0d89603c68b23795495a13af04b5aa008db9ad04cd280423600cdc0d3cce13ae9d0d9a977db5c8193697b20ced8a10b2
   languageName: node
   linkType: hard
 
-"@babel/preset-modules@npm:^0.1.5":
-  version: 0.1.5
-  resolution: "@babel/preset-modules@npm:0.1.5"
+"@babel/preset-modules@npm:0.1.6-no-external-plugins":
+  version: 0.1.6-no-external-plugins
+  resolution: "@babel/preset-modules@npm:0.1.6-no-external-plugins"
   dependencies:
     "@babel/helper-plugin-utils": ^7.0.0
-    "@babel/plugin-proposal-unicode-property-regex": ^7.4.4
-    "@babel/plugin-transform-dotall-regex": ^7.4.4
     "@babel/types": ^7.4.4
     esutils: ^2.0.2
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 8430e0e9e9d520b53e22e8c4c6a5a080a12b63af6eabe559c2310b187bd62ae113f3da82ba33e9d1d0f3230930ca702843aae9dd226dec51f7d7114dc1f51c10
+    "@babel/core": ^7.0.0-0 || ^8.0.0-0 <8.0.0
+  checksum: 4855e799bc50f2449fb5210f78ea9e8fd46cf4f242243f1e2ed838e2bd702e25e73e822e7f8447722a5f4baa5e67a8f7a0e403f3e7ce04540ff743a9c411c375
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/preset-react@npm:7.22.5"
+"@babel/preset-react@npm:7.22.15":
+  version: 7.22.15
+  resolution: "@babel/preset-react@npm:7.22.15"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.15
     "@babel/plugin-transform-react-display-name": ^7.22.5
-    "@babel/plugin-transform-react-jsx": ^7.22.5
+    "@babel/plugin-transform-react-jsx": ^7.22.15
     "@babel/plugin-transform-react-jsx-development": ^7.22.5
     "@babel/plugin-transform-react-pure-annotations": ^7.22.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: b977c7ee83e93f62d77e61929ca3d97e5291e026e2f025a1b8b7ac9186486ed56c7d5bc36f0becabe0c24e8c42a4e4f2243a3cf841384cfafc3204c5d3e6c619
+  checksum: c3ef99dfa2e9f57d2e08603e883aa20f47630a826c8e413888a93ae6e0084b5016871e463829be125329d40a1ba0a89f7c43d77b6dab52083c225cb43e63d10e
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:7.22.5":
-  version: 7.22.5
-  resolution: "@babel/preset-typescript@npm:7.22.5"
+"@babel/preset-typescript@npm:7.23.2":
+  version: 7.23.2
+  resolution: "@babel/preset-typescript@npm:7.23.2"
   dependencies:
     "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/helper-validator-option": ^7.22.5
+    "@babel/helper-validator-option": ^7.22.15
     "@babel/plugin-syntax-jsx": ^7.22.5
-    "@babel/plugin-transform-modules-commonjs": ^7.22.5
-    "@babel/plugin-transform-typescript": ^7.22.5
+    "@babel/plugin-transform-modules-commonjs": ^7.23.0
+    "@babel/plugin-transform-typescript": ^7.22.15
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7be1670cb4404797d3a473bd72d66eb2b3e0f2f8a672a5e40bdb0812cc66085ec84bcd7b896709764cabf042fdc6b7f2d4755ac7cce10515eb596ff61dab5154
+  checksum: c4b065c90e7f085dd7a0e57032983ac230c7ffd1d616e4c2b66581e765d5befc9271495f33250bf1cf9b4d436239c8ca3b19ada9f6c419c70bdab2cf6c868f9f
   languageName: node
   linkType: hard
 
@@ -2491,101 +1445,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
-  version: 7.20.7
-  resolution: "@babel/runtime@npm:7.20.7"
-  dependencies:
-    regenerator-runtime: ^0.13.11
-  checksum: 4629ce5c46f06cca9cfb9b7fc00d48003335a809888e2b91ec2069a2dcfbfef738480cff32ba81e0b7c290f8918e5c22ddcf2b710001464ee84ba62c7e32a3a3
-  languageName: node
-  linkType: hard
-
-"@babel/runtime@npm:^7.21.0":
-  version: 7.21.5
-  resolution: "@babel/runtime@npm:7.21.5"
-  dependencies:
-    regenerator-runtime: ^0.13.11
-  checksum: 358f2779d3187f5c67ad302e8f8d435412925d0b991d133c7d4a7b1ddd5a3fda1b6f34537cb64628dfd96a27ae46df105bed3895b8d754b88cacdded8d1129dd
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.3.3, @babel/template@npm:^7.4.4":
-  version: 7.20.7
-  resolution: "@babel/template@npm:7.20.7"
-  dependencies:
-    "@babel/code-frame": ^7.18.6
-    "@babel/parser": ^7.20.7
-    "@babel/types": ^7.20.7
-  checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e
-  languageName: node
-  linkType: hard
-
-"@babel/template@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/template@npm:7.22.5"
+"@babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.0, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
+  version: 7.23.2
+  resolution: "@babel/runtime@npm:7.23.2"
   dependencies:
-    "@babel/code-frame": ^7.22.5
-    "@babel/parser": ^7.22.5
-    "@babel/types": ^7.22.5
-  checksum: c5746410164039aca61829cdb42e9a55410f43cace6f51ca443313f3d0bdfa9a5a330d0b0df73dc17ef885c72104234ae05efede37c1cc8a72dc9f93425977a3
+    regenerator-runtime: ^0.14.0
+  checksum: 6c4df4839ec75ca10175f636d6362f91df8a3137f86b38f6cd3a4c90668a0fe8e9281d320958f4fbd43b394988958585a17c3aab2a4ea6bf7316b22916a371fb
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.18.11, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.4, @babel/traverse@npm:^7.7.2":
-  version: 7.21.4
-  resolution: "@babel/traverse@npm:7.21.4"
+"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5, @babel/template@npm:^7.3.3, @babel/template@npm:^7.4.4":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
   dependencies:
-    "@babel/code-frame": ^7.21.4
-    "@babel/generator": ^7.21.4
-    "@babel/helper-environment-visitor": ^7.18.9
-    "@babel/helper-function-name": ^7.21.0
-    "@babel/helper-hoist-variables": ^7.18.6
-    "@babel/helper-split-export-declaration": ^7.18.6
-    "@babel/parser": ^7.21.4
-    "@babel/types": ^7.21.4
-    debug: ^4.1.0
-    globals: ^11.1.0
-  checksum: f22f067c2d9b6497abf3d4e53ea71f3aa82a21f2ed434dd69b8c5767f11f2a4c24c8d2f517d2312c9e5248e5c69395fdca1c95a2b3286122c75f5783ddb6f53c
+    "@babel/code-frame": ^7.22.13
+    "@babel/parser": ^7.22.15
+    "@babel/types": ^7.22.15
+  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/traverse@npm:7.22.5"
+"@babel/traverse@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/traverse@npm:7.23.2"
   dependencies:
-    "@babel/code-frame": ^7.22.5
-    "@babel/generator": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.5
-    "@babel/helper-function-name": ^7.22.5
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.0
+    "@babel/helper-environment-visitor": ^7.22.20
+    "@babel/helper-function-name": ^7.23.0
     "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.5
-    "@babel/parser": ^7.22.5
-    "@babel/types": ^7.22.5
+    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/parser": ^7.23.0
+    "@babel/types": ^7.23.0
     debug: ^4.1.0
     globals: ^11.1.0
-  checksum: 560931422dc1761f2df723778dcb4e51ce0d02e560cf2caa49822921578f49189a5a7d053b78a32dca33e59be886a6b2200a6e24d4ae9b5086ca0ba803815694
-  languageName: node
-  linkType: hard
-
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.21.4, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.21.4
-  resolution: "@babel/types@npm:7.21.4"
-  dependencies:
-    "@babel/helper-string-parser": ^7.19.4
-    "@babel/helper-validator-identifier": ^7.19.1
-    to-fast-properties: ^2.0.0
-  checksum: 587bc55a91ce003b0f8aa10d70070f8006560d7dc0360dc0406d306a2cb2a10154e2f9080b9c37abec76907a90b330a536406cb75e6bdc905484f37b75c73219
+  checksum: 26a1eea0dde41ab99dde8b9773a013a0dc50324e5110a049f5d634e721ff08afffd54940b3974a20308d7952085ac769689369e9127dea655f868c0f6e1ab35d
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/types@npm:7.22.5"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.0
+  resolution: "@babel/types@npm:7.23.0"
   dependencies:
     "@babel/helper-string-parser": ^7.22.5
-    "@babel/helper-validator-identifier": ^7.22.5
+    "@babel/helper-validator-identifier": ^7.22.20
     to-fast-properties: ^2.0.0
-  checksum: c13a9c1dc7d2d1a241a2f8363540cb9af1d66e978e8984b400a20c4f38ba38ca29f06e26a0f2d49a70bad9e57615dac09c35accfddf1bb90d23cd3e0a0bab892
+  checksum: 215fe04bd7feef79eeb4d33374b39909ce9cad1611c4135a4f7fdf41fe3280594105af6d7094354751514625ea92d0875aba355f53e86a92600f290e77b0e604
   languageName: node
   linkType: hard
 
@@ -2596,120 +1501,139 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/cspell-bundled-dicts@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/cspell-bundled-dicts@npm:6.31.1"
-  dependencies:
-    "@cspell/dict-ada": ^4.0.1
-    "@cspell/dict-aws": ^3.0.0
-    "@cspell/dict-bash": ^4.1.1
-    "@cspell/dict-companies": ^3.0.9
-    "@cspell/dict-cpp": ^5.0.2
-    "@cspell/dict-cryptocurrencies": ^3.0.1
+"@cspell/cspell-bundled-dicts@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-bundled-dicts@npm:7.3.8"
+  dependencies:
+    "@cspell/dict-ada": ^4.0.2
+    "@cspell/dict-aws": ^4.0.0
+    "@cspell/dict-bash": ^4.1.2
+    "@cspell/dict-companies": ^3.0.26
+    "@cspell/dict-cpp": ^5.0.8
+    "@cspell/dict-cryptocurrencies": ^4.0.0
     "@cspell/dict-csharp": ^4.0.2
-    "@cspell/dict-css": ^4.0.5
-    "@cspell/dict-dart": ^2.0.2
-    "@cspell/dict-django": ^4.0.2
-    "@cspell/dict-docker": ^1.1.6
+    "@cspell/dict-css": ^4.0.12
+    "@cspell/dict-dart": ^2.0.3
+    "@cspell/dict-django": ^4.1.0
+    "@cspell/dict-docker": ^1.1.7
     "@cspell/dict-dotnet": ^5.0.0
-    "@cspell/dict-elixir": ^4.0.2
+    "@cspell/dict-elixir": ^4.0.3
     "@cspell/dict-en-common-misspellings": ^1.0.2
     "@cspell/dict-en-gb": 1.1.33
-    "@cspell/dict-en_us": ^4.3.2
-    "@cspell/dict-filetypes": ^3.0.0
-    "@cspell/dict-fonts": ^3.0.1
+    "@cspell/dict-en_us": ^4.3.9
+    "@cspell/dict-filetypes": ^3.0.1
+    "@cspell/dict-fonts": ^4.0.0
+    "@cspell/dict-fsharp": ^1.0.0
     "@cspell/dict-fullstack": ^3.1.5
     "@cspell/dict-gaming-terms": ^1.0.4
     "@cspell/dict-git": ^2.0.0
-    "@cspell/dict-golang": ^6.0.1
+    "@cspell/dict-golang": ^6.0.3
     "@cspell/dict-haskell": ^4.0.1
-    "@cspell/dict-html": ^4.0.3
+    "@cspell/dict-html": ^4.0.5
     "@cspell/dict-html-symbol-entities": ^4.0.0
-    "@cspell/dict-java": ^5.0.5
+    "@cspell/dict-java": ^5.0.6
     "@cspell/dict-k8s": ^1.0.1
     "@cspell/dict-latex": ^4.0.0
-    "@cspell/dict-lorem-ipsum": ^3.0.0
-    "@cspell/dict-lua": ^4.0.1
-    "@cspell/dict-node": ^4.0.2
-    "@cspell/dict-npm": ^5.0.5
-    "@cspell/dict-php": ^4.0.1
-    "@cspell/dict-powershell": ^5.0.1
-    "@cspell/dict-public-licenses": ^2.0.2
-    "@cspell/dict-python": ^4.0.2
+    "@cspell/dict-lorem-ipsum": ^4.0.0
+    "@cspell/dict-lua": ^4.0.2
+    "@cspell/dict-node": ^4.0.3
+    "@cspell/dict-npm": ^5.0.12
+    "@cspell/dict-php": ^4.0.3
+    "@cspell/dict-powershell": ^5.0.2
+    "@cspell/dict-public-licenses": ^2.0.5
+    "@cspell/dict-python": ^4.1.9
     "@cspell/dict-r": ^2.0.1
-    "@cspell/dict-ruby": ^5.0.0
+    "@cspell/dict-ruby": ^5.0.1
     "@cspell/dict-rust": ^4.0.1
     "@cspell/dict-scala": ^5.0.0
-    "@cspell/dict-software-terms": ^3.1.6
-    "@cspell/dict-sql": ^2.1.0
+    "@cspell/dict-software-terms": ^3.3.6
+    "@cspell/dict-sql": ^2.1.2
     "@cspell/dict-svelte": ^1.0.2
     "@cspell/dict-swift": ^2.0.1
-    "@cspell/dict-typescript": ^3.1.1
+    "@cspell/dict-typescript": ^3.1.2
     "@cspell/dict-vue": ^3.0.0
-  checksum: c015fe05db5393bcc45423e37e6836b54836d746fc7a4a871613e5deac007e5dfbe7be86e6f15237575f9b9d96b539d930297cf860046c1e4818c3bcaa396acc
+  checksum: 32b7329a654d0257d1a589bca6360d426938cbdf6873a5022c24f2d77aacc959df8393a61cc3609ad2879ea1ce067f852ddc634cb8a496bc96ae7b10872011cf
   languageName: node
   linkType: hard
 
-"@cspell/cspell-pipe@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/cspell-pipe@npm:6.31.1"
-  checksum: c8aa8525bfd6063437cb941643ac4395aeed8ef6753298d59b9de5dccef7896d8f8cd0bcd2aadd5f1d8af3a3ffbaa10998e22aedde09a201be8c2c3f178bd139
+"@cspell/cspell-json-reporter@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-json-reporter@npm:7.3.8"
+  dependencies:
+    "@cspell/cspell-types": 7.3.8
+  checksum: e41c31c7ed22c2dac40ae353b9ed7ba6963c3f886eb198a321d145963e2895016e19426c88640dbffa3d82724ce572bb674c435f0dae6552739fa4130c8b71d8
   languageName: node
   linkType: hard
 
-"@cspell/cspell-service-bus@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/cspell-service-bus@npm:6.31.1"
-  checksum: 968a02c2d41d9511013cd7faf9cc7851e6995423d61879c347956b6cfbe2ee511a3605e31223d2cad4e8d1faa7b19051ecd07345fc7d41f97d0e78c7f15fad6c
+"@cspell/cspell-pipe@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-pipe@npm:7.3.8"
+  checksum: 2b7b1092a3e69a97a03d7a617995ef05d1dc05aae5d9559c084b2fa55564717fff53f9dd5b30e1d6087403fae3e4fa454cb62d8a1c2acaffa2b1ff28460936c0
   languageName: node
   linkType: hard
 
-"@cspell/cspell-types@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/cspell-types@npm:6.31.1"
-  checksum: 8df9209b7f613bbd245f6304febaca2e49bf81f52d960e7bca8f33b25e84ff3f7e38eb833841f6cac72e0b85c56ddd83e3d2721685638730a0a7a75eb86dae42
+"@cspell/cspell-resolver@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-resolver@npm:7.3.8"
+  dependencies:
+    global-dirs: ^3.0.1
+  checksum: 80564b9fb3dce90365b62eb8d120c1eec3df56175899ec0c81725a4355a398ad858e06c7ebc6446d00a707076e1389fe28e6cf645be5b0a4be4cba2c88ba7a7d
   languageName: node
   linkType: hard
 
-"@cspell/dict-ada@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-ada@npm:4.0.1"
-  checksum: 3422487c8decf01d9dd14e666dcbe29557d730085f60fcd859d03fc5c177359d12df19171368cd105dad29f315d0decfa56f29eeb7c594a300d47c65805c4349
+"@cspell/cspell-service-bus@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-service-bus@npm:7.3.8"
+  checksum: d12fbfb4e97764edb2f1e60d435c6df34a1da26df95bfa3ee3f94ce0b5b0c5ff299a43b3b16b4abf8c989343675eed6485b8cf84626dce4ff2138bbfa1d046d1
   languageName: node
   linkType: hard
 
-"@cspell/dict-aws@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@cspell/dict-aws@npm:3.0.0"
-  checksum: d06284d5cc438c18175c26e4f5d450f3235d603dbc989fa2d7515bb01d1c7a8b303ce054d532ca4f814fc6cd7c65ef9558d46bf5bacb06d35504b3c259ebe95c
+"@cspell/cspell-types@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/cspell-types@npm:7.3.8"
+  checksum: dc0380e5f941b6c51e41c5006a325c72f62141de40ad6ffd261fd436ebaba2d85928405dfd69a00cf4d5aa153eb0c097a2fe456f3b6030852392f1c84fc671d4
   languageName: node
   linkType: hard
 
-"@cspell/dict-bash@npm:^4.1.1":
-  version: 4.1.1
-  resolution: "@cspell/dict-bash@npm:4.1.1"
-  checksum: 5b6fbb597c53fa6b9957213aa77688c6e0231f8d59eed02f0eecda456f3606855fc0f4c0c5121a909e9055c164de83e3f151b32a9abd1ccd4a161634ffee6691
+"@cspell/dict-ada@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@cspell/dict-ada@npm:4.0.2"
+  checksum: 847729d40022db4df698aa9511c6b9073954f71268b64ad4fa354e6ac3eb5b03486bcb566ecadd4bccbebb4f188752eff2b2bdd9021b58dbf2cd61cd6a426752
   languageName: node
   linkType: hard
 
-"@cspell/dict-companies@npm:^3.0.9":
-  version: 3.0.9
-  resolution: "@cspell/dict-companies@npm:3.0.9"
-  checksum: 9f6446707072002ec653b42d2a1c06f82a8d21445ed7e2953a6f9cded1d02f5f58735c387b1bcadead88825c4edce3daccdbf7136f5d6e2d79f02580ef5f55a4
+"@cspell/dict-aws@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-aws@npm:4.0.0"
+  checksum: ed8714bda04fa983abb5571f66d46252dc8125b717beff7043fb9b09af97e335712132248555a90008e0bebd2cfa9cca6945d96ea2f03fc36c1826e9fde981a3
   languageName: node
   linkType: hard
 
-"@cspell/dict-cpp@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "@cspell/dict-cpp@npm:5.0.2"
-  checksum: 6483cea117b1a8313c67d6be5211c490347f36a926d9b2c402740ddd2c15a395e9ba5bd09d038fe9355dd58eafb2f48d0d74658a86accb2ad1d177e0ccc326ab
+"@cspell/dict-bash@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "@cspell/dict-bash@npm:4.1.2"
+  checksum: 2fc6acd6c74c245a7e0c6596f7ae2189569134dff9e95e0f9562812a1e39bbc2c2b39325e8494aba1367b2849656fd3abe6985afc5c51157044c2683b220ba70
   languageName: node
   linkType: hard
 
-"@cspell/dict-cryptocurrencies@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@cspell/dict-cryptocurrencies@npm:3.0.1"
-  checksum: 5d646f569e8dc5998de8a508ff3de39db5f5a5db0a846ee4fc750ea3880080d922d5c28fdce38f93910eaacde2723e2fe4c305d50b3f9d53b817ce33a3bed66a
+"@cspell/dict-companies@npm:^3.0.26":
+  version: 3.0.26
+  resolution: "@cspell/dict-companies@npm:3.0.26"
+  checksum: ae6f4e7c39b8fa7644d1e4d25c453b8edf93b4d518991f36e5d86fceab9e7795ec0912a8170a8e5c1c650f876d5d95b096f4369d47b725fd54f2666063c93beb
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-cpp@npm:^5.0.8":
+  version: 5.0.8
+  resolution: "@cspell/dict-cpp@npm:5.0.8"
+  checksum: 933a56daa66789a105f9309cdb91e7b5fffb1fb32be0a27e6f70506949d9f24355055eb763db7f80a00560d86786995eb1b1df003a6ad3ba87843d47686b02e2
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-cryptocurrencies@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-cryptocurrencies@npm:4.0.0"
+  checksum: c565a660b62a5ab2d597abaaef7f277cfba05e0617064dd526aadf9ba64306ab16f9fa4adf5ad8b3e79310cf127f737e5f876d4424efa7da65e403817f4e184c
   languageName: node
   linkType: hard
 
@@ -2720,31 +1644,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-css@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "@cspell/dict-css@npm:4.0.5"
-  checksum: f5fbe4e71ae7739ee7999c601befafb6e9b9313efa6d2b129fd8ba5ebfd2bf6137163439dd12fb5d540ac5ca5ae78af3ece43d51fb49027ace9a63d425771deb
+"@cspell/dict-css@npm:^4.0.12":
+  version: 4.0.12
+  resolution: "@cspell/dict-css@npm:4.0.12"
+  checksum: 208c9434b8f5c8a33a96bb087572c10d5c946cd0847b9439271d0c4d2dcde5ee2588aca73bfea0c868d0124731b3ca890fab4762724d16435f161d4d5e7f3b9b
   languageName: node
   linkType: hard
 
-"@cspell/dict-dart@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@cspell/dict-dart@npm:2.0.2"
-  checksum: ef88d6d980247badbea01bb8e1a51eaa53cb9eedd611df4ae0324a93d64f5de1e2aef0932805504111ae455ca90181938f74bd522a4304054b55baa5bfd706a8
+"@cspell/dict-dart@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@cspell/dict-dart@npm:2.0.3"
+  checksum: 66bfcfa029baacd0b14b3ff5b6ab7597cf9459f77185d88b25123b42a4babb66df6786806843f1b6506c335326100599a2e1db6e6104e66bd021ede9ccb3cec4
   languageName: node
   linkType: hard
 
-"@cspell/dict-django@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-django@npm:4.0.2"
-  checksum: 9b700702c864848ed1e133c8ab8500223e0ac68a6ba58ad872fd5eb9179003fda04b713e9a31b3f6b3bf80f4bb2a6c1473c12aa0bed3a3250b495e53ca1af585
+"@cspell/dict-data-science@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@cspell/dict-data-science@npm:1.0.11"
+  checksum: 513f8f416f584f46576d45be23a4aa354e46d244f10a3d466222ffc13afe475e676639e4a24ab3a1ba157239f9ce23f7eef59c9f4c7a877a044db3a6344b18c6
   languageName: node
   linkType: hard
 
-"@cspell/dict-docker@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "@cspell/dict-docker@npm:1.1.6"
-  checksum: ad2e77557f1e0e388910567749e59cd169d9743ea3aed22b0ecff2137750d87d1a90dff7c84c5d1955762ef8d568d1e48c702c990b09b24834bdade188f43ac4
+"@cspell/dict-django@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@cspell/dict-django@npm:4.1.0"
+  checksum: b8a66135525e235bd6f2ea02de84ac7eae78e1068418f36b0c2260f9516b72492ef73f3fdc5fe8db2a6933747ff45a3eb743423a7dbf5b74548b1b1f30792679
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-docker@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "@cspell/dict-docker@npm:1.1.7"
+  checksum: 307f8b5132edca7cd291ba0ab6ed88f8787df984d6a42401b12a0da1ecb935d50af3a108ede885ce5bede96c445acdc88bb9ea8396de151c565a90a3bf66853e
   languageName: node
   linkType: hard
 
@@ -2755,10 +1686,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-elixir@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-elixir@npm:4.0.2"
-  checksum: 0d80b2c9f7a05f38df6de7a574641149fa782e9f2c61a91a715293b1a04c81fdaf378c1d5643f14ecacaa3f3d927589a3c3e6b282b3cf3c860d56a907e0c1a8b
+"@cspell/dict-elixir@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-elixir@npm:4.0.3"
+  checksum: f084449b2de5a2fa08076ac699c6073beaa4bb43796a662d681ea8fe5cba31f9efe718f3f98ef432ba75d4ea574316de34ab8422f79f4f2022cfddee7a7b8653
   languageName: node
   linkType: hard
 
@@ -2776,24 +1707,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-en_us@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@cspell/dict-en_us@npm:4.3.2"
-  checksum: b6502253351cc6f09d0ed0731dfffea6d8f5859f9a48d0512542cefda9d7baab527c678df68de6ef9563c72b1b51555520f3a2f1dd51f84cf8f6b9d303bf9aa4
+"@cspell/dict-en_us@npm:^4.3.9":
+  version: 4.3.9
+  resolution: "@cspell/dict-en_us@npm:4.3.9"
+  checksum: 890b1c4e430b623e860af5138d02514fe6eafdd62d693851a8d995e7a5ae68e501b6ddb74669faabd2393ba620d984873d00511c68564692e6a768f2dab9165a
   languageName: node
   linkType: hard
 
-"@cspell/dict-filetypes@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@cspell/dict-filetypes@npm:3.0.0"
-  checksum: 8afd0785583f913c8d6ad1a2b56a527600258b291fc6ed8e83f543ba70a5273095195495601aca7d80fdeb17cab6a10e8a8aa44bea3083962cd42af130260d8a
+"@cspell/dict-filetypes@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@cspell/dict-filetypes@npm:3.0.1"
+  checksum: 43ad696dac5feaee290120216153a25f454302bda5834ce5e86dbab5fca73266a35c7fc00466120ae3b696ec1fa94b4f2b36e036dd07f05d5a4a770db7eb5d0a
   languageName: node
   linkType: hard
 
-"@cspell/dict-fonts@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@cspell/dict-fonts@npm:3.0.1"
-  checksum: 15110749c6e245df707efab30e16ecdcc1f0676a9fc720f9070b88df056a01114ce2350d862a4421ce06d1a739652aee4e687b8c798a7170f0f9cfdca49bfb0f
+"@cspell/dict-fonts@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-fonts@npm:4.0.0"
+  checksum: 7e33e4b39fb071165d81920dd0ccc07e4b737a7b09522acf3781b26136526e445e03e456caaecff261d76b711196b84cff7c21293853bf00ebe93f2e64c42520
+  languageName: node
+  linkType: hard
+
+"@cspell/dict-fsharp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@cspell/dict-fsharp@npm:1.0.0"
+  checksum: 79141e510c44581cfa5082ab69e9f0fb09f873743f9afb9e9b465e4b74f2e05c18fd89e796649616202527f9cc50603e5f0c8b81f482b22e80a7988d3c856411
   languageName: node
   linkType: hard
 
@@ -2818,10 +1756,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-golang@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "@cspell/dict-golang@npm:6.0.1"
-  checksum: 465dc7a879fa34be010aecc7dac9820bc93ea694abc24299757662c10b8d9f632df7d18c37b31d7dabb67b721bfa9a6d02bd50125e464f79e1d466aa8073a35b
+"@cspell/dict-golang@npm:^6.0.3":
+  version: 6.0.3
+  resolution: "@cspell/dict-golang@npm:6.0.3"
+  checksum: c7b46ad177b26ad1d449a79d12b7e1dc464c04dd7e78bf4b367ce376addfee3fa61fbbb6c7ff47e8b3a89a1fed31fbd3a889ca7cbb6bfa2cd79c1cdbfb6771b0
   languageName: node
   linkType: hard
 
@@ -2839,17 +1777,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-html@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "@cspell/dict-html@npm:4.0.3"
-  checksum: ebc011c83c4600ef40e68cedf598c402819ef8ab5543a9f264a9b18bf7592f95aade77fd83121befafe338a791a4609aea273f0fa7584b029f34844924344ae0
+"@cspell/dict-html@npm:^4.0.5":
+  version: 4.0.5
+  resolution: "@cspell/dict-html@npm:4.0.5"
+  checksum: 2273e77cad6f373c4b0a43c5fb707725ff7c845e6de3545c8b05cbb2d82e1205f004a817498f561ced3d8d8b1d15848a82f2a667c0b64a1ee46cbde67d8ac136
   languageName: node
   linkType: hard
 
-"@cspell/dict-java@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "@cspell/dict-java@npm:5.0.5"
-  checksum: a40fafeb4f1b454e025be19bd56e3d591666a7d69be5d06ca673a28743eb84261bf5e193ad16a46bc7698c7b1b6bdd30c34a6939bec0615d827bb0f9ea04bffd
+"@cspell/dict-java@npm:^5.0.6":
+  version: 5.0.6
+  resolution: "@cspell/dict-java@npm:5.0.6"
+  checksum: 7d5df7831e8a4c0295ebbcfdf9a3185b197f1aa60ec85f7edf4aaec4cc1c53f37a291f3f95543642951d21ff487285f5cfb6e853b7f96f514a35052d59252909
   languageName: node
   linkType: hard
 
@@ -2867,59 +1805,61 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-lorem-ipsum@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@cspell/dict-lorem-ipsum@npm:3.0.0"
-  checksum: 145a79ec536bee3ec515b189be3f4a5347a28c563060ac5da6f6783a288e63cb0662fc918be008e1a377bdeb48cfa7a2aa1f9e9f8aef6371109f95f4b049731d
+"@cspell/dict-lorem-ipsum@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@cspell/dict-lorem-ipsum@npm:4.0.0"
+  checksum: d3575fb7b9684480192d2cd647484312c555f3d1215d6b35371b70de3ecde4273010e5916cc2d130ff1e1223a1a49f75825651671a76d3dabdec98acf67a3902
   languageName: node
   linkType: hard
 
-"@cspell/dict-lua@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-lua@npm:4.0.1"
-  checksum: a85da787f1f347a46cfa44fdc26dea39c0665f636936f4ae7ee656b0e3395a2b3d8787a5f4af35e7d777efde15397ed57ba21d2de9b01e27df4239b3d86e27bd
+"@cspell/dict-lua@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "@cspell/dict-lua@npm:4.0.2"
+  checksum: 570e45e4430fa3b07759dcc4fcaf75995bd1f3c5f335496de67963177da692e89c84fb08f5b5547a582049dee64c768e81294edd4f047dee31807261e85f6f30
   languageName: node
   linkType: hard
 
-"@cspell/dict-node@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-node@npm:4.0.2"
-  checksum: 7a63ee44c4c493b429c821eb9e5fdcd1d0f549a2ada64d8ce3f7f0a88e2d26f82daada8801ee6f09a582502a1500d63985aa47204757b39014dff747211539d5
+"@cspell/dict-node@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-node@npm:4.0.3"
+  checksum: 178e7f3ab45f30722cae7354803dd98ea6577c025a11eda9362fa795a06dd8e934f833bfc7d46816617974822ace11217505a1bd0ea2955aaee92cf94cc6b127
   languageName: node
   linkType: hard
 
-"@cspell/dict-npm@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "@cspell/dict-npm@npm:5.0.5"
-  checksum: ecb0f4d99b394f09ebcdf103b91ff4ea3c89d58843eeed99880032c322caf1bd9a81266a0e9fa3b816b88aa32685878fdce8716c2eb3a593b361f0bce2076fc2
+"@cspell/dict-npm@npm:^5.0.12":
+  version: 5.0.12
+  resolution: "@cspell/dict-npm@npm:5.0.12"
+  checksum: 4c2c6cecbbd3c1f23ba564081e5b22628220250125693d8daa79ba0740c4ab5b6bb807475e69792dc4d4bfdf208877ea5799b502c3cb1cd55f6aaa5a170f2207
   languageName: node
   linkType: hard
 
-"@cspell/dict-php@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "@cspell/dict-php@npm:4.0.1"
-  checksum: 163727eca4af8d2e5d759fdda2dcc80065bd01fbc44020dd26cf0d1a3d2906a0c9caa52a97ece9eafecea36d682609c7ffa77ad8d736505058505c64106d7c06
+"@cspell/dict-php@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@cspell/dict-php@npm:4.0.3"
+  checksum: 98040e804e3ca67df965a3ea1840d68369d7b32cf6176a63605759e40a2325321f24723c4f24525a6cdf8d35bbc975ed6424a1a581775fb8cf7e55b5b2e60c89
   languageName: node
   linkType: hard
 
-"@cspell/dict-powershell@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@cspell/dict-powershell@npm:5.0.1"
-  checksum: 42bb95e5eef228ccdb5c787b7492b77a028ac205ca27cc775fa792558b760814808bb65952214b2282131d7ab4cbd3f80c12c5bee9184b8559f0a2cf1e488008
+"@cspell/dict-powershell@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "@cspell/dict-powershell@npm:5.0.2"
+  checksum: 0591920546caa6965fe1238fe43aa9a9d714594d7149225bebfb0157a337d741603f52f39b2265131d20612617cfccf5da92e04491824d4c395ec664eca98076
   languageName: node
   linkType: hard
 
-"@cspell/dict-public-licenses@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@cspell/dict-public-licenses@npm:2.0.2"
-  checksum: 79f16b2c3a31208e299bd552d684f7f89da8e73bef97704e2d0e1bfc99448b9dd7758315b6ed5aa04f067908def11f0d481550843568f02cba8a2b2fd7a687ba
+"@cspell/dict-public-licenses@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@cspell/dict-public-licenses@npm:2.0.5"
+  checksum: 07e647c24ed1a5f0e88828264581e9f8fde179f776a50c4389ac0bc5c09a2bb94280d299c94d1884a8da01fbf112c5640178789b457f06b1a97414b18cda99e0
   languageName: node
   linkType: hard
 
-"@cspell/dict-python@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "@cspell/dict-python@npm:4.0.2"
-  checksum: 23825b92af39a9b43a6af3862babbeaf01a5718ffe621e9f487400dc62582e5bd840213af22f1b2f4a78ba8e8b24dbb4cd7de9c190aa2cfea2bff7c15338ae7a
+"@cspell/dict-python@npm:^4.1.9":
+  version: 4.1.9
+  resolution: "@cspell/dict-python@npm:4.1.9"
+  dependencies:
+    "@cspell/dict-data-science": ^1.0.11
+  checksum: 9424c6da9ffd5f58ef393af133cea0c57f58d2b2fc8bf575360cba508ed2e159e5df3b973f2a70b4548a5820be3c07a716c784c0d6df62fc921db4abb91f450a
   languageName: node
   linkType: hard
 
@@ -2930,10 +1870,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-ruby@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "@cspell/dict-ruby@npm:5.0.0"
-  checksum: e1f99f97fa3459a19f8f25dbae7d879e77bd503e9435aaf640d99ad4212223548fb9e5544d076f9a766f74829958178e814ebfe6f941738fb5e5452969bbdfb2
+"@cspell/dict-ruby@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "@cspell/dict-ruby@npm:5.0.1"
+  checksum: 2d85495b28cb7ea05b85cf3091f8f03f8a51968d532ebb0fc41ea9f8ba31915d66c8a8a2c6146a080f88ef3445a43ae972cf549ec522b2f63bfb8cb11adf8289
   languageName: node
   linkType: hard
 
@@ -2951,17 +1891,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-software-terms@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "@cspell/dict-software-terms@npm:3.1.6"
-  checksum: 76b5d33dc830effa229096050964ccbf652cf83a2b648fa313b77a0ee80a8a1979382a07e72e5bed9c8aaadecbb59103a6b578fe10e8892dc53081cffbab3d85
+"@cspell/dict-software-terms@npm:^3.3.6":
+  version: 3.3.6
+  resolution: "@cspell/dict-software-terms@npm:3.3.6"
+  checksum: d0187d1ed6e33dbc25150e6f918757e57e94449bde85581ecc5cdaf08ea257a1d2368533dddcfd81139dffbab80beea0b7877d569f1b5aa9feba6e668b61e336
   languageName: node
   linkType: hard
 
-"@cspell/dict-sql@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@cspell/dict-sql@npm:2.1.0"
-  checksum: 12eb8f1d3cb9d2f7957375b7258f4e13c2482de3e46a567e4854159e1d6242ca6e25575ccbddcb5c10b1ca8f738d271eabce7c4538e1f31e610bcd002f800b4a
+"@cspell/dict-sql@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@cspell/dict-sql@npm:2.1.2"
+  checksum: fffa66d7f3412b559be7d0acd711504b6b3b78a0380ba4e46b397e54d4754305b398e2e931965016aa6ca3c25e4a056c11974d58fbb7b78afd6d38660a2ede0b
   languageName: node
   linkType: hard
 
@@ -2979,10 +1919,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dict-typescript@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "@cspell/dict-typescript@npm:3.1.1"
-  checksum: e70b03d0867070e6695787acea05f32fc5eac6f90f1473ebe3f0833c0578c52d36d85ef20c43f10ff10b8f0be48d9df3e77a21eeed1794fe282b6fca79451293
+"@cspell/dict-typescript@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "@cspell/dict-typescript@npm:3.1.2"
+  checksum: 3cd0fa39856002975cf05b5584de42f58700a3420bd08b7b073af87dbcc1f66cab45e36a2156dd4e6c926cf67baaa192f02ccf61b9a9e5e94e69e035af54cec1
   languageName: node
   linkType: hard
 
@@ -2993,19 +1933,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@cspell/dynamic-import@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/dynamic-import@npm:6.31.1"
+"@cspell/dynamic-import@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/dynamic-import@npm:7.3.8"
   dependencies:
-    import-meta-resolve: ^2.2.2
-  checksum: d0e91a7b86cac0064da171a3ea4e1fb240097a89f82856ac56f4550cb29e32ffc1e9507051a5205aaffa5174f3d55cb64460ee1ec9d12d1c183eebafe8d9d185
+    import-meta-resolve: ^3.0.0
+  checksum: 75cb2f8c544c50db75c2fba860a6f8a48dfff1a818723e8381bc5c61605805d02a440ede39d546cdc5f9fcd90b3d0ad95112ad4d70fee1acce71d6f09d4d7369
   languageName: node
   linkType: hard
 
-"@cspell/strong-weak-map@npm:6.31.1":
-  version: 6.31.1
-  resolution: "@cspell/strong-weak-map@npm:6.31.1"
-  checksum: 24f1242f770c497d2da3d8131c3ce7d72fb3d2ebc306776fabf09d91c7a496bbffc5d6770669c09f166de4b45259fdaf80471272b31aa89afd7b0f55330a8f99
+"@cspell/strong-weak-map@npm:7.3.8":
+  version: 7.3.8
+  resolution: "@cspell/strong-weak-map@npm:7.3.8"
+  checksum: 16f0d52341de320afecf6c855bac9811668d36bc0be07c74264950ffa7a5502d3db5cecc365e29c591c0fa4455ae164c9d2e3c462bb9640c18234ef534c652bf
   languageName: node
   linkType: hard
 
@@ -3018,438 +1958,444 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/cascade-layer-name-parser@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.2"
+"@csstools/cascade-layer-name-parser@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "@csstools/cascade-layer-name-parser@npm:1.0.5"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: 3ff79d53414373748adf35b3e7c4119bafa328cbba6f2ca072f00d64cb0e8a4d7c2b46e6a35a2b9246fd8e92afca18c3c262269dc3ccb2cbaaecc2c963604413
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+  checksum: 91c533690b249fc5a284dcdedcb29b4129cc64d8325895c566c13b795c381d65b4b9829eb2e66df883d5b9468536f6010cccc74c8bf78fbbd85ecc595656c8f6
   languageName: node
   linkType: hard
 
-"@csstools/color-helpers@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@csstools/color-helpers@npm:2.1.0"
-  checksum: 3aadf25428fbb26ba6bda118dd5c0c99c0209a5cc63f72fa6c2f226ddf1f9897f6b6798c042df4bae61fcbe33d471028115df97e2d069c8fd9871cbd6da523bf
+"@csstools/color-helpers@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/color-helpers@npm:3.0.2"
+  checksum: 199b55081959a67fb7eaa7be468f7e899d3c607c1b97eeb120aa8a1eff202e7592890b1233882ec3554467dedd530e21aec070cc2ce6b9184f366fa470a05fbd
   languageName: node
   linkType: hard
 
-"@csstools/css-calc@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@csstools/css-calc@npm:1.1.1"
+"@csstools/css-calc@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "@csstools/css-calc@npm:1.1.4"
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: 99fa63cf851e477b777e3054f3e55c0113f32eabf29c0b6cac7cd8c48b310ebaebcd56d8cebe609abb92653e9007c3d2152d24f3fbd1f0ccc89c3119197e9235
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+  checksum: 71788155c73b4f482f19de5b91f37d14ccb8fc1fb3f8336a83c4b3197a5d0b499ccad86b067699ac559a721f8d46d81612eba0fc79923b8f5058977032a7e8c0
   languageName: node
   linkType: hard
 
-"@csstools/css-color-parser@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@csstools/css-color-parser@npm:1.2.0"
+"@csstools/css-color-parser@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "@csstools/css-color-parser@npm:1.4.0"
   dependencies:
-    "@csstools/color-helpers": ^2.1.0
-    "@csstools/css-calc": ^1.1.1
+    "@csstools/color-helpers": ^3.0.2
+    "@csstools/css-calc": ^1.1.4
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: d3908aac70a7478a21cba710f8a6ec9486efa21fd6f4335362196533460b7096cb0d8961ac4176785baec61f6cacc0c2e4f89ff7a098255fc37469133f8cc0b6
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+  checksum: 5bb07c02ee30ad4991b756443aea7dd7675f652bc4a3d5199851843a003a7233ef42c6b1acd159f40f00914b7d20d5fabf864211c56365c96c0a915a77a93748
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@csstools/css-parser-algorithms@npm:2.1.1"
+"@csstools/css-parser-algorithms@npm:2.3.2, @csstools/css-parser-algorithms@npm:^2.3.1, @csstools/css-parser-algorithms@npm:^2.3.2":
+  version: 2.3.2
+  resolution: "@csstools/css-parser-algorithms@npm:2.3.2"
   peerDependencies:
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: 0ba3f3d38b99c933d12c6cb7fc348a9c0056a1e23b8a4b7e66b79295b5071bc443c4c3ed87ad7f155ce7e76e49c20c582dc27d804c9a45c82e5bd37585870d60
+    "@csstools/css-tokenizer": ^2.2.1
+  checksum: 71663a00369014727ac89ae738f0acd1341b2dc1474ff16799a6f4d24674c55c3ddb89d70c8f1ffc4e03508b18a621830f8f8a51707fda6cc5ea48f1a53cc559
   languageName: node
   linkType: hard
 
-"@csstools/css-parser-algorithms@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@csstools/css-parser-algorithms@npm:2.2.0"
-  peerDependencies:
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: 9f1b6e902dadfc6ac37086c4b7073b16458186d9f42c534fdede8b0e7c2e3a832ea2d716baf32d4976c1fc2d8ad78f829916419faa73ecd10cc61c329121e683
+"@csstools/css-tokenizer@npm:^2.2.0, @csstools/css-tokenizer@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@csstools/css-tokenizer@npm:2.2.1"
+  checksum: ebd9f65b253037d3a575ded45dbe41c12e71d83d6aa8a6a3a9fc2427862a805678df2a825cd19cf36b587be93f5cb1bd0932bb5c362d227ed9533db35b1fc6fa
   languageName: node
   linkType: hard
 
-"@csstools/css-tokenizer@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@csstools/css-tokenizer@npm:2.1.1"
-  checksum: d6ac4b08d7fdfc146755542f00b208af7248efd6cf2eb0f0f7d2ba3583a81f08ed9be6047d78b046925708b5bd0886f487edeeee2f90f0f34030dcbef4122d0e
+"@csstools/media-query-list-parser@npm:^2.1.4, @csstools/media-query-list-parser@npm:^2.1.5":
+  version: 2.1.5
+  resolution: "@csstools/media-query-list-parser@npm:2.1.5"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+  checksum: 119c27951377781c06c0b68ee6f7815c71d7623e439da0d5009f2101a6cd996f60b3fd60466d7059b8f7a936fbc9fbd2306ba953fa2daf9728a710881971ab08
   languageName: node
   linkType: hard
 
-"@csstools/media-query-list-parser@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@csstools/media-query-list-parser@npm:2.1.1"
+"@csstools/postcss-cascade-layers@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/postcss-cascade-layers@npm:4.0.0"
+  dependencies:
+    "@csstools/selector-specificity": ^3.0.0
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
-    "@csstools/css-parser-algorithms": ^2.2.0
-    "@csstools/css-tokenizer": ^2.1.1
-  checksum: bd97737fe92669fa6e26aab0b28a1b82e0bb3992e548bfeb1a45d56007f2a2dfee70c2bb9c2092703680fed505ae1a71254bc0e103f7486bb7724d6c7193fa71
+    postcss: ^8.4
+  checksum: 3bc9369e83a7ac1c017fdaac249de4d2fb9a7c016175352302fe82a2bfd5a0b1cfd352801573bff714b96398495c41593d59a5d77962811c4039ce9f97f300de
   languageName: node
   linkType: hard
 
-"@csstools/postcss-cascade-layers@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "@csstools/postcss-cascade-layers@npm:3.0.1"
+"@csstools/postcss-color-function@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-color-function@npm:3.0.7"
   dependencies:
-    "@csstools/selector-specificity": ^2.0.2
-    postcss-selector-parser: ^6.0.10
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: da39631e23fab33aaaa09f5bf24edc798f3de0fb39358b2bcc771a57a9877db9d63f70e23ba1fc27404fe92457e17a36b8622cecd7120a3c1b7deeb4f9427c1f
+  checksum: 42fd3459b9e7093fb7d5017c6ef7a5a31b75a9fb4cf63aef8b894040e43c3c130fee64f8e478cfb445070c76d6029c9f4dd11c7d8f444aa0d26217369bc4500c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-function@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "@csstools/postcss-color-function@npm:2.2.3"
+"@csstools/postcss-color-mix-function@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@csstools/postcss-color-mix-function@npm:2.0.7"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: 802148d64c943473cd61eae85c4f53357e8972670bfd70c1ad85f3ed5aead6287b9944586a74108f6ea17e4fa4d90435946d875ca43e8fffacd7a9547da579ed
+  checksum: fc46036a73486ad0f3771de214021dc39a841d013eb30a154324f766029a1cbbbc05101d5dd399a296ad1d94e55c0a8b456bd4ba23c6ba0535b153d94a1be9d3
   languageName: node
   linkType: hard
 
-"@csstools/postcss-color-mix-function@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@csstools/postcss-color-mix-function@npm:1.0.3"
+"@csstools/postcss-exponential-functions@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "@csstools/postcss-exponential-functions@npm:1.0.1"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-calc": ^1.1.4
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
   peerDependencies:
     postcss: ^8.4
-  checksum: 865ae0aaab0fa0d40ef3b3c1fa83e45da9a8d42a01d511147fc9f1e9b4a37f1726b38d04a5fa7138ee6392ca8db9856b5c6bd8b84d1582e5caab675d22489818
+  checksum: fc670637e3dfc1394d343bcdaed941e307ba6470b2928ae08c90fa7042ebd0abe0bc007c9fd5bb8a4e20f8fb772d6af271df7588491f91e21681bd2c10a65ef5
   languageName: node
   linkType: hard
 
-"@csstools/postcss-font-format-keywords@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@csstools/postcss-font-format-keywords@npm:2.0.2"
+"@csstools/postcss-font-format-keywords@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-font-format-keywords@npm:3.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: c871440a2ac5b12bec9322fcc0f560e9a0e8d50d9585b1a2ceea3ca56a7903bab43f9754dc3af973ab4bfd0d90ee28998753e010c21287125e134875a052e604
+  checksum: 3a36a11ea871a21442459bb46e8602e2a71d0520309e9fe5e062b544db612bcc9e3df13facfcbe6b5046bb6872aa9c2368dd12371b2ed81bfca5c64c71f5721d
   languageName: node
   linkType: hard
 
-"@csstools/postcss-gradients-interpolation-method@npm:^3.0.6":
-  version: 3.0.6
-  resolution: "@csstools/postcss-gradients-interpolation-method@npm:3.0.6"
+"@csstools/postcss-gamut-mapping@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-gamut-mapping@npm:1.0.0"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": 2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
   peerDependencies:
     postcss: ^8.4
-  checksum: 7403c59e80720e102f0d76ba87dc4894ba02e1fe23d0bf93cbbbf3391a6fbeb24192b6022427f77b425521a90de658e2bd56ce24c299430bc8e1d1a926ee119c
+  checksum: 003f25554d81d053e3f4ab39c6977569d5e5da169a23c92e20c966fd747fa782d9fabdb35af7e6cdef8dd49e390396184a6427ab8de0134bb3d50d82d7e7e533
   languageName: node
   linkType: hard
 
-"@csstools/postcss-hwb-function@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "@csstools/postcss-hwb-function@npm:2.2.2"
+"@csstools/postcss-gradients-interpolation-method@npm:^4.0.7":
+  version: 4.0.7
+  resolution: "@csstools/postcss-gradients-interpolation-method@npm:4.0.7"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: 02cc0d91247667d64840bfd32973d5c99b859176658002a8f66fb78f795d26a757beae5e6876f51f1d9acbb9ef02132dde9b7f4d87ab7543524babc6e17b7d90
+  checksum: 3bdce32d87f465cf91da5bcb0c3a450ef9a909efa747a9d41a8975dade10543a709f3e60f69dff2a4c4085043fb2b5e919d9ed296b4c522211d557edd216fb64
   languageName: node
   linkType: hard
 
-"@csstools/postcss-ic-unit@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "@csstools/postcss-ic-unit@npm:2.0.4"
+"@csstools/postcss-hwb-function@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "@csstools/postcss-hwb-function@npm:3.0.6"
+  dependencies:
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+  peerDependencies:
+    postcss: ^8.4
+  checksum: a8b83fe03438411d47993308df3e595f373170e4807fc8d0e06a27c68bfaae6fa665546950dcabb6adc2bd010d0181dacfeecc77498d69a71570fee60bae73c1
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-ic-unit@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-ic-unit@npm:3.0.2"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 6191228178f39d3ef440aa0b9d91bead801ea16b4842531fe8b3d07736089877753eb1c2063906d6e5c8d86bb1efecb902a3d6d583bd37c5ff0f3a2914e4f370
+  checksum: 29b2e00f81f991709e9a24968dde6e806ad939c161b0cd08538ae1831a0177c7220ab4247c272b49c8eebbbd0999fae9d635f05e688ab509e14cebd22f06a09c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-is-pseudo-class@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "@csstools/postcss-is-pseudo-class@npm:3.2.1"
+"@csstools/postcss-initial@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@csstools/postcss-initial@npm:1.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 21d15759921509ddc78505265bd376854bf2710cdc27f62c138d4ee991581a34bebd8f61f100fd053e0bb95760121f1e1e4dbe61ae41cbef7b3f817e42c35743
+  languageName: node
+  linkType: hard
+
+"@csstools/postcss-is-pseudo-class@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.3"
   dependencies:
-    "@csstools/selector-specificity": ^2.0.0
-    postcss-selector-parser: ^6.0.10
+    "@csstools/selector-specificity": ^3.0.0
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 62c3829405540665545b1fad80bd3fe655b2f2df6e713a121278972af199e5bcd4329a9f0abbcd7576cd61d18bbc2ad05e6c6e4a3dd278c53b45c1ccab64b123
+  checksum: 6e4a957fb8b229b74e1dad5484a0705687e02ed94f6e3e31531ed2b063cfd55b318271478915c924346ea93fa5ded6cc605203f2921dd86812dd03ce805e57f2
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-float-and-clear@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-float-and-clear@npm:1.0.1"
+"@csstools/postcss-logical-float-and-clear@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-float-and-clear@npm:2.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 5184cd62a61cdcf1364364145f638e4c3ffdbde2fe4c154c11404f7e44045b3ed62ea7ff5d7230d89e42417506c1180dc3ab64ad5e8378ac5eb0a9298bbf80d1
+  checksum: 6a1349e180e633e6287927b12bfbde605bc372bca9b35e06aca2d548cb4b2ff040a0ea7f6804f5c89512846eb707429fe4b436c420cc4a7ea7fe5a1a8d76f724
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-resize@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@csstools/postcss-logical-resize@npm:1.0.1"
+"@csstools/postcss-logical-resize@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/postcss-logical-resize@npm:2.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: b19f340d1909249e97cf5557741dabc8a247ae9f7dd6b2e525a3137b6b8f6997a5da83441b20423b17044dff8eafc3c2d33527fabcf3bdf0ebbe04274d3c6caa
+  checksum: 2334309e97876a95fe6cf940b888b59f0896eb5110a11a275ce8b096e85d3b859b71a7e1f3e741c25f171bd3d724986c58845c0770ee21545b6129f591a020ca
   languageName: node
   linkType: hard
 
-"@csstools/postcss-logical-viewport-units@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@csstools/postcss-logical-viewport-units@npm:1.0.3"
+"@csstools/postcss-logical-viewport-units@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@csstools/postcss-logical-viewport-units@npm:2.0.3"
   dependencies:
-    "@csstools/css-tokenizer": ^2.1.1
+    "@csstools/css-tokenizer": ^2.2.1
   peerDependencies:
     postcss: ^8.4
-  checksum: 82819ceeedd94d422bb28dbc7ba49b914d06a605ae2487c6833c0ec6b481c6753e84b46cf476a411e8f993f8b430669dad48230723022d0ee26e04a5b278a687
+  checksum: e7be536b1bbdae949371b8bd1af0a42327f3387cd2e9641fdd181637e3d25036c686e5205d3c218d1c66a03234f958b0b9a8134eb4ace92c4d8a15529c183452
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-minmax@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@csstools/postcss-media-minmax@npm:1.0.4"
+"@csstools/postcss-media-minmax@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@csstools/postcss-media-minmax@npm:1.1.0"
   dependencies:
-    "@csstools/css-calc": ^1.1.1
-    "@csstools/css-parser-algorithms": ^2.2.0
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/media-query-list-parser": ^2.1.1
+    "@csstools/css-calc": ^1.1.4
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/media-query-list-parser": ^2.1.5
   peerDependencies:
     postcss: ^8.4
-  checksum: c278cd4ca774a89069186c59eddc63676b56e184484b2d785727ade8236086856fb1573c7ddb386c3bd78629e20be70a410ac1f11e5d35512e81e29ffabacf38
+  checksum: 9cd9693b08f665a009dd34d0d39257a0032a70787fecc4e5cc47b9621417ebcbafa7135494b63669ce353285d3b6a5e17c3542f3ec4ba760364b487182a89e4f
   languageName: node
   linkType: hard
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:1.0.4"
+"@csstools/postcss-media-queries-aspect-ratio-number-values@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "@csstools/postcss-media-queries-aspect-ratio-number-values@npm:2.0.3"
   dependencies:
-    "@csstools/css-parser-algorithms": ^2.2.0
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/media-query-list-parser": ^2.1.1
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/media-query-list-parser": ^2.1.5
   peerDependencies:
     postcss: ^8.4
-  checksum: 99125a673066ee6119dc25d8aecf7b9ed14a56eba7ae1e18a7aaee596860a35629f45b87d39bfa4f2fafbe505aa29213d7bde9150928d97e628b351b71f3fd00
+  checksum: d6b550abf1c75118da79233ca002932c848e004cb4280748231ec39fc683ba63653a0c772c115f35cb6e5a4ea8167bceeb67f79f33e4f1d4ead302aa1da78e3c
   languageName: node
   linkType: hard
 
-"@csstools/postcss-nested-calc@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@csstools/postcss-nested-calc@npm:2.0.2"
+"@csstools/postcss-nested-calc@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-nested-calc@npm:3.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 028b4e18111456b0a6d5402b64d33567bffbb72bfbd167cecef009352521f4f2d216b3cfd6bbd292e9cae58c921a6e164405203d6569c1ca0002f5db7d4d06d3
+  checksum: 1b9e75d157a9df49a382071f127900fc4ded044ca671ef402b09def584635fcaf225b6fdbb932db37d3a94bb30154be0123b22ae4e1426be4fb9e26bb98d468b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-normalize-display-values@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-normalize-display-values@npm:2.0.1"
+"@csstools/postcss-normalize-display-values@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/postcss-normalize-display-values@npm:3.0.1"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: d67779977bb275467bd5995846501ea08ac42c736f47d2a6e70897592a4d71dcfc30aed28bccc06b6746ebd3a29db621e92120ea43f1756fe02759ded579e255
+  checksum: 895873a7ec7551962fd2c03207b7899cc0f6a575b9bf816de49afff15b28dd751e8cf6fbf2a3bfb8372993309d600b3f35236ddf249a59ecf7c981ec72628305
   languageName: node
   linkType: hard
 
-"@csstools/postcss-oklab-function@npm:^2.2.3":
-  version: 2.2.3
-  resolution: "@csstools/postcss-oklab-function@npm:2.2.3"
+"@csstools/postcss-oklab-function@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@csstools/postcss-oklab-function@npm:3.0.7"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: 978936d235d7db6be310bfb7e64ce840e2b40324b89ba85af65c214ab17dcbcb10608c33e0301d855c53561d4cf5cb0d758681a1b086144a6bebc3c212016deb
+  checksum: d60d2e628c1a49e51c1fa9d074d12b269fc47e58ff443a97dd733cd33209183cb296b7d6baa20236a86dc8043cd303e340a0017574ce8010918f7355584b656b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-progressive-custom-properties@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "@csstools/postcss-progressive-custom-properties@npm:2.3.0"
+"@csstools/postcss-progressive-custom-properties@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-progressive-custom-properties@npm:3.0.2"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 9edcb4e69e3b1b6b2debb8e78a20b71cb1922d7df57a45427062c0ff87e404e4b837bbe3a86ed9cb1ed4fca60514c72cf4e96ec6d77ddc222aca09633bdb7b4c
+  checksum: e7685f1ce7224204619cece0f5c4fe55ece74127c0de54294f827f1bae3be0a4bf4dda49f192267f0069d03942334888f61161bbc62b3ecea3801ec303972361
   languageName: node
   linkType: hard
 
-"@csstools/postcss-relative-color-syntax@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@csstools/postcss-relative-color-syntax@npm:1.0.2"
+"@csstools/postcss-relative-color-syntax@npm:^2.0.7":
+  version: 2.0.7
+  resolution: "@csstools/postcss-relative-color-syntax@npm:2.0.7"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: 2c921094a959384553bab26d7d9feb87a5ee6b2b5f29b447572d1b471433dd5829102fb79a2fb0b0d585deaa050063fbdc43bacbaea1118197b3f7496a13a835
+  checksum: 987d71ef10e93e3f15fd8121db9a8535a2181abde049817ebfa0b99a379c740123236062064efecb30bad009ad47f329cc3b7cac60b5f62b1acec23f2177f09b
   languageName: node
   linkType: hard
 
-"@csstools/postcss-scope-pseudo-class@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@csstools/postcss-scope-pseudo-class@npm:2.0.2"
+"@csstools/postcss-scope-pseudo-class@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-scope-pseudo-class@npm:3.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: cce7b2ca9884f86552da262297cfd7cfe55f0608eabd29446d7da14a678bbf71e0fb7330796ba8828f76ec8b1f73122bf04418195161510e2ee47272daedd53d
+  checksum: 4616dcabf3294beb979004b295beec3f08e5544dca7919668e7befa5d445de9a23f662c395d52cbce153efbb3becdd72006dcdbc6f100a84a35d3bd3ec0542d8
   languageName: node
   linkType: hard
 
-"@csstools/postcss-stepped-value-functions@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@csstools/postcss-stepped-value-functions@npm:2.1.1"
+"@csstools/postcss-stepped-value-functions@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-stepped-value-functions@npm:3.0.2"
   dependencies:
-    "@csstools/css-calc": ^1.1.1
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
+    "@csstools/css-calc": ^1.1.4
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
   peerDependencies:
     postcss: ^8.4
-  checksum: e1499190bb6ece3fd1aa3a29e8faaaf9135114ce405945f7efc54fa8ea9a47bc92755399bc35ad066fa2c3951f694e7143eb3a337a141e9df55f785edf41ea04
+  checksum: 8a15ccfa69bd7ad4f44c1c7c8e9ff3f3c48a315f2a7e65dfe17e1d646d3fdb38b759fc37d9339e5433701c87f9489c20137bc4dedb21c8f4e9f8afec41a6e4e6
   languageName: node
   linkType: hard
 
-"@csstools/postcss-text-decoration-shorthand@npm:^2.2.4":
-  version: 2.2.4
-  resolution: "@csstools/postcss-text-decoration-shorthand@npm:2.2.4"
+"@csstools/postcss-text-decoration-shorthand@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@csstools/postcss-text-decoration-shorthand@npm:3.0.3"
   dependencies:
-    "@csstools/color-helpers": ^2.1.0
+    "@csstools/color-helpers": ^3.0.2
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 540eaa86d48ed5ac7b07d99205cded05f7d2b98652c506660ab91fda56767dbfb262b97cf7ee664243eb5abfe4f87cde58891a66981221c6612df01abac5c3e4
+  checksum: c39e4e7aa275f49c2dc565e606bdecc6605eac3fd46c1bdf551b75674034511c666294f935e203c2e0103f7c422c09ccdbbe1a5c3fb16991072744a963a820ad
   languageName: node
   linkType: hard
 
-"@csstools/postcss-trigonometric-functions@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@csstools/postcss-trigonometric-functions@npm:2.1.1"
+"@csstools/postcss-trigonometric-functions@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "@csstools/postcss-trigonometric-functions@npm:3.0.2"
   dependencies:
-    "@csstools/css-calc": ^1.1.1
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
+    "@csstools/css-calc": ^1.1.4
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
   peerDependencies:
     postcss: ^8.4
-  checksum: 097c606930e0d36e17c06da61e8d076afd3ccbe8e2001c8855dbb0d76e4c41c365873aaf39bd34b23edcc4cfc6b41225701b2e77df40224785fe8b6a51a72517
+  checksum: 314067759cb18725b90ce0ec86d570597dfb63ea4c6b312d62c79cdf64b2b5aad54949b9af2f6a86fd2a75f4a97840454d7edb838048d4426cd25935feac56c0
   languageName: node
   linkType: hard
 
-"@csstools/postcss-unset-value@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "@csstools/postcss-unset-value@npm:2.0.1"
+"@csstools/postcss-unset-value@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/postcss-unset-value@npm:3.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 51fe220dadbdcacda79e4e3ae669ee0099a5af1026f034e8d6789ec3d82704ea1c13522033a6f73304f9ec28bf36c2fcd428d5cdd9b08395caf2c81f8ea379cb
+  checksum: ebd5db2054333f6fdc92992179f3810e2b027f2a90b904845aebf4871494d67615a3e9173cd9415dbd12d9917a5db02f07acb5e5d45acb776932d389eec15205
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^2.0.0, @csstools/selector-specificity@npm:^2.0.1, @csstools/selector-specificity@npm:^2.0.2":
-  version: 2.1.1
-  resolution: "@csstools/selector-specificity@npm:2.1.1"
+"@csstools/selector-specificity@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@csstools/selector-specificity@npm:3.0.0"
   peerDependencies:
-    postcss: ^8.4
-    postcss-selector-parser: ^6.0.10
-  checksum: 392ab62732e93aa8cbea445bf3485c1acbbecc8ec087b200e06c9ddd2acf740fd1fe46abdacf813e7a50a95a60346377ee3eecb4e1fe3709582e2851430b376a
+    postcss-selector-parser: ^6.0.13
+  checksum: 4a2dfe69998a499155d9dab4c2a0e7ae7594d8db98bb8a487d2d5347c0c501655051eb5eacad3fe323c86b0ba8212fe092c27fc883621e6ac2a27662edfc3528
   languageName: node
   linkType: hard
 
-"@datadog/browser-core@npm:4.43.0":
-  version: 4.43.0
-  resolution: "@datadog/browser-core@npm:4.43.0"
-  checksum: 455f04d5ea1bc886a064224803e43bc30f6411f1ed827784d94f9fe07b7c0fedf9f69df67bf8d258d25d3e56b16696a842c77df02df168ddfa855ac5ab56713f
+"@datadog/browser-core@npm:4.50.1":
+  version: 4.50.1
+  resolution: "@datadog/browser-core@npm:4.50.1"
+  checksum: d3581d68b6164e9cd07f7514d79708782209dad9a5746eccdfce3d8f9249c4f496d0ad342f7b96168a89dfdf83551ff80acd6132719832a1decdaf64b4fa0005
   languageName: node
   linkType: hard
 
-"@datadog/browser-logs@npm:^4.43.0":
-  version: 4.43.0
-  resolution: "@datadog/browser-logs@npm:4.43.0"
+"@datadog/browser-logs@npm:^4.50.1":
+  version: 4.50.1
+  resolution: "@datadog/browser-logs@npm:4.50.1"
   dependencies:
-    "@datadog/browser-core": 4.43.0
+    "@datadog/browser-core": 4.50.1
   peerDependencies:
-    "@datadog/browser-rum": 4.43.0
+    "@datadog/browser-rum": 4.50.1
   peerDependenciesMeta:
     "@datadog/browser-rum":
       optional: true
-  checksum: 8b571b0c6e39c8d63940f0120d64c7d88c95b489418ea1d24c4bb917489f92c52f42f5ede33f7b9c5f4aff26629b88729067905b727b547f327d51523b9dfd2e
+  checksum: f43f67f328a9063b63836f38a2f5e30bc11d22316c363c23ad794693f99ecee8d9a22f91c863fabe8f28150a7398f1429d1f39586d2042e1a2b8297503bcf114
   languageName: node
   linkType: hard
 
-"@datadog/browser-rum-core@npm:4.43.0":
-  version: 4.43.0
-  resolution: "@datadog/browser-rum-core@npm:4.43.0"
+"@datadog/browser-rum-core@npm:4.50.1":
+  version: 4.50.1
+  resolution: "@datadog/browser-rum-core@npm:4.50.1"
   dependencies:
-    "@datadog/browser-core": 4.43.0
-  checksum: 3a10e9ae96ae2c48ede30e047c669e97ac3bffe326c4705b0c228744792a717cdc777d2203c4c5580c502a88fb9f1d7dbc3c78479264479ab5d2a58f9cd6119f
+    "@datadog/browser-core": 4.50.1
+  checksum: 3f73524686c030cfcd5ff40bb5e5b4cbcd158239755f6e56713a3e89a3a1e4f7d9315f796f30ea98468c6509231720b0278385a06dc601b9d3bb2e2c9a14b896
   languageName: node
   linkType: hard
 
-"@datadog/browser-rum@npm:^4.43.0":
-  version: 4.43.0
-  resolution: "@datadog/browser-rum@npm:4.43.0"
+"@datadog/browser-rum@npm:^4.50.1":
+  version: 4.50.1
+  resolution: "@datadog/browser-rum@npm:4.50.1"
   dependencies:
-    "@datadog/browser-core": 4.43.0
-    "@datadog/browser-rum-core": 4.43.0
+    "@datadog/browser-core": 4.50.1
+    "@datadog/browser-rum-core": 4.50.1
   peerDependencies:
-    "@datadog/browser-logs": 4.43.0
+    "@datadog/browser-logs": 4.50.1
   peerDependenciesMeta:
     "@datadog/browser-logs":
       optional: true
-  checksum: bfda90d078fd05978f62c7f1cde210b14637876b573feaec976a21cece71c396de16d4554d50221acd220252f7d6e481cb8df753a2a454512512a73ddda6ed46
+  checksum: 202867d39d1e8bfaa64a9a9679d1806052af181951f9091520356e5a22d7c237708d0781adf439e721eff56c3b208480a252cb0e6fbd7bfa820bfa5812a9f880
   languageName: node
   linkType: hard
 
 "@discoveryjs/json-ext@npm:^0.5.0":
-  version: 0.5.2
-  resolution: "@discoveryjs/json-ext@npm:0.5.2"
-  checksum: cf7ce79a6e25944b6618f3336a4f69191ce9019ee08e47129c4933f03f66aa625c0e7d55075f890cdfc9a7f9b3f6c5465a1e51bd3e7a73aec803753d7d0cec91
-  languageName: node
-  linkType: hard
-
-"@emotion/babel-plugin@npm:^11.10.6":
-  version: 11.10.6
-  resolution: "@emotion/babel-plugin@npm:11.10.6"
-  dependencies:
-    "@babel/helper-module-imports": ^7.16.7
-    "@babel/runtime": ^7.18.3
-    "@emotion/hash": ^0.9.0
-    "@emotion/memoize": ^0.8.0
-    "@emotion/serialize": ^1.1.1
-    babel-plugin-macros: ^3.1.0
-    convert-source-map: ^1.5.0
-    escape-string-regexp: ^4.0.0
-    find-root: ^1.1.0
-    source-map: ^0.5.7
-    stylis: 4.1.3
-  checksum: 3eed138932e8edf2598352e69ad949b9db3051a4d6fcff190dacbac9aa838d7ef708b9f3e6c48660625d9311dae82d73477ae4e7a31139feef5eb001a5528421
+  version: 0.5.7
+  resolution: "@discoveryjs/json-ext@npm:0.5.7"
+  checksum: 2176d301cc258ea5c2324402997cf8134ebb212469c0d397591636cea8d3c02f2b3cf9fd58dcb748c7a0dade77ebdc1b10284fa63e608c033a1db52fddc69918
   languageName: node
   linkType: hard
 
@@ -3472,20 +2418,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/cache@npm:^11.10.5, @emotion/cache@npm:^11.4.0":
-  version: 11.10.5
-  resolution: "@emotion/cache@npm:11.10.5"
-  dependencies:
-    "@emotion/memoize": ^0.8.0
-    "@emotion/sheet": ^1.2.1
-    "@emotion/utils": ^1.2.0
-    "@emotion/weak-memoize": ^0.3.0
-    stylis: 4.1.3
-  checksum: 1dd2d9af2d3ecbd3d4469ecdf91a335eef6034c851b57a474471b2d2280613eb35bbed98c0368cc4625f188619fbdaf04cf07e8107aaffce94b2178444c0fe7b
-  languageName: node
-  linkType: hard
-
-"@emotion/cache@npm:^11.11.0":
+"@emotion/cache@npm:^11.11.0, @emotion/cache@npm:^11.4.0":
   version: 11.11.0
   resolution: "@emotion/cache@npm:11.11.0"
   dependencies:
@@ -3507,24 +2440,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/hash@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@emotion/hash@npm:0.9.0"
-  checksum: b63428f7c8186607acdca5d003700cecf0ded519d0b5c5cc3b3154eafcad6ff433f8361bd2bac8882715b557e6f06945694aeb6ba8b25c6095d7a88570e2e0bb
-  languageName: node
-  linkType: hard
-
 "@emotion/hash@npm:^0.9.1":
   version: 0.9.1
   resolution: "@emotion/hash@npm:0.9.1"
-  checksum: 716e17e48bf9047bf9383982c071de49f2615310fb4e986738931776f5a823bc1f29c84501abe0d3df91a3803c80122d24e28b57351bca9e01356ebb33d89876
-  languageName: node
-  linkType: hard
-
-"@emotion/memoize@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@emotion/memoize@npm:0.8.0"
-  checksum: c87bb110b829edd8e1c13b90a6bc37cebc39af29c7599a1e66a48e06f9bec43e8e53495ba86278cc52e7589549492c8dfdc81d19f4fdec0cee6ba13d2ad2c928
+  checksum: 716e17e48bf9047bf9383982c071de49f2615310fb4e986738931776f5a823bc1f29c84501abe0d3df91a3803c80122d24e28b57351bca9e01356ebb33d89876
   languageName: node
   linkType: hard
 
@@ -3535,7 +2454,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/react@npm:11.11.1":
+"@emotion/react@npm:11.11.1, @emotion/react@npm:^11.8.1":
   version: 11.11.1
   resolution: "@emotion/react@npm:11.11.1"
   dependencies:
@@ -3556,40 +2475,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/react@npm:^11.8.1":
-  version: 11.10.6
-  resolution: "@emotion/react@npm:11.10.6"
-  dependencies:
-    "@babel/runtime": ^7.18.3
-    "@emotion/babel-plugin": ^11.10.6
-    "@emotion/cache": ^11.10.5
-    "@emotion/serialize": ^1.1.1
-    "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0
-    "@emotion/utils": ^1.2.0
-    "@emotion/weak-memoize": ^0.3.0
-    hoist-non-react-statics: ^3.3.1
-  peerDependencies:
-    react: ">=16.8.0"
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-  checksum: 4762042e39126ffaffe76052dc65c9bb0ba6b8893013687ba3cc13ed4dd834c31597f1230684c3c078e90aecc13ab6cd0e3cde0dec8b7761affd2571f4d80019
-  languageName: node
-  linkType: hard
-
-"@emotion/serialize@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "@emotion/serialize@npm:1.1.1"
-  dependencies:
-    "@emotion/hash": ^0.9.0
-    "@emotion/memoize": ^0.8.0
-    "@emotion/unitless": ^0.8.0
-    "@emotion/utils": ^1.2.0
-    csstype: ^3.0.2
-  checksum: 24cfd5b16e6f2335c032ca33804a876e0442aaf8f9c94d269d23735ebd194fb1ed142542dd92191a3e6ef8bad5bd560dfc5aaf363a1b70954726dbd4dd93085c
-  languageName: node
-  linkType: hard
-
 "@emotion/serialize@npm:^1.1.2":
   version: 1.1.2
   resolution: "@emotion/serialize@npm:1.1.2"
@@ -3603,13 +2488,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/sheet@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "@emotion/sheet@npm:1.2.1"
-  checksum: ce78763588ea522438156344d9f592203e2da582d8d67b32e1b0b98eaba26994c6c270f8c7ad46442fc9c0a9f048685d819cd73ca87e544520fd06f0e24a1562
-  languageName: node
-  linkType: hard
-
 "@emotion/sheet@npm:^1.2.2":
   version: 1.2.2
   resolution: "@emotion/sheet@npm:1.2.2"
@@ -3617,13 +2495,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/unitless@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "@emotion/unitless@npm:0.8.0"
-  checksum: 176141117ed23c0eb6e53a054a69c63e17ae532ec4210907a20b2208f91771821835f1c63dd2ec63e30e22fcc984026d7f933773ee6526dd038e0850919fae7a
-  languageName: node
-  linkType: hard
-
 "@emotion/unitless@npm:^0.8.1":
   version: 0.8.1
   resolution: "@emotion/unitless@npm:0.8.1"
@@ -3631,15 +2502,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.0"
-  peerDependencies:
-    react: ">=16.8.0"
-  checksum: 4f06a3b48258c832aa8022a262572061a31ff078d377e9164cccc99951309d70f4466e774fe704461b2f8715007a82ed625a54a5c7a127c89017d3ce3187d4f1
-  languageName: node
-  linkType: hard
-
 "@emotion/use-insertion-effect-with-fallbacks@npm:^1.0.1":
   version: 1.0.1
   resolution: "@emotion/use-insertion-effect-with-fallbacks@npm:1.0.1"
@@ -3649,13 +2511,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/utils@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@emotion/utils@npm:1.2.0"
-  checksum: 55457a49ddd4db6a014ea0454dc09eaa23eedfb837095c8ff90470cb26a303f7ceb5fcc1e2190ef64683e64cfd33d3ba3ca3109cd87d12bc9e379e4195c9a4dd
-  languageName: node
-  linkType: hard
-
 "@emotion/utils@npm:^1.2.1":
   version: 1.2.1
   resolution: "@emotion/utils@npm:1.2.1"
@@ -3663,13 +2518,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emotion/weak-memoize@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "@emotion/weak-memoize@npm:0.3.0"
-  checksum: f43ef4c8b7de70d9fa5eb3105921724651e4188e895beb71f0c5919dc899a7b8743e1fdd99d38b9092dd5722c7be2312ebb47fbdad0c4e38bea58f6df5885cc0
-  languageName: node
-  linkType: hard
-
 "@emotion/weak-memoize@npm:^0.3.1":
   version: 0.3.1
   resolution: "@emotion/weak-memoize@npm:0.3.1"
@@ -3677,103 +2525,120 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@es-joy/jsdoccomment@npm:~0.36.1":
-  version: 0.36.1
-  resolution: "@es-joy/jsdoccomment@npm:0.36.1"
+"@es-joy/jsdoccomment@npm:~0.40.1":
+  version: 0.40.1
+  resolution: "@es-joy/jsdoccomment@npm:0.40.1"
   dependencies:
-    comment-parser: 1.3.1
-    esquery: ^1.4.0
-    jsdoc-type-pratt-parser: ~3.1.0
-  checksum: 28e697779230dc6a95b1f233a8c2a72b64fbea686e407106e5d4292083421a997452731c414de26c10bee86e8e0397c5fb84d6ecfd4b472a29735e1af103ddb6
+    comment-parser: 1.4.0
+    esquery: ^1.5.0
+    jsdoc-type-pratt-parser: ~4.0.0
+  checksum: 6098394cd97ad0532dde4f3171980e700e4199c231969311efd2362c2b5a4eefa9d59a0bc1fe513afbb5cc456ef7633491a2984d64252e7bd8ebe22489120610
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0":
-  version: 4.3.0
-  resolution: "@eslint-community/eslint-utils@npm:4.3.0"
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "@eslint-community/eslint-utils@npm:4.4.0"
   dependencies:
     eslint-visitor-keys: ^3.3.0
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-  checksum: f487760a692f0f1fef76e248ad72976919576ba57edc2b1b1dc1d182553bae6b5bf7b078e654da85d04f0af8a485d20bd26280002768f4fbcd2e330078340cb0
+  checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "@eslint-community/regexpp@npm:4.4.0"
-  checksum: 2d127af0c752b80e8a782eacfe996a86925d21de92da3ffc6f9e615e701145e44a62e26bdd88bfac2cd76779c39ba8d9875a91046ec5e7e5f23cb647c247ea6a
+"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+  version: 4.9.1
+  resolution: "@eslint-community/regexpp@npm:4.9.1"
+  checksum: 06fb839e9c756f6375cc545c2f2e05a0a64576bd6370e8e3c07983fd29a3d6e164ef4aa48a361f7d27e6713ab79c83053ff6a2ccb78748bc955e344279c4a3b6
   languageName: node
   linkType: hard
 
-"@eslint/eslintrc@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "@eslint/eslintrc@npm:2.0.3"
+"@eslint/eslintrc@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@eslint/eslintrc@npm:2.1.2"
   dependencies:
     ajv: ^6.12.4
     debug: ^4.3.2
-    espree: ^9.5.2
+    espree: ^9.6.0
     globals: ^13.19.0
     ignore: ^5.2.0
     import-fresh: ^3.2.1
     js-yaml: ^4.1.0
     minimatch: ^3.1.2
     strip-json-comments: ^3.1.1
-  checksum: ddc51f25f8524d8231db9c9bf03177e503d941a332e8d5ce3b10b09241be4d5584a378a529a27a527586bfbccf3031ae539eb891352033c340b012b4d0c81d92
+  checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.41.0":
-  version: 8.41.0
-  resolution: "@eslint/js@npm:8.41.0"
-  checksum: af013d70fe8d0429cdf5cd8b5dcc6fc384ed026c1eccb0cfe30f5849b968ab91645111373fd1b83282b38955b1bdfbe667c1a7dbda3b06cae753521223cad775
+"@eslint/js@npm:8.51.0":
+  version: 8.51.0
+  resolution: "@eslint/js@npm:8.51.0"
+  checksum: 0228bf1e1e0414843e56d9ff362a2a72d579c078f93174666f29315690e9e30a8633ad72c923297f7fd7182381b5a476805ff04dac8debe638953eb1ded3ac73
   languageName: node
   linkType: hard
 
-"@faker-js/faker@npm:7.6.0":
-  version: 7.6.0
-  resolution: "@faker-js/faker@npm:7.6.0"
-  checksum: 942af6221774e8c98a0eb6bc75265e05fb81a941170377666c3439aab9495dd321d6beedc5406f07e6ad44262b3e43c20961f666d116ad150b78e7437dd1bb2b
+"@eslint/js@npm:8.52.0":
+  version: 8.52.0
+  resolution: "@eslint/js@npm:8.52.0"
+  checksum: 490893b8091a66415f4ac98b963d23eb287264ea3bd6af7ec788f0570705cf64fd6ab84b717785980f55e39d08ff5c7fde6d8e4391ccb507169370ce3a6d091a
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@floating-ui/core@npm:1.0.1"
-  checksum: c8a5f1a491788e5bebfe747e9372df2c7cbee0d8790ddf95e25149ac91ccf1a2cca8f768029826cfd3d687617c1d0f3241b97f1648bdf2a28d421f39e79c2eee
+"@faker-js/faker@npm:8.1.0":
+  version: 8.1.0
+  resolution: "@faker-js/faker@npm:8.1.0"
+  checksum: 76036cbad2f0735fe2a2834bb3e16233e7c1aa4998cf90dbd097631465f3fcd4e7022c901f80b6de1c25b47154880f06916609a81dacb039a25f9cb000a3ab4e
+  languageName: node
+  linkType: hard
+
+"@floating-ui/core@npm:^1.4.2":
+  version: 1.5.0
+  resolution: "@floating-ui/core@npm:1.5.0"
+  dependencies:
+    "@floating-ui/utils": ^0.1.3
+  checksum: 54b4fe26b3c228746ac5589f97303abf158b80aa5f8b99027259decd68d1c2030c4c637648ebd33dfe78a4212699453bc2bd7537fd5a594d3bd3e63d362f666f
   languageName: node
   linkType: hard
 
 "@floating-ui/dom@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "@floating-ui/dom@npm:1.0.3"
+  version: 1.5.3
+  resolution: "@floating-ui/dom@npm:1.5.3"
   dependencies:
-    "@floating-ui/core": ^1.0.1
-  checksum: b5e275a8423b1c704b34db3cb12882d9d6e51ca4a789a0adad06b80c86003e1608cefd4e254836a31a985ea6f9458f9633967c7d54416c3dbdc8c75ce8d5b427
+    "@floating-ui/core": ^1.4.2
+    "@floating-ui/utils": ^0.1.3
+  checksum: 00053742064aac70957f0bd5c1542caafb3bfe9716588bfe1d409fef72a67ed5e60450d08eb492a77f78c22ed1ce4f7955873cc72bf9f9caf2b0f43ae3561c21
+  languageName: node
+  linkType: hard
+
+"@floating-ui/utils@npm:^0.1.3":
+  version: 0.1.6
+  resolution: "@floating-ui/utils@npm:0.1.6"
+  checksum: b34d4b5470869727f52e312e08272edef985ba5a450a76de0917ba0a9c6f5df2bdbeb99448e2c60f39b177fb8981c772ff1831424e75123471a27ebd5b52c1eb
   languageName: node
   linkType: hard
 
-"@formatjs/cli@npm:6.1.3":
-  version: 6.1.3
-  resolution: "@formatjs/cli@npm:6.1.3"
+"@formatjs/cli@npm:6.2.1":
+  version: 6.2.1
+  resolution: "@formatjs/cli@npm:6.2.1"
   peerDependencies:
-    "@vue/compiler-sfc": ^3.2.34
+    vue: ^3.3.4
   peerDependenciesMeta:
-    "@vue/compiler-sfc":
+    vue:
       optional: true
   bin:
     formatjs: bin/formatjs
-  checksum: 118dbc4ad1e547298bef57763f51cb1ae9c3bddc734ebe7ebc5dfe5b8625dcb9a9d98873aff38ac9d27e4858a3bab19dc2a7088e195e3ec60c1b0a06840123ce
+  checksum: 60404e080f21eb87972007524a3c79ffb5c76509986247e5351bcb5e3fc3c7f88dbbd7bdb8e2986d26734659bc06ad0a5b0498e4c0928ea3e74da30eeabc060b
   languageName: node
   linkType: hard
 
-"@formatjs/ecma402-abstract@npm:1.17.0":
-  version: 1.17.0
-  resolution: "@formatjs/ecma402-abstract@npm:1.17.0"
+"@formatjs/ecma402-abstract@npm:1.17.2":
+  version: 1.17.2
+  resolution: "@formatjs/ecma402-abstract@npm:1.17.2"
   dependencies:
-    "@formatjs/intl-localematcher": 0.4.0
+    "@formatjs/intl-localematcher": 0.4.2
     tslib: ^2.4.0
-  checksum: cc45d238e541076cb27b9cf02d8b97f789d1744b60218da6d31793204850c159e85f5b2557de3905a365eefd52a1c2e7f1febb9e1f009bad23d5eca17b3de6c8
+  checksum: 026382b1fb295cef4387b2f2a34dace107b12fb7607793093b26595b0d639a30e5f4539665730897eb77eefabee2bb35c156896c63925b0ec03b746751e3fb00
   languageName: node
   linkType: hard
 
@@ -3786,93 +2651,106 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@formatjs/icu-messageformat-parser@npm:2.6.0":
-  version: 2.6.0
-  resolution: "@formatjs/icu-messageformat-parser@npm:2.6.0"
+"@formatjs/icu-messageformat-parser@npm:2.7.0":
+  version: 2.7.0
+  resolution: "@formatjs/icu-messageformat-parser@npm:2.7.0"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
-    "@formatjs/icu-skeleton-parser": 1.6.0
+    "@formatjs/ecma402-abstract": 1.17.2
+    "@formatjs/icu-skeleton-parser": 1.6.2
     tslib: ^2.4.0
-  checksum: 67e76416a381663f62cb7ceaa699b3dc4505b9bfd8dda31950b8fa159e9abc1aae85d2ffa08760448083f113bdabca1653796e988b7a12eef891260726e56ed7
+  checksum: 5c289b0090a3549fdeb5ee4c382666cf085be77c8a10abcee879e12e064126ec803a48d7f564a3cb5baf4529ef5fde3a61b30f9c54481279f0fb2cf2e9be1e7e
   languageName: node
   linkType: hard
 
-"@formatjs/icu-skeleton-parser@npm:1.6.0":
-  version: 1.6.0
-  resolution: "@formatjs/icu-skeleton-parser@npm:1.6.0"
+"@formatjs/icu-skeleton-parser@npm:1.6.2":
+  version: 1.6.2
+  resolution: "@formatjs/icu-skeleton-parser@npm:1.6.2"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
+    "@formatjs/ecma402-abstract": 1.17.2
     tslib: ^2.4.0
-  checksum: e0a2e251358fb62cc45ad4783f57ed63db361334634557d5dcf3992b98c2c5409146d890b465321f91d2255eda5d8fdbfc9962e9f2e3fa7b10a738abfbe8ebc0
+  checksum: f51658d0b086579a2173b91beb692822f08db1180c81fa41e62bef4236a0de98f9d6e46087d77c5e46fa4286f77b4b52a2467f3d8b81a4cf8dd817edb138d68b
   languageName: node
   linkType: hard
 
-"@formatjs/intl-displaynames@npm:6.5.0":
-  version: 6.5.0
-  resolution: "@formatjs/intl-displaynames@npm:6.5.0"
+"@formatjs/intl-displaynames@npm:6.6.1":
+  version: 6.6.1
+  resolution: "@formatjs/intl-displaynames@npm:6.6.1"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
-    "@formatjs/intl-localematcher": 0.4.0
+    "@formatjs/ecma402-abstract": 1.17.2
+    "@formatjs/intl-localematcher": 0.4.2
     tslib: ^2.4.0
-  checksum: d071f8459796240575e9911052b7116a6e2e43687607b0a5d1ac8ceddbaa85324af78694226c37c8172c0f3e7d6b793f506c5758b6bc50b2110516902b532e12
+  checksum: e70c18f5f6228fbf937434c9168eac4d42c7f115410b42b66785ba43db4604184849d9e55b76ca4ce116359fec645b5e41e06b036dcb0966387c19753970c8e5
   languageName: node
   linkType: hard
 
-"@formatjs/intl-listformat@npm:7.4.0":
-  version: 7.4.0
-  resolution: "@formatjs/intl-listformat@npm:7.4.0"
+"@formatjs/intl-listformat@npm:7.5.0":
+  version: 7.5.0
+  resolution: "@formatjs/intl-listformat@npm:7.5.0"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
-    "@formatjs/intl-localematcher": 0.4.0
+    "@formatjs/ecma402-abstract": 1.17.2
+    "@formatjs/intl-localematcher": 0.4.2
     tslib: ^2.4.0
-  checksum: a2deed31cce57f249e470f54675286c36edc2f5ec1d63a2f36e6315a0154ca06404fa5c00aaefc2c52af57d3d471b17c217e885cc9565e5f54c36509af37fe12
+  checksum: 55de558bc7981a0ad442dada2500f369ad05176e7a997cf6ac502b8d446b2ae339477360219553c05d3fce7526823620866d1ba06d4006a00f4712aead5335ab
   languageName: node
   linkType: hard
 
-"@formatjs/intl-localematcher@npm:0.4.0":
-  version: 0.4.0
-  resolution: "@formatjs/intl-localematcher@npm:0.4.0"
+"@formatjs/intl-localematcher@npm:0.4.2":
+  version: 0.4.2
+  resolution: "@formatjs/intl-localematcher@npm:0.4.2"
   dependencies:
     tslib: ^2.4.0
-  checksum: c65108e9a81c3733d2b6240ceedc846d0ae59c3606041cb5cc71c13453cdabe295b0dc8559dc4a8acaafdc45876807bd5e9ef37a3ec1cb864e78db655d434b66
+  checksum: df579d8c453a11eed1ec55604f8dda121d728fc5109ed885892347a126089caef95a0edf71f1f6db3134bb9e73787062995baf7746a2577e8ca2980dcd6590cb
   languageName: node
   linkType: hard
 
-"@formatjs/intl@npm:2.9.0":
-  version: 2.9.0
-  resolution: "@formatjs/intl@npm:2.9.0"
+"@formatjs/intl@npm:2.9.5":
+  version: 2.9.5
+  resolution: "@formatjs/intl@npm:2.9.5"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
+    "@formatjs/ecma402-abstract": 1.17.2
     "@formatjs/fast-memoize": 2.2.0
-    "@formatjs/icu-messageformat-parser": 2.6.0
-    "@formatjs/intl-displaynames": 6.5.0
-    "@formatjs/intl-listformat": 7.4.0
-    intl-messageformat: 10.5.0
+    "@formatjs/icu-messageformat-parser": 2.7.0
+    "@formatjs/intl-displaynames": 6.6.1
+    "@formatjs/intl-listformat": 7.5.0
+    intl-messageformat: 10.5.4
     tslib: ^2.4.0
   peerDependencies:
-    typescript: ^4.7 || 5
+    typescript: 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 8cd9c9a86ec79148d6e42ace85abbf39e0580a821a6a2d9edceeed3248d439a5f204d988ed714bef92933843a069ee910ed19675d77d60c0472e343dbe610bf4
+  checksum: 12f6ac51a6630a967dc2a446eab6bf2e1c046aa2a693c550c2fa594bcb095cecf2e38efcc1e07611261c00ffa58a2372d16460e4716fac073fc1b54d302e2520
   languageName: node
   linkType: hard
 
-"@gar/promisify@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "@gar/promisify@npm:1.1.3"
-  checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1
+"@gulpjs/to-absolute-glob@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@gulpjs/to-absolute-glob@npm:4.0.0"
+  dependencies:
+    is-negated-glob: ^1.0.0
+  checksum: 30ec7825064422b6f02c1975ab6c779ff73409411c37bec2e984262459935afd196c1dbe960075e914967a047743ccf726fce3d3ebb4417ca2e3c34538fbceb8
   languageName: node
   linkType: hard
 
-"@humanwhocodes/config-array@npm:^0.11.8":
-  version: 0.11.8
-  resolution: "@humanwhocodes/config-array@npm:0.11.8"
+"@humanwhocodes/config-array@npm:^0.11.11":
+  version: 0.11.11
+  resolution: "@humanwhocodes/config-array@npm:0.11.11"
   dependencies:
     "@humanwhocodes/object-schema": ^1.2.1
     debug: ^4.1.1
     minimatch: ^3.0.5
-  checksum: 0fd6b3c54f1674ce0a224df09b9c2f9846d20b9e54fabae1281ecfc04f2e6ad69bf19e1d6af6a28f88e8aa3990168b6cb9e1ef755868c3256a630605ec2cb1d3
+  checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19
+  languageName: node
+  linkType: hard
+
+"@humanwhocodes/config-array@npm:^0.11.13":
+  version: 0.11.13
+  resolution: "@humanwhocodes/config-array@npm:0.11.13"
+  dependencies:
+    "@humanwhocodes/object-schema": ^2.0.1
+    debug: ^4.1.1
+    minimatch: ^3.0.5
+  checksum: f8ea57b0d7ed7f2d64cd3944654976829d9da91c04d9c860e18804729a33f7681f78166ef4c761850b8c324d362f7d53f14c5c44907a6b38b32c703ff85e4805
   languageName: node
   linkType: hard
 
@@ -3890,6 +2768,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@humanwhocodes/object-schema@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@humanwhocodes/object-schema@npm:2.0.1"
+  checksum: 24929487b1ed48795d2f08346a0116cc5ee4634848bce64161fb947109352c562310fd159fc64dda0e8b853307f5794605191a9547f7341158559ca3c8262a45
+  languageName: node
+  linkType: hard
+
+"@isaacs/cliui@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "@isaacs/cliui@npm:8.0.2"
+  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"
+  checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb
+  languageName: node
+  linkType: hard
+
 "@istanbuljs/load-nyc-config@npm:^1.0.0":
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -3904,56 +2803,56 @@ __metadata:
   linkType: hard
 
 "@istanbuljs/schema@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "@istanbuljs/schema@npm:0.1.2"
-  checksum: 5ce9facf2f0e3f4a93e56853cdfd78456e22d2c210c677530046e9c634ddc323dd62423ac711cd3554b5be06052c87fb8e0c266aa9010726940654c357290e78
+  version: 0.1.3
+  resolution: "@istanbuljs/schema@npm:0.1.3"
+  checksum: 5282759d961d61350f33d9118d16bcaed914ebf8061a52f4fa474b2cb08720c9c81d165e13b82f2e5a8a212cc5af482f0c6fc1ac27b9e067e5394c9a6ed186c9
   languageName: node
   linkType: hard
 
-"@jest/console@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/console@npm:29.5.0"
+"@jest/console@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/console@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
-    jest-message-util: ^29.5.0
-    jest-util: ^29.5.0
+    jest-message-util: ^29.7.0
+    jest-util: ^29.7.0
     slash: ^3.0.0
-  checksum: 9f4f4b8fabd1221361b7f2e92d4a90f5f8c2e2b29077249996ab3c8b7f765175ffee795368f8d6b5b2bb3adb32dc09319f7270c7c787b0d259e624e00e0f64a5
+  checksum: 0e3624e32c5a8e7361e889db70b170876401b7d70f509a2538c31d5cd50deb0c1ae4b92dc63fe18a0902e0a48c590c21d53787a0df41a52b34fa7cab96c384d6
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/core@npm:29.5.0"
+"@jest/core@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/core@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/reporters": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
-    jest-config: ^29.5.0
-    jest-haste-map: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-resolve-dependencies: ^29.5.0
-    jest-runner: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
-    jest-watcher: ^29.5.0
+    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.5.0
+    pretty-format: ^29.7.0
     slash: ^3.0.0
     strip-ansi: ^6.0.0
   peerDependencies:
@@ -3961,77 +2860,77 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 9e8f5243fe82d5a57f3971e1b96f320058df7c315328a3a827263f3b17f64be10c80f4a9c1b1773628b64d2de6d607c70b5b2d5bf13e7f5ad04223e9ef6aac06
+  checksum: af759c9781cfc914553320446ce4e47775ae42779e73621c438feb1e4231a5d4862f84b1d8565926f2d1aab29b3ec3dcfdc84db28608bdf5f29867124ebcfc0d
   languageName: node
   linkType: hard
 
-"@jest/environment@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/environment@npm:29.5.0"
+"@jest/environment@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/environment@npm:29.7.0"
   dependencies:
-    "@jest/fake-timers": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.5.0
-  checksum: 921de6325cd4817dec6685e5ff299b499b6379f3f9cf489b4b13588ee1f3820a0c77b49e6a087996b6de8f629f6f5251e636cba08d1bdb97d8071cc7d033c88a
+    jest-mock: ^29.7.0
+  checksum: 6fb398143b2543d4b9b8d1c6dbce83fa5247f84f550330604be744e24c2bd2178bb893657d62d1b97cf2f24baf85c450223f8237cccb71192c36a38ea2272934
   languageName: node
   linkType: hard
 
-"@jest/expect-utils@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/expect-utils@npm:29.5.0"
+"@jest/expect-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect-utils@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.4.3
-  checksum: c46fb677c88535cf83cf29f0a5b1f376c6a1109ddda266ad7da1a9cbc53cb441fa402dd61fc7b111ffc99603c11a9b3357ee41a1c0e035a58830bcb360871476
+    jest-get-type: ^29.6.3
+  checksum: 75eb177f3d00b6331bcaa057e07c0ccb0733a1d0a1943e1d8db346779039cb7f103789f16e502f888a3096fb58c2300c38d1f3748b36a7fa762eb6f6d1b160ed
   languageName: node
   linkType: hard
 
-"@jest/expect@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/expect@npm:29.5.0"
+"@jest/expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/expect@npm:29.7.0"
   dependencies:
-    expect: ^29.5.0
-    jest-snapshot: ^29.5.0
-  checksum: bd10e295111547e6339137107d83986ab48d46561525393834d7d2d8b2ae9d5626653f3f5e48e5c3fa742ac982e97bdf1f541b53b9e1d117a247b08e938527f6
+    expect: ^29.7.0
+    jest-snapshot: ^29.7.0
+  checksum: a01cb85fd9401bab3370618f4b9013b90c93536562222d920e702a0b575d239d74cecfe98010aaec7ad464f67cf534a353d92d181646a4b792acaa7e912ae55e
   languageName: node
   linkType: hard
 
-"@jest/fake-timers@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/fake-timers@npm:29.5.0"
+"@jest/fake-timers@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/fake-timers@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@sinonjs/fake-timers": ^10.0.2
     "@types/node": "*"
-    jest-message-util: ^29.5.0
-    jest-mock: ^29.5.0
-    jest-util: ^29.5.0
-  checksum: 69930c6922341f244151ec0d27640852ec96237f730fc024da1f53143d31b43cde75d92f9d8e5937981cdce3b31416abc3a7090a0d22c2377512c4a6613244ee
+    jest-message-util: ^29.7.0
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
+  checksum: caf2bbd11f71c9241b458d1b5a66cbe95debc5a15d96442444b5d5c7ba774f523c76627c6931cca5e10e76f0d08761f6f1f01a608898f4751a0eee54fc3d8d00
   languageName: node
   linkType: hard
 
-"@jest/globals@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/globals@npm:29.5.0"
+"@jest/globals@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/globals@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/expect": ^29.5.0
-    "@jest/types": ^29.5.0
-    jest-mock: ^29.5.0
-  checksum: b309ab8f21b571a7c672608682e84bbdd3d2b554ddf81e4e32617fec0a69094a290ab42e3c8b2c66ba891882bfb1b8b2736720ea1285b3ad646d55c2abefedd9
+    "@jest/environment": ^29.7.0
+    "@jest/expect": ^29.7.0
+    "@jest/types": ^29.6.3
+    jest-mock: ^29.7.0
+  checksum: 97dbb9459135693ad3a422e65ca1c250f03d82b2a77f6207e7fa0edd2c9d2015fbe4346f3dc9ebff1678b9d8da74754d4d440b7837497f8927059c0642a22123
   languageName: node
   linkType: hard
 
-"@jest/reporters@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/reporters@npm:29.5.0"
+"@jest/reporters@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/reporters@npm:29.7.0"
   dependencies:
     "@bcoe/v8-coverage": ^0.2.3
-    "@jest/console": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
-    "@jridgewell/trace-mapping": ^0.3.15
+    "@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
@@ -4039,13 +2938,13 @@ __metadata:
     glob: ^7.1.3
     graceful-fs: ^4.2.9
     istanbul-lib-coverage: ^3.0.0
-    istanbul-lib-instrument: ^5.1.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.5.0
-    jest-util: ^29.5.0
-    jest-worker: ^29.5.0
+    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
@@ -4055,532 +2954,521 @@ __metadata:
   peerDependenciesMeta:
     node-notifier:
       optional: true
-  checksum: 481268aac9a4a75cc49c4df1273d6b111808dec815e9d009dad717c32383ebb0cebac76e820ad1ab44e207540e1c2fe1e640d44c4f262de92ab1933e057fdeeb
+  checksum: 7eadabd62cc344f629024b8a268ecc8367dba756152b761bdcb7b7e570a3864fc51b2a9810cd310d85e0a0173ef002ba4528d5ea0329fbf66ee2a3ada9c40455
   languageName: node
   linkType: hard
 
-"@jest/schemas@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "@jest/schemas@npm:29.4.3"
+"@jest/schemas@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/schemas@npm:29.6.3"
   dependencies:
-    "@sinclair/typebox": ^0.25.16
-  checksum: ac754e245c19dc39e10ebd41dce09040214c96a4cd8efa143b82148e383e45128f24599195ab4f01433adae4ccfbe2db6574c90db2862ccd8551a86704b5bebd
+    "@sinclair/typebox": ^0.27.8
+  checksum: 910040425f0fc93cd13e68c750b7885590b8839066dfa0cd78e7def07bbb708ad869381f725945d66f2284de5663bbecf63e8fdd856e2ae6e261ba30b1687e93
   languageName: node
   linkType: hard
 
-"@jest/source-map@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "@jest/source-map@npm:29.4.3"
+"@jest/source-map@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/source-map@npm:29.6.3"
   dependencies:
-    "@jridgewell/trace-mapping": ^0.3.15
+    "@jridgewell/trace-mapping": ^0.3.18
     callsites: ^3.0.0
     graceful-fs: ^4.2.9
-  checksum: 2301d225145f8123540c0be073f35a80fd26a2f5e59550fd68525d8cea580fb896d12bf65106591ffb7366a8a19790076dbebc70e0f5e6ceb51f81827ed1f89c
+  checksum: bcc5a8697d471396c0003b0bfa09722c3cd879ad697eb9c431e6164e2ea7008238a01a07193dfe3cbb48b1d258eb7251f6efcea36f64e1ebc464ea3c03ae2deb
   languageName: node
   linkType: hard
 
-"@jest/test-result@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/test-result@npm:29.5.0"
+"@jest/test-result@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-result@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/console": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/istanbul-lib-coverage": ^2.0.0
     collect-v8-coverage: ^1.0.0
-  checksum: 2e8ff5242227ab960c520c3ea0f6544c595cc1c42fa3873c158e9f4f685f4ec9670ec08a4af94ae3885c0005a43550a9595191ffbc27a0965df27d9d98bbf901
+  checksum: 67b6317d526e335212e5da0e768e3b8ab8a53df110361b80761353ad23b6aea4432b7c5665bdeb87658ea373b90fb1afe02ed3611ef6c858c7fba377505057fa
   languageName: node
   linkType: hard
 
-"@jest/test-sequencer@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/test-sequencer@npm:29.5.0"
+"@jest/test-sequencer@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/test-sequencer@npm:29.7.0"
   dependencies:
-    "@jest/test-result": ^29.5.0
+    "@jest/test-result": ^29.7.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.5.0
+    jest-haste-map: ^29.7.0
     slash: ^3.0.0
-  checksum: eca34b4aeb2fda6dfb7f9f4b064c858a7adf64ec5c6091b6f4ed9d3c19549177cbadcf1c615c4c182688fa1cf085c8c55c3ca6eea40719a34554b0bf071d842e
+  checksum: 73f43599017946be85c0b6357993b038f875b796e2f0950487a82f4ebcb115fa12131932dd9904026b4ad8be131fe6e28bd8d0aa93b1563705185f9804bff8bd
   languageName: node
   linkType: hard
 
-"@jest/transform@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/transform@npm:29.5.0"
+"@jest/transform@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "@jest/transform@npm:29.7.0"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/types": ^29.5.0
-    "@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.5.0
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.5.0
+    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.2
-  checksum: d55d604085c157cf5112e165ff5ac1fa788873b3b31265fb4734ca59892ee24e44119964cc47eb6d178dd9512bbb6c576d1e20e51a201ff4e24d31e818a1c92d
+  checksum: 0f8ac9f413903b3cb6d240102db848f2a354f63971ab885833799a9964999dd51c388162106a807f810071f864302cdd8e3f0c241c29ce02d85a36f18f3f40ab
   languageName: node
   linkType: hard
 
-"@jest/types@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "@jest/types@npm:29.5.0"
+"@jest/types@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "@jest/types@npm:29.6.3"
   dependencies:
-    "@jest/schemas": ^29.4.3
+    "@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
-  checksum: 1811f94b19cf8a9460a289c4f056796cfc373480e0492692a6125a553cd1a63824bd846d7bb78820b7b6f758f6dd3c2d4558293bb676d541b2fa59c70fdf9d39
+  checksum: a0bcf15dbb0eca6bdd8ce61a3fb055349d40268622a7670a3b2eb3c3dbafe9eb26af59938366d520b86907b9505b0f9b29b85cec11579a9e580694b87cd90fcc
   languageName: node
   linkType: hard
 
-"@jimp/bmp@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/bmp@npm:0.22.8"
+"@jimp/bmp@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/bmp@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     bmp-js: ^0.1.0
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: a659c08308df9c2809ba9a925f399b8e203bc59c60bfa5a11463f25c7f4a28e63a86a3ef63481d526ba23cbd527f4f48774df23abd643636f8a3ee6354b1842e
+  checksum: 33ab7e686331082e38c1ba0e214a62377d8bb9dd816b5c100f1f92c6d9a4e30cc62b2636da6ff2625d8af27a0421d88757d9c56f6a9bf00b31f1b0ca7110ab9d
   languageName: node
   linkType: hard
 
-"@jimp/core@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/core@npm:0.22.8"
+"@jimp/core@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/core@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     any-base: ^1.1.0
     buffer: ^5.2.0
     exif-parser: ^0.1.12
     file-type: ^16.5.4
     isomorphic-fetch: ^3.0.0
-    mkdirp: ^2.1.3
     pixelmatch: ^4.0.2
     tinycolor2: ^1.6.0
-  checksum: 086d80ca5a5c6100abfcc850685d34b5e14024997a1c5f2491beafa8464310289e88b8b4296a24e70934b4162599eb3a9100db7dd9ff992a13319b4c92924186
+  checksum: 88d16bb4411d2a1f39d706d69be9f4ad2dcdb9d8b289a98e401e3896a628fd5f440288e14c0f6f5dd100d5b786df2050784f91a01db032dae1442ecc57ed052e
   languageName: node
   linkType: hard
 
-"@jimp/custom@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/custom@npm:0.22.8"
+"@jimp/custom@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/custom@npm:0.22.10"
   dependencies:
-    "@jimp/core": ^0.22.8
-  checksum: d6f1529304813dfe8bf8262751ba0deed90689b1013198dc0ce5d89b729132dd227a02dc54015415dd554ae17ba8e72e5d1583f1c0b551640c836a4e71482788
+    "@jimp/core": ^0.22.10
+  checksum: e9a2dfefcf793f0c2da86ee71eafa33d8b5185bf7ae3711400bd979e60ecde2db57f1544c307ab5589712d67212b93238d0e0962a7080aea4de667e2936fa7dc
   languageName: node
   linkType: hard
 
-"@jimp/gif@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/gif@npm:0.22.8"
+"@jimp/gif@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/gif@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
-    gifwrap: ^0.9.2
+    "@jimp/utils": ^0.22.10
+    gifwrap: ^0.10.1
     omggif: ^1.0.9
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 449e62ec0be4f0a4984e8ad313d60e9eb42b6c4dfd598fbd3d71e571a99d5b013c2117d356967989d39d1d2788ba4c50cc7cd7e52de13af988c568c86f226a86
+  checksum: 7a3c5f49590d90aac4b8bfc05d01410f4e25a0223c55df31e1736a9aac375a8dd9b4e0833c379ed1c52bec229bf3728c0cf3729c56a94918d4c105f519bc9138
   languageName: node
   linkType: hard
 
-"@jimp/jpeg@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/jpeg@npm:0.22.8"
+"@jimp/jpeg@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/jpeg@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     jpeg-js: ^0.4.4
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: e8982da362c3a5f44ffc21953a7418b8b5934079f1b7499531ad275c5430d826d6b2d63bfa4a24cf7de1c9be07e2ba6ded00548cfb948ac01cd066bdf2e432f2
+  checksum: 60ae140919a5dd1f4afcf712ae999ccdefb5cb9d728c6348bdd9bee3cd75e7be1a5e83b80b5877d0c6c7432b8f6ff57d7246dfa0ab41c3b56c87b7ca8bb30053
   languageName: node
   linkType: hard
 
-"@jimp/plugin-blit@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-blit@npm:0.22.8"
+"@jimp/plugin-blit@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-blit@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: b4fb17f84bb9853875e444fd4c93602a936894647adf100b795ddb66b549fe6656bfaa309d659020f1bcde6c0078999a3a4adcb1e316e857fa1de6813cb960d8
+  checksum: dda546548e626dc664234cb45e7ab2216fb24b3b15a5bf3f29cc9e08cb588c286dae11a07f4c1d96da9322640b82547b65ba1093d7425cdb687b2cfcfb228744
   languageName: node
   linkType: hard
 
-"@jimp/plugin-blur@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-blur@npm:0.22.8"
+"@jimp/plugin-blur@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-blur@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: c699eee62a076770d7b5aac7c93fe051822c498f8f39788c7129408dcdaddaa6d59bdb7e58a5dbafd957aa04e12a74e3ab51ae463b7f162d118c60c10971e86b
+  checksum: 49fbb2094512c9229e448e921ae393dead0287d1c19549b37da4acc3c1fe7b5832d91064e0c5cf585d1acdb55c5ed404ef5f5c516549fb4f160e6926ad8720cf
   languageName: node
   linkType: hard
 
-"@jimp/plugin-circle@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-circle@npm:0.22.8"
+"@jimp/plugin-circle@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-circle@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: fcea7bd7d0d7210b7841d09b9f85160c272462173ed1c83e518d56acbf19f6bb93807b6445d75b2f8386dd8b39baee994b3736315bab0c5fcdc2da4ee9dc8981
+  checksum: 117813b226c13fe7372dcb899d4c5eefa5cd2ce9b3fe2449958f27285f341560d02a2bf3c1ff772703f15d2cc706817a6b6ce6d21ca2812fded5585ebc746d48
   languageName: node
   linkType: hard
 
-"@jimp/plugin-color@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-color@npm:0.22.8"
+"@jimp/plugin-color@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-color@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     tinycolor2: ^1.6.0
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 9ff6b1ddf650dc3e88aedb35a4c8de9a6635671cf2e49f7ed177737e477758c0e401b1fb8a60e6b580c728d9c033d81b8662b983f5ad1ff6418a241c623f4815
+  checksum: 5fb9a9a0393ece7833145e19270fbafc19b43a90c4ff7c5ee20caab535aff3b52d92e0bc5884a27608ae8aef62b5a0f56fc3e2121e398eae3fa850bd74e4f54d
   languageName: node
   linkType: hard
 
-"@jimp/plugin-contain@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-contain@npm:0.22.8"
+"@jimp/plugin-contain@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-contain@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-blit": ">=0.3.5"
     "@jimp/plugin-resize": ">=0.3.5"
     "@jimp/plugin-scale": ">=0.3.5"
-  checksum: ddd6cd9be69896ba47197e51414ce20ec51739ac0b69d431fdd462e0c6e925b853e9309c32ed13768b5feb7ddf6abda9fe7049d2db6a0a5104e5d647b18f26c1
+  checksum: 8bc652738441b3d387cdc3be429549a27ff0294eb2d2d933dfdca5502dc1b08ab90514e012c8639f7ca020270277cb7ba68a4ceaf799392d6088c64790a8ca9b
   languageName: node
   linkType: hard
 
-"@jimp/plugin-cover@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-cover@npm:0.22.8"
+"@jimp/plugin-cover@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-cover@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-crop": ">=0.3.5"
     "@jimp/plugin-resize": ">=0.3.5"
     "@jimp/plugin-scale": ">=0.3.5"
-  checksum: e765709131f8ddba304316a6addfd9ee17577c676756d39607180cec12b0793b06692b3b92c53141694071643d9f9439bcb24f4aaca15083d69b1a0513b9f16c
+  checksum: 61607f4b61efeabefc9b5674bf5f6222140b9e4a41d23fba3e42d98cadd516c877274f63c1a2ba2dfba18f3f8ece6fa4ad3dcea881698e19ce2bf58d4094b46b
   languageName: node
   linkType: hard
 
-"@jimp/plugin-crop@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-crop@npm:0.22.8"
+"@jimp/plugin-crop@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-crop@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 1508a9254d5429c355aecadb469cdcc2c74776d0576cebf28861895f85f8c7a708562467ede0660118a01713f91d9c78781b31d2a287e90ee61e6bf6ce4bba33
+  checksum: d5f70b478afd31c257aa32038623bfabae647a7e2d2958be9f6487b5b556b8fcc7b1a3f51d170f7e83198720ae6709a345f7f66c38cb662e375dba4fa96c3999
   languageName: node
   linkType: hard
 
-"@jimp/plugin-displace@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-displace@npm:0.22.8"
+"@jimp/plugin-displace@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-displace@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 152ab9da8a8d9e7052bf7f27e7a47952a5d97120d470038fd31334050975eb7a8b2edd50db8e610def4a8c88daf2fe1d5d632f74f91fa1fba7b803d0f44b556d
+  checksum: 6121375b5ef723f7d6dbb400f0f1c303b009f97761bcb75df23818dfeb29ca58794d08f6feeb0edbaf5fcc4e7623a76d1e11a34dafaaa65721349093d288086e
   languageName: node
   linkType: hard
 
-"@jimp/plugin-dither@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-dither@npm:0.22.8"
+"@jimp/plugin-dither@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-dither@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 988b126d2255c390f9df3b384aa5209e127a0f3004ecd06328ac2a7118b79ffc706ffdc541cd3c5814d68806a4fd77f568385ef623b1b92ec7ea7b4c398383f8
+  checksum: 91453f7bd289a85946267c99173a841e71bdb77d12497d3bb6b423e606a24048bdc777b40602fc62b270d877c467fd23ab863e47b7fd63124020ddf0893538d5
   languageName: node
   linkType: hard
 
-"@jimp/plugin-fisheye@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-fisheye@npm:0.22.8"
+"@jimp/plugin-fisheye@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-fisheye@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 2f20c2db61674525bf189f6d7c8818603114cdac2f02e9d5c5e78af1cb03ba72660c04be527ff871bc9e2808ac357cf0b6615cfa8ac9fc93f9a96b4fb9548092
+  checksum: dee2350a1eaa98bb9f49e1706f064c85abca8880a718cf3b151e5beb17df9f52045f1aadbb9b591aa7abdfe3108b516a6a0677ff191e968dd3ed206c371edd4b
   languageName: node
   linkType: hard
 
-"@jimp/plugin-flip@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-flip@npm:0.22.8"
+"@jimp/plugin-flip@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-flip@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-rotate": ">=0.3.5"
-  checksum: 9e2a8757e3c36b39b06773da68390b7234054eac2b6705430bfdf626b791517b851d7671c34889f1310727948458dd9daab6c3a9d8b0d7136dfe824ad50acd0e
+  checksum: ef3371ba34fade4d48587b442dbb850dff73caa51f4de5ba4a96dea1ab9efe26a1d854fa6605f55f8fae55bedc9797a64bc12be0dfb3d0872d421656457fc34c
   languageName: node
   linkType: hard
 
-"@jimp/plugin-gaussian@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-gaussian@npm:0.22.8"
+"@jimp/plugin-gaussian@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-gaussian@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: d121a888ab2f322ab5b37b75e355a064a975cdf68b107cde99dde7466663b76ba10e4ad0187b51404b94e2f2d852e9de04b2dfade16d055abcd6ddcf2dd530a4
+  checksum: e9f012ffb04781e025bcc800b88a1f9a6676775207ed2b3686b2b354d5248bcbf2918719997058157de81802c063d356f0f96d68fe28a9f4ca6ff2f63647a445
   languageName: node
   linkType: hard
 
-"@jimp/plugin-invert@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-invert@npm:0.22.8"
+"@jimp/plugin-invert@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-invert@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: a37cc4ce9a3cc428877cca3e965d31b2515903c9c253eac3995b30a9eb59fe93ceaa29b6c5512fd0e655c9ca49e95b70c5130c4fd4715f2879c16b76915aadd8
+  checksum: 0874b269931d5c6de8b462fbcf1b097366482b1830e077e52375cdb191ee1ff63db23c3553df3ee3bc4e72df40e3181848dbf982461cb0a357b8e4c5ac4bdf94
   languageName: node
   linkType: hard
 
-"@jimp/plugin-mask@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-mask@npm:0.22.8"
+"@jimp/plugin-mask@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-mask@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 1f10572694d142f5958fe34cf4442d9baa538b6c254e225367eb8f49c8941ccde9df068a7ebc4920fc1e51dca30dd718143a3774096c37b636be74a405145c32
+  checksum: 6fb7edda32277dc47d94f3ff70e0aae3e3487820f6d6429761d2a413fba786122b77920975721306c2115a7938beeea1ab858beb5e11c0f2f040aaae5eaf391e
   languageName: node
   linkType: hard
 
-"@jimp/plugin-normalize@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-normalize@npm:0.22.8"
+"@jimp/plugin-normalize@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-normalize@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 8cc679134d4dbbbee75f96cfb26515aa54223996fb30cbe6600d91085e232b5df9b051b48ec2cde01944e7febb9d7d11911293714803f4e43c9b1fb47d852cb3
+  checksum: 66873475bdc6739da1a12aa66a4587ad2eeebf5374e195f541b490ebc3f9ff5c8bbb7ef898d35600f5a4ee0154d6a8975f1ecb3f26f62daf0d762e5e1182acb8
   languageName: node
   linkType: hard
 
-"@jimp/plugin-print@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-print@npm:0.22.8"
+"@jimp/plugin-print@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-print@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     load-bmfont: ^1.4.1
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-blit": ">=0.3.5"
-  checksum: 1809bb0a92b5887bca50d67ecacd7b3c659abb2bf01c2f8de41b0482aec89ba589e0bcf812e50157a79a990ca68efb420de4bea46df6fd9128f07dbb588f3607
+  checksum: 4a3ad6bccd8d673805e07bcbd3a9eabc0021c498a1d8f231369e8dc3d884b8364e772de8f97b637da6abb0657b0cc68961ba2311cd75f52e47da6657a74f9348
   languageName: node
   linkType: hard
 
-"@jimp/plugin-resize@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-resize@npm:0.22.8"
+"@jimp/plugin-resize@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-resize@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 6f3df258875698d6f2b05e297a4fe73060e38d59d68333ae09748bb07ed379abc3815d6bd41ab53cecfe85788c8522fbce19428c470b602d9362b0b9710ba0d2
+  checksum: 1d74e4624ca6f3b1894d18c824795106ac00e9445f635b11e3d47b7c839752a086a113b0969560b652de8a65b6c20085dc8f4fc4f99db9d1fdedec229b6e5edd
   languageName: node
   linkType: hard
 
-"@jimp/plugin-rotate@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-rotate@npm:0.22.8"
+"@jimp/plugin-rotate@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-rotate@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-blit": ">=0.3.5"
     "@jimp/plugin-crop": ">=0.3.5"
     "@jimp/plugin-resize": ">=0.3.5"
-  checksum: ca8bb1c559cae9606d2e0da3b012dd7d57d8e5e86eba68966d0eaf77ded42fd2074160a739a8ce7d82d835f8ba670e5090e624160f451acc1405de7148660552
+  checksum: dfc91fa10520bcf4340f47a9190987d4010797054a6c9dc9cbcc1cc4d86592f22c54f5a27d22f2628a804e00b6b35b27f59ff532112e296ef2c53c1df220236d
   languageName: node
   linkType: hard
 
-"@jimp/plugin-scale@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-scale@npm:0.22.8"
+"@jimp/plugin-scale@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-scale@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-resize": ">=0.3.5"
-  checksum: 46ec536cc4159783ea914ef0a8f66e7694e708bb5e088350c1f6765e3129aff4b1d47390c080e2fbe6422d980f4c1ff351aaee06f460ad6568607841216d9fae
+  checksum: bdd187bab363440863907d6b747db42bc3122e3ca5e796b2b4cf3c3b1ebf99d009224a3953ab6a9cd67b0c782304eda1faf86bce73f4d689943374375a7014fa
   languageName: node
   linkType: hard
 
-"@jimp/plugin-shadow@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-shadow@npm:0.22.8"
+"@jimp/plugin-shadow@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-shadow@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-blur": ">=0.3.5"
     "@jimp/plugin-resize": ">=0.3.5"
-  checksum: 637f845103703d6aa461564ab588260145c0c294f4426dc57888bad0ca935e2c03e299f36fd119c9f6d48ee0d855a6c6c8bfbd541c807acd24ef95e56f1d6da9
+  checksum: e9075691ae0c348f9bd1ccb12c0a7891c2f60b81ce29587a3a822e53c5ddaec680ad3b9ce581b731c22cfd1d3e50aadc2ebf75b94a71651555785638f24bf470
   languageName: node
   linkType: hard
 
-"@jimp/plugin-threshold@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugin-threshold@npm:0.22.8"
+"@jimp/plugin-threshold@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugin-threshold@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
     "@jimp/plugin-color": ">=0.8.0"
     "@jimp/plugin-resize": ">=0.8.0"
-  checksum: 69af5007fa498e39301e2d137626250dad743e8093a1ab98bbeb11c878418530344320334bc6d102f1bcd2822d63b59bec788a414823b4688cd0593a6502c374
-  languageName: node
-  linkType: hard
-
-"@jimp/plugins@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/plugins@npm:0.22.8"
-  dependencies:
-    "@jimp/plugin-blit": ^0.22.8
-    "@jimp/plugin-blur": ^0.22.8
-    "@jimp/plugin-circle": ^0.22.8
-    "@jimp/plugin-color": ^0.22.8
-    "@jimp/plugin-contain": ^0.22.8
-    "@jimp/plugin-cover": ^0.22.8
-    "@jimp/plugin-crop": ^0.22.8
-    "@jimp/plugin-displace": ^0.22.8
-    "@jimp/plugin-dither": ^0.22.8
-    "@jimp/plugin-fisheye": ^0.22.8
-    "@jimp/plugin-flip": ^0.22.8
-    "@jimp/plugin-gaussian": ^0.22.8
-    "@jimp/plugin-invert": ^0.22.8
-    "@jimp/plugin-mask": ^0.22.8
-    "@jimp/plugin-normalize": ^0.22.8
-    "@jimp/plugin-print": ^0.22.8
-    "@jimp/plugin-resize": ^0.22.8
-    "@jimp/plugin-rotate": ^0.22.8
-    "@jimp/plugin-scale": ^0.22.8
-    "@jimp/plugin-shadow": ^0.22.8
-    "@jimp/plugin-threshold": ^0.22.8
+  checksum: 43419a9411f51a34a2fcfc259c0bdfc907dd29d610f1ae4918c3da30f407e1eb617a091ba2246521b581ea06216e912cd8608285d753b3e0ef96afd4a47f8d65
+  languageName: node
+  linkType: hard
+
+"@jimp/plugins@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/plugins@npm:0.22.10"
+  dependencies:
+    "@jimp/plugin-blit": ^0.22.10
+    "@jimp/plugin-blur": ^0.22.10
+    "@jimp/plugin-circle": ^0.22.10
+    "@jimp/plugin-color": ^0.22.10
+    "@jimp/plugin-contain": ^0.22.10
+    "@jimp/plugin-cover": ^0.22.10
+    "@jimp/plugin-crop": ^0.22.10
+    "@jimp/plugin-displace": ^0.22.10
+    "@jimp/plugin-dither": ^0.22.10
+    "@jimp/plugin-fisheye": ^0.22.10
+    "@jimp/plugin-flip": ^0.22.10
+    "@jimp/plugin-gaussian": ^0.22.10
+    "@jimp/plugin-invert": ^0.22.10
+    "@jimp/plugin-mask": ^0.22.10
+    "@jimp/plugin-normalize": ^0.22.10
+    "@jimp/plugin-print": ^0.22.10
+    "@jimp/plugin-resize": ^0.22.10
+    "@jimp/plugin-rotate": ^0.22.10
+    "@jimp/plugin-scale": ^0.22.10
+    "@jimp/plugin-shadow": ^0.22.10
+    "@jimp/plugin-threshold": ^0.22.10
     timm: ^1.6.1
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: db5364021a30a5c722799cc049508cf2948cf0af0164e231135b117c667b5f098d0009c12f62e2e2dd87d9eb6b7c5bf664a614e458f32b893c881fe7eac4ec11
+  checksum: c7157df47e9a38a82eb7c9921a078623520ba78ba8d69da83a6f028f727fef3e578bfd75ae428d74e5174fa7438786ab7979a3ae7ac24a02214c7f9fa64fcaef
   languageName: node
   linkType: hard
 
-"@jimp/png@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/png@npm:0.22.8"
+"@jimp/png@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/png@npm:0.22.10"
   dependencies:
-    "@jimp/utils": ^0.22.8
+    "@jimp/utils": ^0.22.10
     pngjs: ^6.0.0
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 760203a9cd653ed68682584847d25126ab75211a4019573f0b9c94142eb4efaa8c69befe7f348fd491b20957c222f253518d3860e623cc11851cc600d228d0db
+  checksum: d704e4553e285abef313b10de3e6b4c1ad43663631c86cb3032334f4ed122950e7b9b68c842763d7224fb3a0aa1fa6319f21b64902da209ecf1a28adcd7b59f9
   languageName: node
   linkType: hard
 
-"@jimp/tiff@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/tiff@npm:0.22.8"
+"@jimp/tiff@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/tiff@npm:0.22.10"
   dependencies:
     utif2: ^4.0.1
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 460a72343d74c3866b801ded024acd91a07a33a4bbdc3b26cb217bd5879dc39439bbb90d592900bef9a159d34f679521ea714230e4100d7d8480d4c530fc8b2f
+  checksum: ff8d8c14b3ef04d73971e9718fb860c993913b31e0560f82c1e7e0bfa7f0aab831c2d4b7b5693fb79a89b96a9295c1ff30b1006b2e95ec5f5b52af59bda87136
   languageName: node
   linkType: hard
 
-"@jimp/types@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/types@npm:0.22.8"
+"@jimp/types@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/types@npm:0.22.10"
   dependencies:
-    "@jimp/bmp": ^0.22.8
-    "@jimp/gif": ^0.22.8
-    "@jimp/jpeg": ^0.22.8
-    "@jimp/png": ^0.22.8
-    "@jimp/tiff": ^0.22.8
+    "@jimp/bmp": ^0.22.10
+    "@jimp/gif": ^0.22.10
+    "@jimp/jpeg": ^0.22.10
+    "@jimp/png": ^0.22.10
+    "@jimp/tiff": ^0.22.10
     timm: ^1.6.1
   peerDependencies:
     "@jimp/custom": ">=0.3.5"
-  checksum: 3c3fe15695bbf7147de5f537edce76f337cae12e05fe1e108e039c04607edd71ed40b84e8aed47293359a5d863be6bf740856bbf39e09c5be60d042d6467c2c8
+  checksum: 1636f0d2c0b3f7f936c60ee5e148f4b928e843223b8af156282d69fca8c0e70326dd6aa2bf43f9ac44c4dde2fc384bfdfd157b7c69e54cb5469f46a658d8e46f
   languageName: node
   linkType: hard
 
-"@jimp/utils@npm:^0.22.8":
-  version: 0.22.8
-  resolution: "@jimp/utils@npm:0.22.8"
+"@jimp/utils@npm:^0.22.10":
+  version: 0.22.10
+  resolution: "@jimp/utils@npm:0.22.10"
   dependencies:
     regenerator-runtime: ^0.13.3
-  checksum: 0fcec0210bcc02020334106cb34a11b7016cb523cac6de338ab12a1d09ba0f7acc16a03d24051c61501caa6180c80c297ad89fa3b4c5b4c281698dc11a8b0c19
-  languageName: node
-  linkType: hard
-
-"@jridgewell/gen-mapping@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "@jridgewell/gen-mapping@npm:0.1.1"
-  dependencies:
-    "@jridgewell/set-array": ^1.0.0
-    "@jridgewell/sourcemap-codec": ^1.4.10
-  checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc
+  checksum: 65c0f225e5d3821cbc8c5fdf4e316c61923ca7da5c2baa69af87f8b9c51d76aeec3f54d549ad934ebb931ff4457e77b0b350a489e9fa5010abeb0e900c47117c
   languageName: node
   linkType: hard
 
 "@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/gen-mapping@npm:0.3.2"
+  version: 0.3.3
+  resolution: "@jridgewell/gen-mapping@npm:0.3.3"
   dependencies:
     "@jridgewell/set-array": ^1.0.1
     "@jridgewell/sourcemap-codec": ^1.4.10
     "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882
+  checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab
   languageName: node
   linkType: hard
 
-"@jridgewell/resolve-uri@npm:3.1.0, @jridgewell/resolve-uri@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "@jridgewell/resolve-uri@npm:3.1.0"
-  checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267
+"@jridgewell/resolve-uri@npm:^3.0.3, @jridgewell/resolve-uri@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@jridgewell/resolve-uri@npm:3.1.1"
+  checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653
   languageName: node
   linkType: hard
 
-"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1":
+"@jridgewell/set-array@npm:^1.0.1":
   version: 1.1.2
   resolution: "@jridgewell/set-array@npm:1.1.2"
   checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e
   languageName: node
   linkType: hard
 
-"@jridgewell/source-map@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@jridgewell/source-map@npm:0.3.2"
+"@jridgewell/source-map@npm:^0.3.3":
+  version: 0.3.5
+  resolution: "@jridgewell/source-map@npm:0.3.5"
   dependencies:
     "@jridgewell/gen-mapping": ^0.3.0
     "@jridgewell/trace-mapping": ^0.3.9
-  checksum: 1b83f0eb944e77b70559a394d5d3b3f98a81fcc186946aceb3ef42d036762b52ef71493c6c0a3b7c1d2f08785f53ba2df1277fe629a06e6109588ff4cdcf7482
+  checksum: 1ad4dec0bdafbade57920a50acec6634f88a0eb735851e0dda906fa9894e7f0549c492678aad1a10f8e144bfe87f238307bf2a914a1bc85b7781d345417e9f6f
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.10":
-  version: 1.4.14
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.14"
-  checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
+  version: 1.4.15
+  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
+  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
   languageName: node
   linkType: hard
 
@@ -4594,13 +3482,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.15, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9":
-  version: 0.3.17
-  resolution: "@jridgewell/trace-mapping@npm:0.3.17"
+"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.18, @jridgewell/trace-mapping@npm:^0.3.9":
+  version: 0.3.19
+  resolution: "@jridgewell/trace-mapping@npm:0.3.19"
   dependencies:
-    "@jridgewell/resolve-uri": 3.1.0
-    "@jridgewell/sourcemap-codec": 1.4.14
-  checksum: 9d703b859cff5cd83b7308fd457a431387db5db96bd781a63bf48e183418dd9d3d44e76b9e4ae13237f6abeeb25d739ec9215c1d5bfdd08f66f750a50074a339
+    "@jridgewell/resolve-uri": ^3.1.0
+    "@jridgewell/sourcemap-codec": ^1.4.14
+  checksum: 956a6f0f6fec060fb48c6bf1f5ec2064e13cd38c8be3873877d4b92b4a27ba58289a34071752671262a3e3c202abcc3fa2aac64d8447b4b0fa1ba3c9047f1c20
   languageName: node
   linkType: hard
 
@@ -4636,9 +3524,252 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lexical/clipboard@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/clipboard@npm:0.12.2"
+  dependencies:
+    "@lexical/html": 0.12.2
+    "@lexical/list": 0.12.2
+    "@lexical/selection": 0.12.2
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 15e529b9664b0777f52f5967b2ed59b6842f16442bd04195da8d5843369a69623a864854ae37e2d843af4d1a661194efac51b058f42ce680ace954200f731ab1
+  languageName: node
+  linkType: hard
+
+"@lexical/code@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/code@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+    prismjs: ^1.27.0
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 3c99ac8fb19454f7d7317bc71690b10301df18d64ecc27c65ccd2ec4e999983952049f0c0713eb2000a1ddd60708e8eb4229dfd50bdd6601b9912570c986edb5
+  languageName: node
+  linkType: hard
+
+"@lexical/dragon@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/dragon@npm:0.12.2"
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 0f7f3b6cf5727b93082c4a505c4784c85fce0ec2c80a97df2b78570d2589cbe6d42d6d3d1a098bfb191ae477fd78bb7b15c740254a9ee7c76bf988503b991b95
+  languageName: node
+  linkType: hard
+
+"@lexical/hashtag@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/hashtag@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 185e8afd8277c60fe495bb02c5321636f1c2575dc3c276c0fa5174f55ec79357f30b3678fea24fe9109aa9308162f5555f5d8e1ede7b6df32dc2023701997630
+  languageName: node
+  linkType: hard
+
+"@lexical/history@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/history@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: a813313e7d8d54f0c50a4a5114a5d04d095bb00aaaa8bf916d86cbe64434097fe3dcd10838fae50420987861b1cd9e52dc443077a8bd14e0073e92d60c944ed8
+  languageName: node
+  linkType: hard
+
+"@lexical/html@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/html@npm:0.12.2"
+  dependencies:
+    "@lexical/selection": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: a3538d923f2ffd5d0b5db186016d5cdeab21f42c55ac40d393b7cfbd59f1e42f12515b79ce291eafa57d67960995bbe90bc46a5042a177753f4acccfc1746fa1
+  languageName: node
+  linkType: hard
+
+"@lexical/link@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/link@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: fab9b1a62deb7b232b67135696c4faf1a7738be415f8e993c56298a45cdbdbe0a04a8d2d71e3e7cc574c94b24aad8b93fb657d1553858c874c86d74916f16767
+  languageName: node
+  linkType: hard
+
+"@lexical/list@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/list@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 196e40c79613f21bcbdd035ea6b970460b10dde86c22674d6c2e009f093d56a48565e631416ac1d60c9bb84b6225d85ba182c9d1362a197b7f84abef817eced0
+  languageName: node
+  linkType: hard
+
+"@lexical/mark@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/mark@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: aff24ec8ee4dc91e0ac9a3000cd2a7f6556f9755eb1af68aa3de94ef1a73405e4a90e0013d28d41c2887ef67d744154863d22a8b5bcc9b1ee1f9cac71f4af4b8
+  languageName: node
+  linkType: hard
+
+"@lexical/markdown@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/markdown@npm:0.12.2"
+  dependencies:
+    "@lexical/code": 0.12.2
+    "@lexical/link": 0.12.2
+    "@lexical/list": 0.12.2
+    "@lexical/rich-text": 0.12.2
+    "@lexical/text": 0.12.2
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 8dd8b32fd00c43d0df2d5a5201c67cf5596083b2412319c0de882c67fe51c5cdafec709beb4ccac7aa80a650d1565b906087e985fb9e19530546e97a1b91282d
+  languageName: node
+  linkType: hard
+
+"@lexical/offset@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/offset@npm:0.12.2"
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 4f3f609a6fc8f383279e491fa4a437060f49600ce8440ae381e896f5c67c9ad52d6264ba7c3ea6e86a66eb00ebcfe06e6bf122827242a6eb2d9c41c3f55d14c2
+  languageName: node
+  linkType: hard
+
+"@lexical/overflow@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/overflow@npm:0.12.2"
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: ef0a8d517d22d9b13fe4a535e27be4be6a4e0f29056fe77d73b174ba1ce6e0b0af0a8f8dc401aee37ad4da65e4c15fd860f79dc3156c37aa3dee07c036ef9989
+  languageName: node
+  linkType: hard
+
+"@lexical/plain-text@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/plain-text@npm:0.12.2"
+  peerDependencies:
+    "@lexical/clipboard": 0.12.2
+    "@lexical/selection": 0.12.2
+    "@lexical/utils": 0.12.2
+    lexical: 0.12.2
+  checksum: f1142c075284bc7a654aa100585f3779575599a3b1305be26f2571dd98bc0eac0953a40eeea735da755a7fd0b9bb3d18e5dcfd3efae661c05abf52297039eaa4
+  languageName: node
+  linkType: hard
+
+"@lexical/react@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/react@npm:0.12.2"
+  dependencies:
+    "@lexical/clipboard": 0.12.2
+    "@lexical/code": 0.12.2
+    "@lexical/dragon": 0.12.2
+    "@lexical/hashtag": 0.12.2
+    "@lexical/history": 0.12.2
+    "@lexical/link": 0.12.2
+    "@lexical/list": 0.12.2
+    "@lexical/mark": 0.12.2
+    "@lexical/markdown": 0.12.2
+    "@lexical/overflow": 0.12.2
+    "@lexical/plain-text": 0.12.2
+    "@lexical/rich-text": 0.12.2
+    "@lexical/selection": 0.12.2
+    "@lexical/table": 0.12.2
+    "@lexical/text": 0.12.2
+    "@lexical/utils": 0.12.2
+    "@lexical/yjs": 0.12.2
+    react-error-boundary: ^3.1.4
+  peerDependencies:
+    lexical: 0.12.2
+    react: ">=17.x"
+    react-dom: ">=17.x"
+  checksum: 9a6a603116467f8ae477e4504c71a99a10148e18d64840f0835d527d653005f89bcc643e7d0dccfa07fc772b2158767620247f4b35c6dec403879ef91f2bf110
+  languageName: node
+  linkType: hard
+
+"@lexical/rich-text@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/rich-text@npm:0.12.2"
+  peerDependencies:
+    "@lexical/clipboard": 0.12.2
+    "@lexical/selection": 0.12.2
+    "@lexical/utils": 0.12.2
+    lexical: 0.12.2
+  checksum: b3ff3dbcb321cb1981de7f71c30fbf2ed643ac259fc360e1454af9e2f8c3567ef0ff157a7febc32c8cf3d133252d064b1c2ee5fa6e4ec83cd9bed9f7a236d5e3
+  languageName: node
+  linkType: hard
+
+"@lexical/selection@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/selection@npm:0.12.2"
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 4c35dc644c401c3782ed8a10e404a92b1f18c763332035e1f8707a1ac6143754b463bbb122b7cc82c99766e0b5650927025e2d081538ffbbd76386cf9cf4c66c
+  languageName: node
+  linkType: hard
+
+"@lexical/table@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/table@npm:0.12.2"
+  dependencies:
+    "@lexical/utils": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 051cd08a39b3ec86734db6ff2ff5c5fc1952890fa282696983c89a949ccea134131930d704eec98afa26c104ec05d1e26d705738b9f20aa90df1f341294a67b5
+  languageName: node
+  linkType: hard
+
+"@lexical/text@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/text@npm:0.12.2"
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 4ab65132a6bb804b73a58ab924a2a46e1e767cbd4a6cd671e082d951c381515981c44cece18e6b6d998dd9ef1e6cc8c1b6ff7740c3f125c3fc8f3284128c59be
+  languageName: node
+  linkType: hard
+
+"@lexical/utils@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/utils@npm:0.12.2"
+  dependencies:
+    "@lexical/list": 0.12.2
+    "@lexical/selection": 0.12.2
+    "@lexical/table": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+  checksum: 579fd0b5a5b085f4842721d23076aa43eb295497952c81239f211c4c50ce8b33c10734f72acce3107af4b391dcd5d399461a6ab63eab1d6cd7b57db27f7a1066
+  languageName: node
+  linkType: hard
+
+"@lexical/yjs@npm:0.12.2":
+  version: 0.12.2
+  resolution: "@lexical/yjs@npm:0.12.2"
+  dependencies:
+    "@lexical/offset": 0.12.2
+  peerDependencies:
+    lexical: 0.12.2
+    yjs: ">=13.5.22"
+  checksum: 552e4b6eaca32e4eae7e7eb754ee8a5d927cc97eb5a4734d9f5a4ce810ed116b932f63c86e5e2c3084957c342da2cedad11dd53e8bcb8dd3ecec1cbd09789b0d
+  languageName: node
+  linkType: hard
+
 "@mapbox/node-pre-gyp@npm:^1.0.8":
-  version: 1.0.9
-  resolution: "@mapbox/node-pre-gyp@npm:1.0.9"
+  version: 1.0.11
+  resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
   dependencies:
     detect-libc: ^2.0.0
     https-proxy-agent: ^5.0.0
@@ -4651,7 +3782,7 @@ __metadata:
     tar: ^6.1.11
   bin:
     node-pre-gyp: bin/node-pre-gyp
-  checksum: 1b9c4c87a68d200daa13151d0fe033aa7aa8f7b26f3585255424dd8dfee2ec672c3e9bea4071c624469bc0aebbbcde08f8a300c8a958db52c50abadd5fb56920
+  checksum: b848f6abc531a11961d780db813cc510ca5a5b6bf3184d72134089c6875a91c44d571ba6c1879470020803f7803609e7b2e6e429651c026fe202facd11d444b8
   languageName: node
   linkType: hard
 
@@ -4691,37 +3822,179 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "@npmcli/fs@npm:2.1.2"
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "@npmcli/fs@npm:3.1.0"
+  dependencies:
+    semver: ^7.3.5
+  checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-cms@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-cms@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    "@peculiar/asn1-x509-attr": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: caeb7fcb594b7158ecb31f2e0e3a85a79fb9a51b9204b3fbad398706f56f20dfb6478f37fc163b544ebe3fd6ade7606a71826684df040ae6870fe7a4d8286d8c
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-csr@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-csr@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 4989edc765476b02995fbee88ab3860cf657f0e62756fa0ec44cd95158e6276f58c2c8656e5f8bd2f6934650999b781f2ec7b65ec537fc41a1aeb387b2e32883
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-ecc@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-ecc@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 4b9a383dd443fbb9699d79550e03d1185781885768d8c7b780e26a959344286a53539824fa4a3103e9e8393a7d062fe6820bf79abafb340dc18ee5ce81b1d470
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pfx@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-pfx@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-cms": ^2.3.6
+    "@peculiar/asn1-pkcs8": ^2.3.6
+    "@peculiar/asn1-rsa": ^2.3.6
+    "@peculiar/asn1-schema": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: faa3abc62e4ba4e67f6377178df62c24146920475e4ddfee024b1e14b208947d9b136c1bb1b82d7a3a28b76a544687529338f6143f92bdf324db23bd6aa0c11a
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pkcs8@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-pkcs8@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 17b2ea5f2350ba74d58084f95f4d739d30413112e85268fd55b308307bd6a6f006e06accaf3e181103a61bfb7efd2c21be7f914b48954845bef109b1b0a4bc46
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-pkcs9@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-pkcs9@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-cms": ^2.3.6
+    "@peculiar/asn1-pfx": ^2.3.6
+    "@peculiar/asn1-pkcs8": ^2.3.6
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    "@peculiar/asn1-x509-attr": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 3b8ca25b46ce9afc51b8cc72afab6fd32bb1dbf501eef68f997b35591c16c321384224fe478fd03fa644f3d540d719568767c7bd8bd1f617a5d9f8d318be0d2c
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-rsa@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-rsa@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 120dda00af6e1b1e5568826ac8211d60d36b3cbe91b086cae6b5ba132f1670ba129284068110305b237550e402c0beeda45fd713d640f97ad11d8cf6c925b31a
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-schema@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-schema@npm:2.3.6"
+  dependencies:
+    asn1js: ^3.0.5
+    pvtsutils: ^1.3.2
+    tslib: ^2.4.0
+  checksum: fc09387c6e3dea07fca21b54ea8c71ce3ec0f8c92377237e51aef729f0c2df92781aa7a18a546a6fe809519faeaa222df576ec21a35c6095037a78677204a55b
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-x509-attr@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-x509-attr@npm:2.3.6"
+  dependencies:
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    asn1js: ^3.0.5
+    tslib: ^2.4.0
+  checksum: 100a11aad2168a99b23d576869d27d569c34191d14311cf6fcbea126b737bcb42f23401ead45c2bc55074d164712c65e5541be23c0e5f92bf19005957a16a872
+  languageName: node
+  linkType: hard
+
+"@peculiar/asn1-x509@npm:^2.3.6":
+  version: 2.3.6
+  resolution: "@peculiar/asn1-x509@npm:2.3.6"
   dependencies:
-    "@gar/promisify": ^1.1.3
-    semver: ^7.3.5
-  checksum: 405074965e72d4c9d728931b64d2d38e6ea12066d4fad651ac253d175e413c06fe4350970c783db0d749181da8fe49c42d3880bd1cbc12cd68e3a7964d820225
+    "@peculiar/asn1-schema": ^2.3.6
+    asn1js: ^3.0.5
+    ipaddr.js: ^2.0.1
+    pvtsutils: ^1.3.2
+    tslib: ^2.4.0
+  checksum: 6e946bd44091fb88f617c3bbf54ed1113ed2b249675dd36004513444f409160f6d446bdb82d3cb6041b4d15c68fa4cf40ad452891a5f85dda2af89ee5b0590d2
   languageName: node
   linkType: hard
 
-"@npmcli/move-file@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "@npmcli/move-file@npm:2.0.1"
+"@peculiar/x509@npm:1.9.5":
+  version: 1.9.5
+  resolution: "@peculiar/x509@npm:1.9.5"
   dependencies:
-    mkdirp: ^1.0.4
-    rimraf: ^3.0.2
-  checksum: 52dc02259d98da517fae4cb3a0a3850227bdae4939dda1980b788a7670636ca2b4a01b58df03dd5f65c1e3cb70c50fa8ce5762b582b3f499ec30ee5ce1fd9380
+    "@peculiar/asn1-cms": ^2.3.6
+    "@peculiar/asn1-csr": ^2.3.6
+    "@peculiar/asn1-ecc": ^2.3.6
+    "@peculiar/asn1-pkcs9": ^2.3.6
+    "@peculiar/asn1-rsa": ^2.3.6
+    "@peculiar/asn1-schema": ^2.3.6
+    "@peculiar/asn1-x509": ^2.3.6
+    pvtsutils: ^1.3.5
+    reflect-metadata: ^0.1.13
+    tslib: ^2.6.1
+    tsyringe: ^4.8.0
+  checksum: 855342d71bb9cf4c19f5232106bd5f79f2ae7b5607568940d9bdb5bd528ccf4454a19bd47a7cb820397216a1bb7cf613e940c1778b8cf940ec082055bc373c56
+  languageName: node
+  linkType: hard
+
+"@pkgjs/parseargs@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "@pkgjs/parseargs@npm:0.11.0"
+  checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f
   languageName: node
   linkType: hard
 
 "@pkgr/utils@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@pkgr/utils@npm:2.3.1"
+  version: 2.4.2
+  resolution: "@pkgr/utils@npm:2.4.2"
   dependencies:
     cross-spawn: ^7.0.3
+    fast-glob: ^3.3.0
     is-glob: ^4.0.3
-    open: ^8.4.0
+    open: ^9.1.0
     picocolors: ^1.0.0
-    tiny-glob: ^0.2.9
-    tslib: ^2.4.0
-  checksum: 118a1971120253740121a1db0a6658c21195b7da962acf9c124b507a3df707cfc97b0b84a16edcbd4352853b182e8337da9fc6e8e3d06c60d75ae4fb42321c75
+    tslib: ^2.6.0
+  checksum: 24e04c121269317d259614cd32beea3af38277151c4002df5883c4be920b8e3490bb897748e844f9d46bf68230f86dabd4e8f093773130e7e60529a769a132fc
   languageName: node
   linkType: hard
 
@@ -4798,16 +4071,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.7.0":
-  version: 1.7.0
-  resolution: "@remix-run/router@npm:1.7.0"
-  checksum: 80cab2fda9e4b9047c991e9b05b8bda8afa2adf7b85c785d7e6f593a399eb264d6a74302438babc81833b5d304eae0b22832f27552b1601e2ca9001d94b8e174
+"@remix-run/router@npm:1.10.0":
+  version: 1.10.0
+  resolution: "@remix-run/router@npm:1.10.0"
+  checksum: f8f9fcd5f08465a7e0a05378398ff6df2c5c5ef5766df3490a134d64260b3b16f1bd490bb0c3f5925c2671a0c1d8d1fa01dfbdc7ecc3b2447dc6eafe6b73bcc2
   languageName: node
   linkType: hard
 
 "@rollup/plugin-babel@npm:^5.2.0":
-  version: 5.2.2
-  resolution: "@rollup/plugin-babel@npm:5.2.2"
+  version: 5.3.1
+  resolution: "@rollup/plugin-babel@npm:5.3.1"
   dependencies:
     "@babel/helper-module-imports": ^7.10.4
     "@rollup/pluginutils": ^3.1.0
@@ -4818,7 +4091,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/babel__core":
       optional: true
-  checksum: 17eeed0c9b77329fc0e5484c01d265e2a58535b2e84b39504f7c228a958cd14edc724e4a7a36ed484c1db2e2c020115adc4c3d048e5c93f42b96f002aad3be9e
+  checksum: 220d71e4647330f252ef33d5f29700aef2e8284a0b61acfcceb47617a7f96208aa1ed16eae75619424bf08811ede5241e271a6d031f07026dee6b3a2bdcdc638
   languageName: node
   linkType: hard
 
@@ -4839,14 +4112,14 @@ __metadata:
   linkType: hard
 
 "@rollup/plugin-replace@npm:^2.4.1":
-  version: 2.4.1
-  resolution: "@rollup/plugin-replace@npm:2.4.1"
+  version: 2.4.2
+  resolution: "@rollup/plugin-replace@npm:2.4.2"
   dependencies:
     "@rollup/pluginutils": ^3.1.0
     magic-string: ^0.25.7
   peerDependencies:
     rollup: ^1.20.0 || ^2.0.0
-  checksum: 5851c10e4bacc25c98b82a63d788b7cdaedb93b0fa58ee42fbf1c5625401b76662aa02d9ad5137f830a31ee68c337e512d68267ca426ef0333bb1d1625a8cf42
+  checksum: b2f1618ee5526d288e2f8ae328dcb326e20e8dc8bd1f60d3e14d6708a5832e4aa44811f7d493f4aed2deeadca86e3b6b0503cd39bf50cfb4b595bb9da027fad0
   languageName: node
   linkType: hard
 
@@ -4863,10 +4136,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinclair/typebox@npm:^0.25.16":
-  version: 0.25.21
-  resolution: "@sinclair/typebox@npm:0.25.21"
-  checksum: 763af1163fe4eabee9b914d4e4548a39fbba3287d2b3b1ff043c1da3c5a321e99d50a3ca94eb182988131e00b006a6f019799cde8da2f61e2f118b30b0276a00
+"@sinclair/typebox@npm:^0.27.8":
+  version: 0.27.8
+  resolution: "@sinclair/typebox@npm:0.27.8"
+  checksum: 00bd7362a3439021aa1ea51b0e0d0a0e8ca1351a3d54c606b115fdcc49b51b16db6e5f43b4fe7a28c38688523e22a94d49dd31168868b655f0d4d50f032d07a1
   languageName: node
   linkType: hard
 
@@ -4888,16 +4161,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinonjs/fake-timers@npm:^10.0.2":
-  version: 10.0.2
-  resolution: "@sinonjs/fake-timers@npm:10.0.2"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-  checksum: c62aa98e7cefda8dedc101ce227abc888dc46b8ff9706c5f0a8dfd9c3ada97d0a5611384738d9ba0b26b59f99c2ba24efece8e779bb08329e9e87358fa309824
-  languageName: node
-  linkType: hard
-
-"@sinonjs/fake-timers@npm:^10.3.0":
+"@sinonjs/fake-timers@npm:^10.0.2, @sinonjs/fake-timers@npm:^10.3.0":
   version: 10.3.0
   resolution: "@sinonjs/fake-timers@npm:10.3.0"
   dependencies:
@@ -4918,9 +4182,9 @@ __metadata:
   linkType: hard
 
 "@sinonjs/text-encoding@npm:^0.7.1":
-  version: 0.7.1
-  resolution: "@sinonjs/text-encoding@npm:0.7.1"
-  checksum: 130de0bb568c5f8a611ec21d1a4e3f80ab0c5ec333010f49cfc1adc5cba6d8808699c8a587a46b0f0b016a1f4c1389bc96141e773e8460fcbb441875b2e91ba7
+  version: 0.7.2
+  resolution: "@sinonjs/text-encoding@npm:0.7.2"
+  checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
   languageName: node
   linkType: hard
 
@@ -4936,33 +4200,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/dom@npm:^8.11.1, @testing-library/dom@npm:^8.5.0":
-  version: 8.20.0
-  resolution: "@testing-library/dom@npm:8.20.0"
+"@testing-library/dom@npm:^9.0.0":
+  version: 9.3.3
+  resolution: "@testing-library/dom@npm:9.3.3"
   dependencies:
     "@babel/code-frame": ^7.10.4
     "@babel/runtime": ^7.12.5
     "@types/aria-query": ^5.0.1
-    aria-query: ^5.0.0
+    aria-query: 5.1.3
     chalk: ^4.1.0
     dom-accessibility-api: ^0.5.9
-    lz-string: ^1.4.4
+    lz-string: ^1.5.0
     pretty-format: ^27.0.2
-  checksum: 1e599129a2fe91959ce80900a0a4897232b89e2a8e22c1f5950c36d39c97629ea86b4986b60b173b5525a05de33fde1e35836ea597b03de78cc51b122835c6f0
+  checksum: 34e0a564da7beb92aa9cc44a9080221e2412b1a132eb37be3d513fe6c58027674868deb9f86195756d98d15ba969a30fe00632a4e26e25df2a5a4f6ac0686e37
   languageName: node
   linkType: hard
 
-"@testing-library/react@npm:13.4.0":
-  version: 13.4.0
-  resolution: "@testing-library/react@npm:13.4.0"
+"@testing-library/react@npm:14.0.0":
+  version: 14.0.0
+  resolution: "@testing-library/react@npm:14.0.0"
   dependencies:
     "@babel/runtime": ^7.12.5
-    "@testing-library/dom": ^8.5.0
+    "@testing-library/dom": ^9.0.0
     "@types/react-dom": ^18.0.0
   peerDependencies:
     react: ^18.0.0
     react-dom: ^18.0.0
-  checksum: 51ec548c1fdb1271089a5c63e0908f0166f2c7fcd9cacd3108ebbe0ce64cb4351812d885892020dc37608418cfb15698514856502b3cab0e5cc58d6cc1bd4a3e
+  checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901ac
   languageName: node
   linkType: hard
 
@@ -4988,121 +4252,105 @@ __metadata:
   linkType: hard
 
 "@tsconfig/node10@npm:^1.0.7":
-  version: 1.0.8
-  resolution: "@tsconfig/node10@npm:1.0.8"
-  checksum: b8d5fffbc6b17ef64ef74f7fdbccee02a809a063ade785c3648dae59406bc207f70ea2c4296f92749b33019fa36a5ae716e42e49cc7f1bbf0fd147be0d6b970a
+  version: 1.0.9
+  resolution: "@tsconfig/node10@npm:1.0.9"
+  checksum: a33ae4dc2a621c0678ac8ac4bceb8e512ae75dac65417a2ad9b022d9b5411e863c4c198b6ba9ef659e14b9fb609bbec680841a2e84c1172df7a5ffcf076539df
   languageName: node
   linkType: hard
 
 "@tsconfig/node12@npm:^1.0.7":
-  version: 1.0.9
-  resolution: "@tsconfig/node12@npm:1.0.9"
-  checksum: a01b2400ab3582b86b589c6d31dcd0c0656f333adecde85d6d7d4086adb059808b82692380bb169546d189bf771ae21d02544a75b57bd6da4a5dd95f8567bec9
+  version: 1.0.11
+  resolution: "@tsconfig/node12@npm:1.0.11"
+  checksum: 5ce29a41b13e7897a58b8e2df11269c5395999e588b9a467386f99d1d26f6c77d1af2719e407621412520ea30517d718d5192a32403b8dfcc163bf33e40a338a
   languageName: node
   linkType: hard
 
 "@tsconfig/node14@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@tsconfig/node14@npm:1.0.1"
-  checksum: 976345e896c0f059867f94f8d0f6ddb8b1844fb62bf36b727de8a9a68f024857e5db97ed51d3325e23e0616a5e48c034ff51a8d595b3fe7e955f3587540489be
+  version: 1.0.3
+  resolution: "@tsconfig/node14@npm:1.0.3"
+  checksum: 19275fe80c4c8d0ad0abed6a96dbf00642e88b220b090418609c4376e1cef81bf16237bf170ad1b341452feddb8115d8dd2e5acdfdea1b27422071163dc9ba9d
   languageName: node
   linkType: hard
 
 "@tsconfig/node16@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@tsconfig/node16@npm:1.0.2"
-  checksum: ca94d3639714672bbfd55f03521d3f56bb6a25479bd425da81faf21f13e1e9d15f40f97377dedbbf477a5841c5b0c8f4cd1b391f33553d750b9202c54c2c07aa
+  version: 1.0.4
+  resolution: "@tsconfig/node16@npm:1.0.4"
+  checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff
   languageName: node
   linkType: hard
 
-"@types/adm-zip@npm:0.5.0":
-  version: 0.5.0
-  resolution: "@types/adm-zip@npm:0.5.0"
+"@types/adm-zip@npm:0.5.2":
+  version: 0.5.2
+  resolution: "@types/adm-zip@npm:0.5.2"
   dependencies:
     "@types/node": "*"
-  checksum: 11dd013584e47d431bdf7c115b73cd3162c1a1eca0fbb911f691c9734e904cfe4a01ac1d2d3cbf76d0a952e01fcce8a01fd6fb1c150675a29d740a7fb15325b2
+  checksum: c25ad926fdd38100e883fbd34e94541c7893f785feb2d9f3261dee837baaf29c161d8c9b44d436d937e11e6f20218f1496bdf1cc4f16262b319033aef495ecf8
   languageName: node
   linkType: hard
 
 "@types/aria-query@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "@types/aria-query@npm:5.0.1"
-  checksum: 69fd7cceb6113ed370591aef04b3fd0742e9a1b06dd045c43531448847b85de181495e4566f98e776b37c422a12fd71866e0a1dfd904c5ec3f84d271682901de
+  version: 5.0.2
+  resolution: "@types/aria-query@npm:5.0.2"
+  checksum: 19394fea016e72da39dd5ef1cf1643e3252b7ee99d8f0b3a8740d3b72f874443fc1e00a41935b36fdfaf92cd735d4ae10dc5d6ab8f1192527d4c0471bb8ff8e4
   languageName: node
   linkType: hard
 
 "@types/babel__core@npm:^7.1.14":
-  version: 7.1.18
-  resolution: "@types/babel__core@npm:7.1.18"
+  version: 7.20.2
+  resolution: "@types/babel__core@npm:7.20.2"
   dependencies:
-    "@babel/parser": ^7.1.0
-    "@babel/types": ^7.0.0
+    "@babel/parser": ^7.20.7
+    "@babel/types": ^7.20.7
     "@types/babel__generator": "*"
     "@types/babel__template": "*"
     "@types/babel__traverse": "*"
-  checksum: 2e5b5d7c84f347d3789575486e58b0df5c91613abc3d27e716274aba3048518e07e1f068250ba829e2ed58532ccc88da595ce95ba2688e7bbcd7c25a3c6627ed
+  checksum: 564fbaa8ff1305d50807ada0ec227c3e7528bebb2f8fe6b2ed88db0735a31511a74ad18729679c43eeed8025ed29d408f53059289719e95ab1352ed559a100bd
   languageName: node
   linkType: hard
 
 "@types/babel__generator@npm:*":
-  version: 7.6.2
-  resolution: "@types/babel__generator@npm:7.6.2"
+  version: 7.6.5
+  resolution: "@types/babel__generator@npm:7.6.5"
   dependencies:
     "@babel/types": ^7.0.0
-  checksum: b7764309e5f292c4a15fb587ba610e7fa290e1a2824efe16c0608abdb835de310147b4410f067bb25d817ba72bfc65c6aa0018933b02a774e744dbe51befeab6
+  checksum: c7459f5025c4c800eaf58f4db3b24e9d736331fe7df40961d9bc49f31b46e2a3be83dc9276e8688f10a5ed752ae153ad5f1bdd45e2245bac95273730b9115ec2
   languageName: node
   linkType: hard
 
 "@types/babel__template@npm:*":
-  version: 7.4.0
-  resolution: "@types/babel__template@npm:7.4.0"
+  version: 7.4.2
+  resolution: "@types/babel__template@npm:7.4.2"
   dependencies:
     "@babel/parser": ^7.1.0
     "@babel/types": ^7.0.0
-  checksum: 5262dc75e66fe0531b046d19f5c39d1b7e3419e340624229b52757cdedb295cb5658494b64eb234bd18cab7740c45c1d72ed2f16d1d189a765df2dc4efeed1af
+  checksum: 0fe977b45a3269336c77f3ae4641a6c48abf0fa35ab1a23fb571690786af02d6cec08255a43499b0b25c5633800f7ae882ace450cce905e3060fa9e6995047ae
   languageName: node
   linkType: hard
 
 "@types/babel__traverse@npm:*, @types/babel__traverse@npm:^7.0.6":
-  version: 7.11.0
-  resolution: "@types/babel__traverse@npm:7.11.0"
+  version: 7.20.2
+  resolution: "@types/babel__traverse@npm:7.20.2"
   dependencies:
-    "@babel/types": ^7.3.0
-  checksum: 4e86b3d0ee9fe19bd7e1b523b71ed7cbef0f0fe37158970ef1e6c22da218fef05f79e79b07f2c10dc9bbe3ea9fb7e69dfce9761aff16fb10e891d14cac6d66d4
-  languageName: node
-  linkType: hard
-
-"@types/caniuse-lite@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@types/caniuse-lite@npm:1.0.1"
-  checksum: a74b02e254cf0c17da98a0fc7f8f3fb6e23d83a86bf683117a645aa9ecc02f8040e437df968cafcaf91dd438f09581e41c6835018cbcecef3c089a132a8b725b
+    "@babel/types": ^7.20.7
+  checksum: 981340286479524436348d32373eaa3bf993c635cbf70307b4b69463eee83406a959ac4844f683911e0db8ab8d9f0025ab630dc7a8c170fee9ee74144c2a528f
   languageName: node
   linkType: hard
 
 "@types/cheerio@npm:*":
-  version: 0.22.23
-  resolution: "@types/cheerio@npm:0.22.23"
+  version: 0.22.32
+  resolution: "@types/cheerio@npm:0.22.32"
   dependencies:
     "@types/node": "*"
-  checksum: 29a1d208608df454ee8b0de18222182dbe0a72004aa8d5c1e1f9edab6a41779bc1e2db128c51bfcb80705db3cf89a62ee82880d2d66a33cfffd784e08a129df6
-  languageName: node
-  linkType: hard
-
-"@types/classnames@npm:2.3.1":
-  version: 2.3.1
-  resolution: "@types/classnames@npm:2.3.1"
-  dependencies:
-    classnames: "*"
-  checksum: 09a17ea08fcb83380921efdfdac94cfa162f87025cae0bf6f4ba508c2fa5f436459ce7612905a3f968fdddb68c03b8e6ff08e762ed2d0c110c5c4fceb244dc55
+  checksum: 5a4885e03889c19638f0086d53e653d36a9eb097d0a08ec69dddf65ef685cd7118989c4fb28d5b28746502efc54bc57a3f751ee2a9aab3cfd32991bf5b51df10
   languageName: node
   linkType: hard
 
 "@types/color-convert@npm:*":
-  version: 2.0.0
-  resolution: "@types/color-convert@npm:2.0.0"
+  version: 2.0.1
+  resolution: "@types/color-convert@npm:2.0.1"
   dependencies:
     "@types/color-name": "*"
-  checksum: 027b68665dc2278cc2d83e796ada0a05a08aa5a11297e227c48c7f9f6eac518dec98578ab0072bd211963d3e4b431da70b20ea28d6c3136d0badfd3f9913baee
+  checksum: 52843d9206661d80957d15330d71f2eb8ebda4aaba72236d2d200e588ac806005a25e25f96393d81c9e61632a8316070d1136d2ff74f0a9350cf6d97291a2550
   languageName: node
   linkType: hard
 
@@ -5113,21 +4361,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/color@npm:3.0.3":
-  version: 3.0.3
-  resolution: "@types/color@npm:3.0.3"
+"@types/color@npm:3.0.4":
+  version: 3.0.4
+  resolution: "@types/color@npm:3.0.4"
   dependencies:
     "@types/color-convert": "*"
-  checksum: 4a54a6eca687b1f19d393c6c44e292009e913fa2377b5b815d1cd04470131087d7a799718d9e66a970f43e6ba16e7056a5b40b49d2d0d1d0f1530aff23864528
+  checksum: 46935626ddeb8ae8877488b1f8f2f71b17a529c113673301a1dd7a64d917cb7a748545ac34ed30c188d66a2cd09c33abc24c87bd5b3a80d520cf1f35aaa2e476
   languageName: node
   linkType: hard
 
-"@types/dexie-batch@npm:0.4.3":
-  version: 0.4.3
-  resolution: "@types/dexie-batch@npm:0.4.3"
+"@types/dexie-batch@npm:0.4.6":
+  version: 0.4.6
+  resolution: "@types/dexie-batch@npm:0.4.6"
   dependencies:
     dexie: latest
-  checksum: 4b1eaa990042f213c663eca89ab234ca9347b63f8fe058fc6c3cc128eaddb9c5e54d489760d91c6dd64b37bdefcede9013522a28d1a6110db1345100275fbf6d
+  checksum: 59ef6b3aa47b73a0c2f2b6badc6e32752b1dd8d7e985e5f9b86cfc16dd70af2846643a371152f385d9eeab3d087d5ea47a316e591a16b266abcc3f4a73dd9ba6
   languageName: node
   linkType: hard
 
@@ -5139,29 +4387,29 @@ __metadata:
   linkType: hard
 
 "@types/eslint-scope@npm:^3.7.3":
-  version: 3.7.4
-  resolution: "@types/eslint-scope@npm:3.7.4"
+  version: 3.7.5
+  resolution: "@types/eslint-scope@npm:3.7.5"
   dependencies:
     "@types/eslint": "*"
     "@types/estree": "*"
-  checksum: ea6a9363e92f301cd3888194469f9ec9d0021fe0a397a97a6dd689e7545c75de0bd2153dfb13d3ab532853a278b6572c6f678ce846980669e41029d205653460
+  checksum: e91ce335c3791c2cf6084caa0073f90d5b7ae3fcf27785ade8422b7d896159fa14a5a3f1efd31ef03e9ebc1ff04983288280dfe8c9a5579a958539f59df8cc9f
   languageName: node
   linkType: hard
 
-"@types/eslint@npm:*, @types/eslint@npm:8.37.0":
-  version: 8.37.0
-  resolution: "@types/eslint@npm:8.37.0"
+"@types/eslint@npm:*, @types/eslint@npm:^8":
+  version: 8.44.4
+  resolution: "@types/eslint@npm:8.44.4"
   dependencies:
     "@types/estree": "*"
     "@types/json-schema": "*"
-  checksum: 06d3b3fba12004294591b5c7a52e3cec439472195da54e096076b1f2ddfbb8a445973b9681046dd530a6ac31eca502f635abc1e3ce37d03513089358e6f822ee
+  checksum: 15bafdaba800e2995f38d3a2a929d8e9303035315e8d3535523a21cd719b6769a45884afa955f0b845ffa545a4150429b0178e2c44feeedf59ebb285eeae9825
   languageName: node
   linkType: hard
 
 "@types/estree@npm:*, @types/estree@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@types/estree@npm:1.0.0"
-  checksum: 910d97fb7092c6738d30a7430ae4786a38542023c6302b95d46f49420b797f21619cdde11fa92b338366268795884111c2eb10356e4bd2c8ad5b92941e9e6443
+  version: 1.0.2
+  resolution: "@types/estree@npm:1.0.2"
+  checksum: aeedb1b2fe20cbe06f44b99b562bf9703e360bfcdf5bb3d61d248182ee1dd63500f2474e12f098ffe1f5ac3202b43b3e18ec99902d9328d5374f5512fa077e45
   languageName: node
   linkType: hard
 
@@ -5172,48 +4420,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fs-extra@npm:11.0.1":
-  version: 11.0.1
-  resolution: "@types/fs-extra@npm:11.0.1"
+"@types/fs-extra@npm:11.0.3":
+  version: 11.0.3
+  resolution: "@types/fs-extra@npm:11.0.3"
   dependencies:
     "@types/jsonfile": "*"
     "@types/node": "*"
-  checksum: 3e930346e5d84f419deb8ced1c582beef8cb20d0bd8a0eb145a37d75bab0572a1895f0e48a0d681d386b3a58b9a992b2d2acecc464bcaec2548f53ea00718651
+  checksum: f196bc216906e7016a6c9c549dbe204fe7e1e87515c7e961f741309e25f8e2f8c268dba3dbf0ca7f3ddab5911d39888472f8624ac0c11a461f1b2d05377e38fa
   languageName: node
   linkType: hard
 
-"@types/generate-changelog@npm:1.8.1":
-  version: 1.8.1
-  resolution: "@types/generate-changelog@npm:1.8.1"
-  checksum: 97ec6317fbc001720c02b613b5ea52c0be7b4e9bc4639d27dd44baba2714cc45c96f08767e4fc7bcd042d1925193ad53223dc756f6b46132dab507d107bdf2c0
+"@types/generate-changelog@npm:1.8.2":
+  version: 1.8.2
+  resolution: "@types/generate-changelog@npm:1.8.2"
+  checksum: d2a063f45004c830b0b9395d9a0845e93f3408a7ec90e3e772eb750aa074b4482eba0f7b22eb68ce0d6bbf63457df818347196eb32d4f54588dc96d292c8b5e1
   languageName: node
   linkType: hard
 
 "@types/graceful-fs@npm:^4.1.3":
-  version: 4.1.5
-  resolution: "@types/graceful-fs@npm:4.1.5"
+  version: 4.1.7
+  resolution: "@types/graceful-fs@npm:4.1.7"
   dependencies:
     "@types/node": "*"
-  checksum: d076bb61f45d0fc42dee496ef8b1c2f8742e15d5e47e90e20d0243386e426c04d4efd408a48875ab432f7960b4ce3414db20ed0fbbfc7bcc89d84e574f6e045a
-  languageName: node
-  linkType: hard
-
-"@types/highlight.js@npm:10.1.0":
-  version: 10.1.0
-  resolution: "@types/highlight.js@npm:10.1.0"
-  dependencies:
-    highlight.js: "*"
-  checksum: 284f47e89bfe300f307ad76523a257ff12ed7cf0318cdc0a7fe6965a1d7e21840d133cfc623ec705495550d37341c278c2c9641bafce8b8dbb4bea4acd46f0ec
+  checksum: 8b97e208f85c9efd02a6003a582c77646dd87be0af13aec9419a720771560a8a87a979eaca73ae193d7c73127f34d0a958403a9b5d6246e450289fd8c79adf09
   languageName: node
   linkType: hard
 
 "@types/hoist-non-react-statics@npm:^3.3.0, @types/hoist-non-react-statics@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "@types/hoist-non-react-statics@npm:3.3.1"
+  version: 3.3.3
+  resolution: "@types/hoist-non-react-statics@npm:3.3.3"
   dependencies:
     "@types/react": "*"
     hoist-non-react-statics: ^3.3.0
-  checksum: 2c0778570d9a01d05afabc781b32163f28409bb98f7245c38d5eaf082416fdb73034003f5825eb5e21313044e8d2d9e1f3fe2831e345d3d1b1d20bcd12270719
+  checksum: 107ac20ab36acdc83fb6bfca901e6f4f11307a0a307099c31ecf2a9875f8abffd731a2e1ee793162307e8aaee48fe9fd8d4e034fce88d5da480bc4178a3fc8d7
   languageName: node
   linkType: hard
 
@@ -5225,37 +4464,37 @@ __metadata:
   linkType: hard
 
 "@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
-  version: 2.0.3
-  resolution: "@types/istanbul-lib-coverage@npm:2.0.3"
-  checksum: 0650cba4be8f464bee89b9de0b71a5ea3b5cc676ce24e1196b5d6a51542ce9e613ae4549bf19756bb33dbbbb32b47931040266100062bfb197c597d73e341eb0
+  version: 2.0.4
+  resolution: "@types/istanbul-lib-coverage@npm:2.0.4"
+  checksum: a25d7589ee65c94d31464c16b72a9dc81dfa0bea9d3e105ae03882d616e2a0712a9c101a599ec482d297c3591e16336962878cb3eb1a0a62d5b76d277a890ce7
   languageName: node
   linkType: hard
 
 "@types/istanbul-lib-report@npm:*":
-  version: 3.0.0
-  resolution: "@types/istanbul-lib-report@npm:3.0.0"
+  version: 3.0.1
+  resolution: "@types/istanbul-lib-report@npm:3.0.1"
   dependencies:
     "@types/istanbul-lib-coverage": "*"
-  checksum: 656398b62dc288e1b5226f8880af98087233cdb90100655c989a09f3052b5775bf98ba58a16c5ae642fb66c61aba402e07a9f2bff1d1569e3b306026c59f3f36
+  checksum: cfc66de48577bb7b2636a6afded7056483693c3ea70916276518cdfaa0d4b51bf564ded88fb13e75716665c3af3d4d54e9c2de042c0219dcabad7e81c398688b
   languageName: node
   linkType: hard
 
 "@types/istanbul-reports@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/istanbul-reports@npm:3.0.0"
+  version: 3.0.2
+  resolution: "@types/istanbul-reports@npm:3.0.2"
   dependencies:
     "@types/istanbul-lib-report": "*"
-  checksum: 286a18cff19c4dac4321b9ea406a3560faf577fb2a4df5abf9d577fa81ba831c9baa7d40d03f1daf7fe613d468546b731c00b844b72fad9834c583311a35bb7b
+  checksum: f52028d6fe4d28f0085dd7ed66ccfa6af632579e9a4091b90928ffef93d4dbec0bacd49e9caf1b939d05df9eafc5ac1f5939413cdf8ac59fbe4b29602d4d0939
   languageName: node
   linkType: hard
 
-"@types/jest@npm:29.5.2":
-  version: 29.5.2
-  resolution: "@types/jest@npm:29.5.2"
+"@types/jest@npm:29.5.6":
+  version: 29.5.6
+  resolution: "@types/jest@npm:29.5.6"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: 7d205599ea3cccc262bad5cc173d3242d6bf8138c99458509230e4ecef07a52d6ddcde5a1dbd49ace655c0af51d2dbadef3748697292ea4d86da19d9e03e19c0
+  checksum: fa13a27bd1c8efd0381a419478769d0d6d3a8e93e1952d7ac3a16274e8440af6f73ed6f96ac1ff00761198badf2ee226b5ab5583a5d87a78d609ea78da5c5a24
   languageName: node
   linkType: hard
 
@@ -5269,29 +4508,29 @@ __metadata:
   linkType: hard
 
 "@types/jquery@npm:^3":
-  version: 3.5.16
-  resolution: "@types/jquery@npm:3.5.16"
+  version: 3.5.22
+  resolution: "@types/jquery@npm:3.5.22"
   dependencies:
     "@types/sizzle": "*"
-  checksum: 13c995f15d1c2f1d322103dc1cb0a22b95eecc3e7546f00279b8731aea21d7ec04550af40e609ee48e755d4e11bf61c25b4aa9f53df3bcbec4b8fe8e81471732
+  checksum: b81c95e27bb30686c1ad5d3f414781243d0cbb468b91d5584dedd3d3ca07ac99796d876e257a7246d6d9b69916bbb0cd0508142ab9f88848605c6d431144d729
   languageName: node
   linkType: hard
 
-"@types/js-cookie@npm:3.0.3":
-  version: 3.0.3
-  resolution: "@types/js-cookie@npm:3.0.3"
-  checksum: 927254ec37ce4fbe4d9d54f53a446b4351259799d9933db5808ddb7c430396aa2496bdd0a4e47e1b56048ffbec98645cbd4daa9e3ed9a6fff55e25eb640fcb15
+"@types/js-cookie@npm:3.0.5":
+  version: 3.0.5
+  resolution: "@types/js-cookie@npm:3.0.5"
+  checksum: 4d91ae26445499fdde283928aac9ad149be3561ef9b4d959f77e44694608accd5939c8c68ba42c50c2cfc007ccd442cc566a41077d7f2766390088fa91b612ce
   languageName: node
   linkType: hard
 
-"@types/jsdom@npm:21.1.1":
-  version: 21.1.1
-  resolution: "@types/jsdom@npm:21.1.1"
+"@types/jsdom@npm:21.1.4":
+  version: 21.1.4
+  resolution: "@types/jsdom@npm:21.1.4"
   dependencies:
     "@types/node": "*"
     "@types/tough-cookie": "*"
     parse5: ^7.0.0
-  checksum: 7450d6e23aa31b837a1682f0e59b06838aacca85c9d030035f40e21d559169c773aee5cee9244f23c3004b78f7064f0c540ceb808d2f187deb3140f2b0449dee
+  checksum: 915f619111dadd8d1bb7f12b6736c9d2e486911e1aed086de5fb003e7e40ae1e368da322dc04f2122ef47faf40ca75b9315ae2df3e8011f882dcf84660fb0d68
   languageName: node
   linkType: hard
 
@@ -5306,10 +4545,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
-  version: 7.0.9
-  resolution: "@types/json-schema@npm:7.0.9"
-  checksum: 259d0e25f11a21ba5c708f7ea47196bd396e379fddb79c76f9f4f62c945879dc21657904914313ec2754e443c5018ea8372362f323f30e0792897fdb2098a705
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+  version: 7.0.13
+  resolution: "@types/json-schema@npm:7.0.13"
+  checksum: 345df21a678fa72fb389f35f33de77833d09d4a142bb2bcb27c18690efa4cf70fc2876e43843cefb3fbdb9fcb12cd3e970a90936df30f53bbee899865ff605ab
   languageName: node
   linkType: hard
 
@@ -5321,18 +4560,18 @@ __metadata:
   linkType: hard
 
 "@types/jsonfile@npm:*":
-  version: 6.1.1
-  resolution: "@types/jsonfile@npm:6.1.1"
+  version: 6.1.2
+  resolution: "@types/jsonfile@npm:6.1.2"
   dependencies:
     "@types/node": "*"
-  checksum: 0f8fe0a9221a00e8413cffba723dfe16553868724b830237256fb0052ecd5cac96498189d1235a001cfa815f352008261c9ceb373f0aa58227f891e0c7a12c4d
+  checksum: 3e020944de09e54ef7c4200dfbbedba76da417a58c712611ff9d30921e214dfabbe81dadd4d6608647a3ee8900d445407d7336dd991b8fe6df4249320ad4a1b4
   languageName: node
   linkType: hard
 
-"@types/keyboardjs@npm:2.5.1":
-  version: 2.5.1
-  resolution: "@types/keyboardjs@npm:2.5.1"
-  checksum: 5fc7ab296af084cb23e87eeabc000dcec68a74e890f6acfddda914e918b7256aacd8ca09b730b2b0ac1645ee7a4178814e19e8ca01bc0d511647cb5af2127705
+"@types/keyboardjs@npm:2.5.2":
+  version: 2.5.2
+  resolution: "@types/keyboardjs@npm:2.5.2"
+  checksum: cdb9590e0ac0fcdc8599acfa3a1bd983c84d72d6c2f8cf2b27bf49f13c48de9fa56f7b68c9ed3e0951bc46fa4fd39ac2a1d76232b8fe5a20b28c57220ca996ae
   languageName: node
   linkType: hard
 
@@ -5346,20 +4585,46 @@ __metadata:
   linkType: hard
 
 "@types/libsodium-wrappers@npm:*, @types/libsodium-wrappers@npm:^0":
-  version: 0.7.10
-  resolution: "@types/libsodium-wrappers@npm:0.7.10"
-  checksum: 717054ebcb5fa553e378144b8d564bed8b691905c0d4e90b95c64d77ba24ec9fe798cb2c58cd61dad545ceacb1f05ab69b5597217f9829f2da7a23f0688d11d0
+  version: 0.7.11
+  resolution: "@types/libsodium-wrappers@npm:0.7.11"
+  checksum: e3c3acdfc178a466a04d81c030ba1b748abc9335b1d66421125eb55b32cbaf6a9076e32a98744fcb84ba2fa2af342203ff29054262dcc465c12c4feddddb64ac
   languageName: node
   linkType: hard
 
-"@types/linkify-it@npm:*, @types/linkify-it@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@types/linkify-it@npm:3.0.2"
-  checksum: dff8f10fafb885422474e456596f12d518ec4cdd6c33cca7a08e7c86b912d301ed91cf5a7613e148c45a12600dc9ab3d85ad16d5b48dc1aaeda151a68f16b536
+"@types/linkify-it@npm:*":
+  version: 3.0.3
+  resolution: "@types/linkify-it@npm:3.0.3"
+  checksum: a734becc4e7476833b0e6951ec133c006a34809639c722d3e28b7cf88f5f6ccbb433f195788be5e56209b1e9e6e0778879291dd2db401acee3bb585c44dcc329
+  languageName: node
+  linkType: hard
+
+"@types/linkify-it@npm:3.0.4":
+  version: 3.0.4
+  resolution: "@types/linkify-it@npm:3.0.4"
+  checksum: cd873857faf77231811a5ee49aadffdbdd7c6309b92ca004cb28320993858d2e30cad7b343c6db928763ed0f766c6ed140e0f995536e488a1447a527b6f8127f
+  languageName: node
+  linkType: hard
+
+"@types/loadable__component@npm:^5":
+  version: 5.13.5
+  resolution: "@types/loadable__component@npm:5.13.5"
+  dependencies:
+    "@types/react": "*"
+  checksum: 9ff5c96931bbc1eeb7ba776890ca576a3a96c8f236538ce29380d6d4b28643d14a50bac5524be0859ade3620e47ec41a68af1d9e17c2cec6d3271424b144ac21
+  languageName: node
+  linkType: hard
+
+"@types/markdown-it@npm:13.0.4":
+  version: 13.0.4
+  resolution: "@types/markdown-it@npm:13.0.4"
+  dependencies:
+    "@types/linkify-it": "*"
+    "@types/mdurl": "*"
+  checksum: 0af9c349467599f984e8faf548144e5c68ca8926d45e155cbc622897290fadb1fd31fced8194a2a1095406805dd21719d2bc74d8dc0295581d0eed771a4fd58b
   languageName: node
   linkType: hard
 
-"@types/markdown-it@npm:12.2.3, @types/markdown-it@npm:^12.2.3":
+"@types/markdown-it@npm:^12.2.3":
   version: 12.2.3
   resolution: "@types/markdown-it@npm:12.2.3"
   dependencies:
@@ -5370,23 +4635,25 @@ __metadata:
   linkType: hard
 
 "@types/mdurl@npm:*":
-  version: 1.0.2
-  resolution: "@types/mdurl@npm:1.0.2"
-  checksum: 79c7e523b377f53cf1f5a240fe23d0c6cae856667692bd21bf1d064eafe5ccc40ae39a2aa0a9a51e8c94d1307228c8f6b121e847124591a9a828c3baf65e86e2
+  version: 1.0.3
+  resolution: "@types/mdurl@npm:1.0.3"
+  checksum: 5bbed4f0eb9f60040fa26be77aa2158ca468b6423876cec0d2043e7f8298e83b8e5b95fb66056327b02d747c4d376aed16c11ff3fdc4cb3dca327a6931a71f18
   languageName: node
   linkType: hard
 
-"@types/minimist@npm:^1.2.0":
-  version: 1.2.1
-  resolution: "@types/minimist@npm:1.2.1"
-  checksum: 02631cdd79d346ed6838f5443767b5218a0d915fd0529d4a8840c4eba942d7f6906f0056686dd5a119d42528bed0bee5767ebef7667fdca6fcb95411bb56084e
+"@types/minimist@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "@types/minimist@npm:1.2.3"
+  checksum: 666ea4f8c39dcbdfbc3171fe6b3902157c845cc9cb8cee33c10deb706cda5e0cc80f98ace2d6d29f6774b0dc21180c96cd73c592a1cbefe04777247c7ba0e84b
   languageName: node
   linkType: hard
 
 "@types/node@npm:*, @types/node@npm:>=13.7.0":
-  version: 18.16.0
-  resolution: "@types/node@npm:18.16.0"
-  checksum: 63e0042136663b9e85ce503a4c65406cc6621fdba63ea66c74b4b1364a9aa9bdb57cadcb76696abab177f38a819b0fa6ace9e7f1647dcb990aedb1b4bd01012f
+  version: 20.8.6
+  resolution: "@types/node@npm:20.8.6"
+  dependencies:
+    undici-types: ~5.25.1
+  checksum: ccfb7ac482c5a96edeb239893c5c099f5257fcc2ed9ae62fefdfbc782b79e16dbc2af9a85b379665237bf759904b44ca2be68e75d239e0297882aad42f61905c
   languageName: node
   linkType: hard
 
@@ -5404,33 +4671,35 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^18.16.3":
-  version: 18.16.3
-  resolution: "@types/node@npm:18.16.3"
-  checksum: 816b39d45b05ebdc6f362b630970df3f6d82f71d418a2555353522f4eeeb078fa201de5299f02c09a09faa975e43b2745fe19c263d44069f87ddf37d6c37b717
+"@types/node@npm:^20.8.7":
+  version: 20.8.7
+  resolution: "@types/node@npm:20.8.7"
+  dependencies:
+    undici-types: ~5.25.1
+  checksum: 2173c0c03daefcb60c03a61b1371b28c8fe412e7a40dc6646458b809d14a85fbc7aeb369d957d57f0aaaafd99964e77436f29b3b579232d8f2b20c58abbd1d25
   languageName: node
   linkType: hard
 
 "@types/node@npm:~14":
-  version: 14.18.36
-  resolution: "@types/node@npm:14.18.36"
-  checksum: da7f479b3fc996d585e60b8329987c6e310ddbf051e14f2d900ce04f7768f42fa7b760f0eb376008d3eca130ce9431018fb5c9e44027dcb7bb139c547e44b9c5
+  version: 14.18.63
+  resolution: "@types/node@npm:14.18.63"
+  checksum: be909061a54931778c71c49dc562586c32f909c4b6197e3d71e6dac726d8bd9fccb9f599c0df99f52742b68153712b5097c0f00cac4e279fa894b0ea6719a8fd
   languageName: node
   linkType: hard
 
 "@types/normalize-package-data@npm:^2.4.0":
-  version: 2.4.0
-  resolution: "@types/normalize-package-data@npm:2.4.0"
-  checksum: fd22ba86a186a033dbe173840fd2ad091032be6d48163198869d058821acca7373d9f39cfd0caf42f3b92bc737723814fe1b4e9e90eacaa913836610aa197d3b
+  version: 2.4.2
+  resolution: "@types/normalize-package-data@npm:2.4.2"
+  checksum: 2132e4054711e6118de967ae3a34f8c564e58d71fbcab678ec2c34c14659f638a86c35a0fd45237ea35a4a03079cf0a485e3f97736ffba5ed647bfb5da086b03
   languageName: node
   linkType: hard
 
-"@types/open-graph@npm:0.2.2":
-  version: 0.2.2
-  resolution: "@types/open-graph@npm:0.2.2"
+"@types/open-graph@npm:0.2.4":
+  version: 0.2.4
+  resolution: "@types/open-graph@npm:0.2.4"
   dependencies:
     "@types/cheerio": "*"
-  checksum: 29c0a77e56fce41b2048a743f789afa3dfe5a88311434179deb50b19df564306b527cd0036529f55368fa0540b3332d54dd172e6da5124578c63b84e1aece3f9
+  checksum: d073053a5566c0615f2aa5455c0d442d5bb6e6442452716f1aec97431ca63c3d5ad1917829285a47bf209de1c26cc57c29c94e7f9d3ed8216e7806129cc7d925
   languageName: node
   linkType: hard
 
@@ -5441,99 +4710,94 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/platform@npm:1.3.4":
-  version: 1.3.4
-  resolution: "@types/platform@npm:1.3.4"
-  checksum: dce83952e6af3e488fb2a3c7c7ec226cef4a8606ab63bd40301fe7883ff0c434512210497d6cb79adc4c8e671648ed3e7035438a40f41a5f395c60d2bfb6390d
-  languageName: node
-  linkType: hard
-
-"@types/prettier@npm:^2.1.5":
-  version: 2.7.2
-  resolution: "@types/prettier@npm:2.7.2"
-  checksum: b47d76a5252265f8d25dd2fe2a5a61dc43ba0e6a96ffdd00c594cb4fd74c1982c2e346497e3472805d97915407a09423804cc2110a0b8e1b22cffcab246479b7
+"@types/platform@npm:1.3.5":
+  version: 1.3.5
+  resolution: "@types/platform@npm:1.3.5"
+  checksum: acdefc3f58029747d76dc9f985ab1fc3dd62125d53fe807eedf2cf88f5c660e0aa31e4c2737cfe7738cf1972608ea03d06ca368ce1385cd5e5a5d54632d2a18c
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2.7.3":
-  version: 2.7.3
-  resolution: "@types/prettier@npm:2.7.3"
-  checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83
+"@types/prettier@npm:^3":
+  version: 3.0.0
+  resolution: "@types/prettier@npm:3.0.0"
+  dependencies:
+    prettier: "*"
+  checksum: a2a512d304e5bcf78f38089dc88ad19215e6ab871d435a17aef3ce538a63b07c0e359c18db23989dc1ed9fff96d99eee1f680416080184df5c7e0e3bf767e165
   languageName: node
   linkType: hard
 
 "@types/prop-types@npm:*":
-  version: 15.7.3
-  resolution: "@types/prop-types@npm:15.7.3"
-  checksum: 41831d53c44c9eeafdaf9762bcb4553c13a3bbf990745ed9065a1cc3581b80633113b53fd49b202bf51731b258da5d0a9aa09c9035d5af7f78b0f6bc273f1325
+  version: 15.7.8
+  resolution: "@types/prop-types@npm:15.7.8"
+  checksum: 61dfad79da8b1081c450bab83b77935df487ae1cdd4660ec7df6be8e74725c15fa45cf486ce057addc956ca4ae78300b97091e2a25061133d1b9a1440bc896ae
   languageName: node
   linkType: hard
 
-"@types/react-dom@npm:18.2.6":
-  version: 18.2.6
-  resolution: "@types/react-dom@npm:18.2.6"
+"@types/react-dom@npm:18.2.14":
+  version: 18.2.14
+  resolution: "@types/react-dom@npm:18.2.14"
   dependencies:
     "@types/react": "*"
-  checksum: b56e42efab121a3a8013d2eb8c1688e6028a25ea6d33c4362d2846f0af3760b164b4d7c34846614024cfb8956cca70dd1743487f152e32ff89a00fe6fbd2be54
+  checksum: 890289c70d1966c168037637c09cacefe6205bdd27a33252144a6b432595a2943775ac1a1accac0beddaeb67f8fdf721e076acb1adc990b08e51c3d9fd4e780c
   languageName: node
   linkType: hard
 
 "@types/react-dom@npm:^18.0.0":
-  version: 18.0.11
-  resolution: "@types/react-dom@npm:18.0.11"
+  version: 18.2.13
+  resolution: "@types/react-dom@npm:18.2.13"
   dependencies:
     "@types/react": "*"
-  checksum: 579691e4d5ec09688087568037c35edf8cfb1ab3e07f6c60029280733ee7b5c06d66df6fcc90786702c93ac8cb13bc7ff16c79ddfc75d082938fbaa36e1cdbf4
+  checksum: 22ba066b141dca5a5a9227fae0afc7c94b470fff8e8a38ade72649da57a8ea04d0cb2ba3e22005e7d8e772d49bddd28855b1dd98e6defd033bba6afb6edff883
   languageName: node
   linkType: hard
 
-"@types/react-redux@npm:7.1.25":
-  version: 7.1.25
-  resolution: "@types/react-redux@npm:7.1.25"
+"@types/react-redux@npm:7.1.28":
+  version: 7.1.28
+  resolution: "@types/react-redux@npm:7.1.28"
   dependencies:
     "@types/hoist-non-react-statics": ^3.3.0
     "@types/react": "*"
     hoist-non-react-statics: ^3.3.0
     redux: ^4.0.0
-  checksum: a61ec25cbf8bb3720850402d3c49493fcff4afb73ad447d161460b5d4c600c984ad48708e8564d2fd32052eaa3c3b3f655c5b300ce813429637cce9e5958329f
+  checksum: 521729d7ba781a700e39bf8f8723632ea0abe3698f43a7e131f7613f64613b5724b33ecb5446623ee698182407036f19fc56918c427d7b1fd05ad2a2bd9b6643
   languageName: node
   linkType: hard
 
-"@types/react-transition-group@npm:4.4.6":
-  version: 4.4.6
-  resolution: "@types/react-transition-group@npm:4.4.6"
+"@types/react-transition-group@npm:4.4.8":
+  version: 4.4.8
+  resolution: "@types/react-transition-group@npm:4.4.8"
   dependencies:
     "@types/react": "*"
-  checksum: 0872143821d7ee20a1d81e965f8b1e837837f11cd2206973f1f98655751992d9390304d58bac192c9cd923eca95bff107d8c9e3364a180240d5c2a6fd70fd7c3
+  checksum: ad7ba2bce97631fda9d89b4ed9772489bd050fec3ccd7563041b206dbe219d37d22e0d7731b1f90f56e89daf40e69ba16beba8066c42165bf8a584533feb6a2c
   languageName: node
   linkType: hard
 
 "@types/react-transition-group@npm:^4.4.0":
-  version: 4.4.5
-  resolution: "@types/react-transition-group@npm:4.4.5"
+  version: 4.4.7
+  resolution: "@types/react-transition-group@npm:4.4.7"
   dependencies:
     "@types/react": "*"
-  checksum: 265f1c74061556708ffe8d15559e35c60d6c11478c9950d3735575d2c116ca69f461d85effa06d73a613eb8b73c84fd32682feb57cf7c5f9e4284021dbca25b0
+  checksum: 3b91486e7aa777a3787e773efce79a0fa9be4ec9e02d51ccda8c7532c5c5d84fbcefe248dacb4007293d85bf0794ac51603bb9cec360db81cf3657d2b7123fb9
   languageName: node
   linkType: hard
 
-"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:18.0.28":
-  version: 18.0.28
-  resolution: "@types/react@npm:18.0.28"
+"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:18.2.28":
+  version: 18.2.28
+  resolution: "@types/react@npm:18.2.28"
   dependencies:
     "@types/prop-types": "*"
     "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: e752df961105e5127652460504785897ca6e77259e0da8f233f694f9e8f451cde7fa0709d4456ade0ff600c8ce909cfe29f9b08b9c247fa9b734e126ec53edd7
+  checksum: 81381bedeba83278f4c9febb0b83e0bd3f42a25897a50b9cb36ef53651d34b3d50f87ebf11211ea57ea575131f85d31e93e496ce46478a00b0f9bf7b26b5917a
   languageName: node
   linkType: hard
 
-"@types/redux-mock-store@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@types/redux-mock-store@npm:1.0.3"
+"@types/redux-mock-store@npm:1.0.5":
+  version: 1.0.5
+  resolution: "@types/redux-mock-store@npm:1.0.5"
   dependencies:
     redux: ^4.0.5
-  checksum: b8c76be560fb06c0b5fc8b8874001f0b0219a7a5d0bbbf8f06ebfc437a1300df49f079b30199a9fa99c738817145895a4f0297b8f614edadd1d9e110e917cd0a
+  checksum: 0ecae2d503f388c0e51e0b0eff10bedf3bfe331943c57b43efc66b84b1c1755079c736e8e099ab5be6336ff20d17a3377847c6d7abe39244cd78a69d0db3063d
   languageName: node
   linkType: hard
 
@@ -5547,88 +4811,81 @@ __metadata:
   linkType: hard
 
 "@types/scheduler@npm:*":
-  version: 0.16.1
-  resolution: "@types/scheduler@npm:0.16.1"
-  checksum: 2ff8034df029a6cbb3623b05fa895cac4fc504806a8e948ebe29675a1edfa5ac04faac7611016076b3ffefc2037bbe344ad1978304059b2d4c78e513ec43c7bf
+  version: 0.16.4
+  resolution: "@types/scheduler@npm:0.16.4"
+  checksum: a57b0f10da1b021e6bd5eeef8a1917dd3b08a8715bd8029e2ded2096d8f091bb1bb1fef2d66e139588a983c4bfbad29b59e48011141725fa83c76e986e1257d7
   languageName: node
   linkType: hard
 
 "@types/seedrandom@npm:^3":
-  version: 3.0.5
-  resolution: "@types/seedrandom@npm:3.0.5"
-  checksum: d63d56ebc609203cf8cbe2ab7e7934237446bc2463ade664be130dcd4a3d74915d529909de2e1b18141cfabc9e42784998b7e5ff30c016919ac5b83911a700f0
+  version: 3.0.6
+  resolution: "@types/seedrandom@npm:3.0.6"
+  checksum: 6d50b4ec8db13af2435886659323fa2fc47945f368193ca61eb5e3af9fe4d14db2c862ffbc887769f482e5dacb4b9456c0827507e5baf04ea5696d866e56ac51
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.3.12":
-  version: 7.3.12
-  resolution: "@types/semver@npm:7.3.12"
-  checksum: 35536b2fc5602904f21cae681f6c9498e177dab3f54ae37c92f9a1b7e43c35f18bcd81e1c98c1cf0d33ee046bb06c771e9928c1c00a401d56a03f56549252a15
+"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
+  version: 7.5.3
+  resolution: "@types/semver@npm:7.5.3"
+  checksum: 349fdd1ab6c213bac5c991bac766bd07b8b12e63762462bb058740dcd2eb09c8193d068bb226f134661275f2022976214c0e727a4e5eb83ec1b131127c980d3e
   languageName: node
   linkType: hard
 
-"@types/sinon@npm:10.0.15":
-  version: 10.0.15
-  resolution: "@types/sinon@npm:10.0.15"
+"@types/sinon@npm:10.0.19":
+  version: 10.0.19
+  resolution: "@types/sinon@npm:10.0.19"
   dependencies:
     "@types/sinonjs__fake-timers": "*"
-  checksum: cec6d7d9d5582ca3ac851b029d5d90451bfe6d376164253792a6eb6ddcd609a0411a7fac9ed92e1879e7d3ec091d2ea2e8dbb4f6140a1065439b81dc20cafa7c
+  checksum: 79cab4cfc618a37a11e519795a297aa641b30eb05e2d2c7a9b03f40845b54ef631af80bddbef3e57dcd4be6c67bd78dce5210ea9860617d870f1d365c78468b6
   languageName: node
   linkType: hard
 
 "@types/sinonjs__fake-timers@npm:*":
-  version: 8.1.1
-  resolution: "@types/sinonjs__fake-timers@npm:8.1.1"
-  checksum: ca09d54d47091d87020824a73f026300fa06b17cd9f2f9b9387f28b549364b141ef194ee28db762f6588de71d8febcd17f753163cb7ea116b8387c18e80ebd5c
+  version: 8.1.3
+  resolution: "@types/sinonjs__fake-timers@npm:8.1.3"
+  checksum: d4bac3c1b8d544ac7a57edac3fbf402b055d6401b2f8504fc83908aa40682c71c8ba260c52db29c7a6e72932751c653a0f5185bdb18530534ac50c86425b5cb8
   languageName: node
   linkType: hard
 
 "@types/sizzle@npm:*":
-  version: 2.3.3
-  resolution: "@types/sizzle@npm:2.3.3"
-  checksum: 586a9fb1f6ff3e325e0f2cc1596a460615f0bc8a28f6e276ac9b509401039dd242fa8b34496d3a30c52f5b495873922d09a9e76c50c2ab2bcc70ba3fb9c4e160
+  version: 2.3.4
+  resolution: "@types/sizzle@npm:2.3.4"
+  checksum: cb3b0b2a1b46068c257762d616f3d0d91c85e35e47a6d5101d69d530b7727c564a17868877dd90b5079363496b35698cf2709a7c0bbc0a584eaf91a0e044ebaa
   languageName: node
   linkType: hard
 
-"@types/speakingurl@npm:13.0.3":
-  version: 13.0.3
-  resolution: "@types/speakingurl@npm:13.0.3"
-  checksum: f941298e92b54f0a68cae6dffd7865739b1c001162cd8b0d778c77362be2e259f0336b5bd6a95f9b2ff86e2f290e3a51522b58e92b65d56ddc56e9d1623a15de
+"@types/speakingurl@npm:13.0.5":
+  version: 13.0.5
+  resolution: "@types/speakingurl@npm:13.0.5"
+  checksum: 66b6ee271a684658be9e36625aa72fcc685ea329306f143e36b344cd55295cf384376a1d8942664d610153993b78acf66e06fe217b0e104a131204145b6747cb
   languageName: node
   linkType: hard
 
 "@types/stack-utils@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@types/stack-utils@npm:2.0.0"
-  checksum: b3fbae25b073116977ecb5c67d22f14567b51a7792403b0bf46e5de8f29bde3bd4ec1626afb22065495ca7f1c699c8bd66720050c94b8f8f9bcefbee79d161fd
+  version: 2.0.1
+  resolution: "@types/stack-utils@npm:2.0.1"
+  checksum: 205fdbe3326b7046d7eaf5e494d8084f2659086a266f3f9cf00bccc549c8e36e407f88168ad4383c8b07099957ad669f75f2532ed4bc70be2b037330f7bae019
   languageName: node
   linkType: hard
 
 "@types/tough-cookie@npm:*":
-  version: 4.0.1
-  resolution: "@types/tough-cookie@npm:4.0.1"
-  checksum: 7570c1c2d74201f4ead3512cf8e4c99e97d92ab8a02ae2fb987fd720ced0ca1a2baf250c98a861a170b86762606c9bf6d32207675f13dffc5ab75c08c96578d2
+  version: 4.0.3
+  resolution: "@types/tough-cookie@npm:4.0.3"
+  checksum: f201be1bbca2f2d3572032513cdb9825845114d2604a7f4091af848eeee3228a573cdc5e8082b04468a2848bb1d058f1adbb97db822e22c975ebd6fcd851a453
   languageName: node
   linkType: hard
 
 "@types/trusted-types@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "@types/trusted-types@npm:2.0.2"
-  checksum: 3371eef5f1c50e1c3c07a127c1207b262ba65b83dd167a1c460fc1b135a3fb0c97b9f508efebd383f239cc5dd5b7169093686a692a501fde9c3f7208657d9b0d
-  languageName: node
-  linkType: hard
-
-"@types/uint32@npm:0.2.0":
-  version: 0.2.0
-  resolution: "@types/uint32@npm:0.2.0"
-  checksum: 10e31438f0be48629742ff148f2ae0030008b63d232472bc836dd19c34cdf219ccdfac1d7ff5d89e116c405e4b43e485268375f3343d00a84d1b3f32e3e24691
+  version: 2.0.4
+  resolution: "@types/trusted-types@npm:2.0.4"
+  checksum: 5256c4576cd1c90d33ddd9cc9cbd4f202b39c98cbe8b7f74963298f9eb2159c285ea5c25a6181b4c594d8d75641765bff85d72c2d251ad076e6529ce0eeedd1c
   languageName: node
   linkType: hard
 
-"@types/underscore@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@types/underscore@npm:1.11.5"
-  checksum: 6cd928c436bd65a7b544c979e0958762816dc3fd4f0d430d055faa1e914336568c3a8dd52350760c16ecc37be71d40b0792012bae455d8c5d63e50f02986c9e2
+"@types/underscore@npm:1.11.12":
+  version: 1.11.12
+  resolution: "@types/underscore@npm:1.11.12"
+  checksum: d9ee8505db35c9d07323613afb0df43197815efaeb34034ce2f37386ffd03637324bda27dab9d1ba7ac1c982824e1e3e1454f7d3ed2d56e0dd1d3d07959ecd4d
   languageName: node
   linkType: hard
 
@@ -5639,173 +4896,129 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/webpack-env@npm:1.18.1":
-  version: 1.18.1
-  resolution: "@types/webpack-env@npm:1.18.1"
-  checksum: 3173c069763e51a96565d602af7e6dac9d772ae4aa6f26cac187cbf599a7f0b88f790b4b050b9dbdb0485daed3061b4a337863f3b8ce66f8a4e51f75ad387c6a
+"@types/webpack-env@npm:1.18.3":
+  version: 1.18.3
+  resolution: "@types/webpack-env@npm:1.18.3"
+  checksum: f24e82485d8e325b1875608766ba6dad2b2f53a0fb182bc96173b4590110c6b791163402cdf19b50c04e8c05292f227a08aafe9230b2bba52c40c5f7ceccc101
   languageName: node
   linkType: hard
 
 "@types/yargs-parser@npm:*":
-  version: 20.2.0
-  resolution: "@types/yargs-parser@npm:20.2.0"
-  checksum: 54cf3f8d2c7db47e200e8c96e05b3b33ee554e78d29f3db55f04ca4b86dc6b8ff6b1349f5772268ce2d365cde0a0f4fdd92bf5933c2be2c1ea3f19f0b4599e1f
+  version: 21.0.1
+  resolution: "@types/yargs-parser@npm:21.0.1"
+  checksum: 64e6316c2045e2d460c4fb79572f872f9d2f98fddc6d9d3949c71f0b6ad0ef8a2706cf49db26dfb02a9cb81433abb8f340f015e1d20a9692279abe9477b72c8e
   languageName: node
   linkType: hard
 
 "@types/yargs@npm:^17.0.8":
-  version: 17.0.23
-  resolution: "@types/yargs@npm:17.0.23"
+  version: 17.0.28
+  resolution: "@types/yargs@npm:17.0.28"
   dependencies:
     "@types/yargs-parser": "*"
-  checksum: c5f787d7a9a36ea94ba5d3f340fc5d93d2860eff8fa9731cd614ed23212e4fca75637e2386e37e376a720e4bf088ceed6f39050f1c3638fc1b75bce5c70b1ad4
+  checksum: f78c5e5c29903933c0557b4ffcd1d0b8564d66859c8ca4aa51da3714e49109ed7c2644334a1918d033df19028f4cecc91fd2e502651bb8e8451f246c371da847
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:5.60.0"
+"@typescript-eslint/eslint-plugin@npm:^6.0.0":
+  version: 6.7.5
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.7.5"
   dependencies:
-    "@eslint-community/regexpp": ^4.4.0
-    "@typescript-eslint/scope-manager": 5.60.0
-    "@typescript-eslint/type-utils": 5.60.0
-    "@typescript-eslint/utils": 5.60.0
+    "@eslint-community/regexpp": ^4.5.1
+    "@typescript-eslint/scope-manager": 6.7.5
+    "@typescript-eslint/type-utils": 6.7.5
+    "@typescript-eslint/utils": 6.7.5
+    "@typescript-eslint/visitor-keys": 6.7.5
     debug: ^4.3.4
-    grapheme-splitter: ^1.0.4
-    ignore: ^5.2.0
-    natural-compare-lite: ^1.4.0
-    semver: ^7.3.7
-    tsutils: ^3.21.0
+    graphemer: ^1.4.0
+    ignore: ^5.2.4
+    natural-compare: ^1.4.0
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
   peerDependencies:
-    "@typescript-eslint/parser": ^5.0.0
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 61dd70a1ea9787e69d0d4cd14f6a4c94ba786b535a3f519ade7926d965ee1d4f8fefa8bf0224ee57c5c6517eec3674c0fd06f9226536aa428c2bdddeed1e70f4
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/experimental-utils@npm:^5.0.0":
-  version: 5.10.1
-  resolution: "@typescript-eslint/experimental-utils@npm:5.10.1"
-  dependencies:
-    "@typescript-eslint/utils": 5.10.1
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 652209b59f19de9f6229ff9f688f7ef1c9f19a87484ca53503d4aaf150430cd1c623031c5643e3129344b239c1020c40c24992e416db9d0107cbed4a76c84408
+  checksum: c37edf5a703db4ff9227d67c2d2cf817e65c9afc94cc0e650fa3d2b05ac55201ef887ce9dadb9ca13779f4025bf4367e132b013e3559e777006a2332079bb180
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/parser@npm:5.60.0"
+"@typescript-eslint/parser@npm:^6.0.0":
+  version: 6.7.5
+  resolution: "@typescript-eslint/parser@npm:6.7.5"
   dependencies:
-    "@typescript-eslint/scope-manager": 5.60.0
-    "@typescript-eslint/types": 5.60.0
-    "@typescript-eslint/typescript-estree": 5.60.0
+    "@typescript-eslint/scope-manager": 6.7.5
+    "@typescript-eslint/types": 6.7.5
+    "@typescript-eslint/typescript-estree": 6.7.5
+    "@typescript-eslint/visitor-keys": 6.7.5
     debug: ^4.3.4
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 94e7931a5b356b16638b281b8e1d661f8b1660f0c75a323537f68b311dae91b7a575a0a019d4ea05a79cc5d42b5cb41cc367205691cdfd292ef96a3b66b1e58b
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/scope-manager@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@typescript-eslint/scope-manager@npm:5.10.1"
-  dependencies:
-    "@typescript-eslint/types": 5.10.1
-    "@typescript-eslint/visitor-keys": 5.10.1
-  checksum: a4f802ca683bcb3db0e14739d02e680f0f51b6562c23380ea9e0878a70f638572650bd2dbc62f8d74bc39657c053c3e6469a0d4179d3d99bb94fd47bd14d6ecf
+  checksum: 63f988c1c87697bd20487933be952b97f7a5f2a9977f505af671c7d49367fc01ca508817576646caa937c15cc0a0ef1e86adff9111eb19df8b489e7436d10620
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.59.0":
-  version: 5.59.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.59.0"
+"@typescript-eslint/scope-manager@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/scope-manager@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.0
-    "@typescript-eslint/visitor-keys": 5.59.0
-  checksum: dd89cd34291f7674edcbe9628748faa61dbf7199f9776586167e81fd91b93ba3a7f0ddd493c559c0dbb805b58629858fae648d56550e8ac5330b2ed1802b0178
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/visitor-keys": 5.62.0
+  checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/scope-manager@npm:5.60.0"
+"@typescript-eslint/scope-manager@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/scope-manager@npm:6.7.5"
   dependencies:
-    "@typescript-eslint/types": 5.60.0
-    "@typescript-eslint/visitor-keys": 5.60.0
-  checksum: b21ee1ef57be948a806aa31fd65a9186766b3e1a727030dc47025edcadc54bd1aa6133a439acd5f44a93e2b983dd55bc5571bb01cb834461dab733682d66256a
+    "@typescript-eslint/types": 6.7.5
+    "@typescript-eslint/visitor-keys": 6.7.5
+  checksum: f21858ed78f81ab2d9879139f69657fda2a7b901078f79df64d1262d80f84ef66c56525ed0bb5e393fa5ca5474ad97f2225b7f713977c2d0f79cda31b2744af9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/type-utils@npm:5.60.0"
+"@typescript-eslint/type-utils@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/type-utils@npm:6.7.5"
   dependencies:
-    "@typescript-eslint/typescript-estree": 5.60.0
-    "@typescript-eslint/utils": 5.60.0
+    "@typescript-eslint/typescript-estree": 6.7.5
+    "@typescript-eslint/utils": 6.7.5
     debug: ^4.3.4
-    tsutils: ^3.21.0
+    ts-api-utils: ^1.0.1
   peerDependencies:
-    eslint: "*"
+    eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: b90ce97592f2db899d88d7a325fec4d2ea11a7b8b4306787310890c27fb51862a6c003675252e9dc465908f791ad5320ea7307260ecd10e89ca1d209fbf8616d
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@typescript-eslint/types@npm:5.10.1"
-  checksum: e8bbedae74637c35677aab92eceb154e8f1b100b6015d4aa20b5d52bb2e486e50733feca07610406763e1cc36c448a97ca77f058f4e07e7c61bd8d830c092030
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/types@npm:5.59.0":
-  version: 5.59.0
-  resolution: "@typescript-eslint/types@npm:5.59.0"
-  checksum: 5dc608a867b07b4262a236a264a65e894f841388b3aba461c4c1a30d76a2c3aed0c6a1e3d1ea2f64cce55e783091bafb826bf01a0ef83258820af63da860addf
+  checksum: 8023d8ddcfbf4a0411b192016711068e9e6787c5811aee3a25ac40025ade0d063a1a3d7b38469e1a534bb31fa9dbeec08ab53b7a6d7b3128358294ac5b219d9a
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/types@npm:5.60.0"
-  checksum: 48f29e5c084c5663cfed1a6c4458799a6690a213e7861a24501f9b96698ae59e89a1df1c77e481777e4da78f1b0a5573a549f7b8880e3f4071a7a8b686254db8
+"@typescript-eslint/types@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/types@npm:5.62.0"
+  checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@typescript-eslint/typescript-estree@npm:5.10.1"
-  dependencies:
-    "@typescript-eslint/types": 5.10.1
-    "@typescript-eslint/visitor-keys": 5.10.1
-    debug: ^4.3.2
-    globby: ^11.0.4
-    is-glob: ^4.0.3
-    semver: ^7.3.5
-    tsutils: ^3.21.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 5721e99baa9b286a474a22c4b08e6ac5a0d79435e7f2a91e876e6a2135a44244f0a83ff42cc1cd2ac23cc6ee014965baaa84481e9017f703c45f22e474620c7f
+"@typescript-eslint/types@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/types@npm:6.7.5"
+  checksum: f21e5726b60f13feb3a920c92515fbc1205ba0e9bba9959b2e42c02c282a0ab4fb0e5ae84f3807b9b1cf95036027e9033d92a911fa88e6c243a87621d8dd7a01
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.59.0":
-  version: 5.59.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.59.0"
+"@typescript-eslint/typescript-estree@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.59.0
-    "@typescript-eslint/visitor-keys": 5.59.0
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/visitor-keys": 5.62.0
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
@@ -5814,258 +5027,238 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: d80f2766e2830dc830b9f4f1b9e744e1e7a285ebe72babdf0970f75bfe26cb832c6623bb836a53c48f1e707069d1e407ac1ea095bd583807007f713ba6e2e0e1
+  checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/typescript-estree@npm:5.60.0"
+"@typescript-eslint/typescript-estree@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/typescript-estree@npm:6.7.5"
   dependencies:
-    "@typescript-eslint/types": 5.60.0
-    "@typescript-eslint/visitor-keys": 5.60.0
+    "@typescript-eslint/types": 6.7.5
+    "@typescript-eslint/visitor-keys": 6.7.5
     debug: ^4.3.4
     globby: ^11.1.0
     is-glob: ^4.0.3
-    semver: ^7.3.7
-    tsutils: ^3.21.0
+    semver: ^7.5.4
+    ts-api-utils: ^1.0.1
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 0f4f342730ead42ba60b5fca4bf1950abebd83030010c38b5df98ff9fd95d0ce1cfc3974a44c90c65f381f4f172adcf1a540e018d7968cc845d937bf6c734dae
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/utils@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@typescript-eslint/utils@npm:5.10.1"
-  dependencies:
-    "@types/json-schema": ^7.0.9
-    "@typescript-eslint/scope-manager": 5.10.1
-    "@typescript-eslint/types": 5.10.1
-    "@typescript-eslint/typescript-estree": 5.10.1
-    eslint-scope: ^5.1.1
-    eslint-utils: ^3.0.0
-  peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: beca5b5eb56b6236215baa409619fc8eea700e733094683c3ac39236bf442793b61fcf3ad6fe57ccec265649962d84c1951900e47bd55208ed50c4c2c7d8cf6b
+  checksum: 17685e8321edce1d1ec4278d84e63c0f41ccb19e9308f21c37450943ad0c33328755ac52b966e7855af17e01d22bc83d1fcda79c279fabe7d3460c8f315a7265
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/utils@npm:5.60.0"
+"@typescript-eslint/utils@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/utils@npm:6.7.5"
   dependencies:
-    "@eslint-community/eslint-utils": ^4.2.0
-    "@types/json-schema": ^7.0.9
-    "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.60.0
-    "@typescript-eslint/types": 5.60.0
-    "@typescript-eslint/typescript-estree": 5.60.0
-    eslint-scope: ^5.1.1
-    semver: ^7.3.7
+    "@eslint-community/eslint-utils": ^4.4.0
+    "@types/json-schema": ^7.0.12
+    "@types/semver": ^7.5.0
+    "@typescript-eslint/scope-manager": 6.7.5
+    "@typescript-eslint/types": 6.7.5
+    "@typescript-eslint/typescript-estree": 6.7.5
+    semver: ^7.5.4
   peerDependencies:
-    eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: cbe56567f0b53e24ad7ef7d2fb4cdc8596e2559c21ee639aa0560879b6216208550e51e9d8ae4b388ff21286809c6dc985cec66738294871051396a8ae5bccbc
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: f365c654241f927e7784640079627d60a296aa3d575552b07594a69cfc419832eb5fa4adc87acb1988bea9741ae9cc4a5277dab168990310caef5de125255752
   languageName: node
   linkType: hard
 
 "@typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.58.0":
-  version: 5.59.0
-  resolution: "@typescript-eslint/utils@npm:5.59.0"
+  version: 5.62.0
+  resolution: "@typescript-eslint/utils@npm:5.62.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
     "@types/json-schema": ^7.0.9
     "@types/semver": ^7.3.12
-    "@typescript-eslint/scope-manager": 5.59.0
-    "@typescript-eslint/types": 5.59.0
-    "@typescript-eslint/typescript-estree": 5.59.0
+    "@typescript-eslint/scope-manager": 5.62.0
+    "@typescript-eslint/types": 5.62.0
+    "@typescript-eslint/typescript-estree": 5.62.0
     eslint-scope: ^5.1.1
     semver: ^7.3.7
   peerDependencies:
     eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
-  checksum: 228318df02f2381f859af184cafa5de4146a2e1518a5062444bf9bd7d468e058f9bd93a3e46cc4683d9bd02159648f416e5c7c539901ca16142456cae3c1af5f
+  checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.10.1":
-  version: 5.10.1
-  resolution: "@typescript-eslint/visitor-keys@npm:5.10.1"
+"@typescript-eslint/visitor-keys@npm:5.62.0":
+  version: 5.62.0
+  resolution: "@typescript-eslint/visitor-keys@npm:5.62.0"
   dependencies:
-    "@typescript-eslint/types": 5.10.1
-    eslint-visitor-keys: ^3.0.0
-  checksum: 7e1e1a41b2df797534ee56c0d9ae2a056e0ca0ca019b31125fd52d7deb0e802d899920031f2dbf88a951e6752d8fcbd9fa904eaeccb50cf30d2b92b54fd7879d
+    "@typescript-eslint/types": 5.62.0
+    eslint-visitor-keys: ^3.3.0
+  checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.59.0":
-  version: 5.59.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.59.0"
+"@typescript-eslint/visitor-keys@npm:6.7.5":
+  version: 6.7.5
+  resolution: "@typescript-eslint/visitor-keys@npm:6.7.5"
   dependencies:
-    "@typescript-eslint/types": 5.59.0
-    eslint-visitor-keys: ^3.3.0
-  checksum: e21656de02e221a27a5fe9f7fd34a1ca28530e47675134425f84fd0d1f276695fe39e35120837a491b02255d49aa2fd871e2c858ecccc66c687db972d057bd1c
+    "@typescript-eslint/types": 6.7.5
+    eslint-visitor-keys: ^3.4.1
+  checksum: 2df996742f63d89fa339b0e8ff3a3a289d36b3f584f7538a7626bed3869e9ae27f8f56ab31748519d25a63de2ae22a43dd8413610b00436ff342b0a17eb85289
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:5.60.0":
-  version: 5.60.0
-  resolution: "@typescript-eslint/visitor-keys@npm:5.60.0"
-  dependencies:
-    "@typescript-eslint/types": 5.60.0
-    eslint-visitor-keys: ^3.3.0
-  checksum: d39b2485d030f9755820d0f6f3748a8ec44e1ca23cb36ddcba67a9eb1f258c8ec83c61fc015c50e8f4a00d05df62d719dbda445625e3e71a64a659f1d248157e
+"@ungap/structured-clone@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@ungap/structured-clone@npm:1.2.0"
+  checksum: 4f656b7b4672f2ce6e272f2427d8b0824ed11546a601d8d5412b9d7704e83db38a8d9f402ecdf2b9063fc164af842ad0ec4a55819f621ed7e7ea4d1efcc74524
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ast@npm:1.11.5, @webassemblyjs/ast@npm:^1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/ast@npm:1.11.5"
+"@webassemblyjs/ast@npm:1.11.6, @webassemblyjs/ast@npm:^1.11.5":
+  version: 1.11.6
+  resolution: "@webassemblyjs/ast@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/helper-numbers": 1.11.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
-  checksum: 7df16d8d4364d40e2506776330f8114fddc6494e6e18e8d5ec386312a0881a564cef136b0a74cc4a6ba284e2ff6bad890ddc029a0ba6cf45cc15186e638db118
+    "@webassemblyjs/helper-numbers": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+  checksum: 38ef1b526ca47c210f30975b06df2faf1a8170b1636ce239fc5738fc231ce28389dd61ecedd1bacfc03cbe95b16d1af848c805652080cb60982836eb4ed2c6cf
   languageName: node
   linkType: hard
 
-"@webassemblyjs/floating-point-hex-parser@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.5"
-  checksum: a6f35e3035a1ec4e446fa43da01539f3ed7e0f4b53d152f36ff34be1b63b08d86c4b09b6af375c95472a75f0c37b3b98b07199d157e767b8b3274e7a3962890c
+"@webassemblyjs/floating-point-hex-parser@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/floating-point-hex-parser@npm:1.11.6"
+  checksum: 29b08758841fd8b299c7152eda36b9eb4921e9c584eb4594437b5cd90ed6b920523606eae7316175f89c20628da14326801090167cc7fbffc77af448ac84b7e2
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-api-error@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/helper-api-error@npm:1.11.5"
-  checksum: 717a6ffb3283bd24a7b74710c9bd3d71ec331a26c15446441af19fae9f087e36acb8dcf25b900b6897a1d1eff838e463fe678d66281e7eccee9a3ac0e3447372
+"@webassemblyjs/helper-api-error@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-api-error@npm:1.11.6"
+  checksum: e8563df85161096343008f9161adb138a6e8f3c2cc338d6a36011aa55eabb32f2fd138ffe63bc278d009ada001cc41d263dadd1c0be01be6c2ed99076103689f
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-buffer@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/helper-buffer@npm:1.11.5"
-  checksum: 2c0925b1c3c9b115c183b88d9cf1a12e87fa4fc83ef985aa2a65d72cda543eba6b73b378d231b4feb810b17d3aa6cd297bd603199854346f8a50e3458d7ebbc0
+"@webassemblyjs/helper-buffer@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-buffer@npm:1.11.6"
+  checksum: b14d0573bf680d22b2522e8a341ec451fddd645d1f9c6bd9012ccb7e587a2973b86ab7b89fe91e1c79939ba96095f503af04369a3b356c8023c13a5893221644
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-numbers@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/helper-numbers@npm:1.11.5"
+"@webassemblyjs/helper-numbers@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-numbers@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/floating-point-hex-parser": 1.11.5
-    "@webassemblyjs/helper-api-error": 1.11.5
+    "@webassemblyjs/floating-point-hex-parser": 1.11.6
+    "@webassemblyjs/helper-api-error": 1.11.6
     "@xtuc/long": 4.2.2
-  checksum: 49c8bbf561d4df38009e38e6357c396f4454773fd31a03579a8e050a2b28053f5c47f675f00a37f79a65082c938c2159fa603049688ac01b1bafdb472c21110c
+  checksum: f4b562fa219f84368528339e0f8d273ad44e047a07641ffcaaec6f93e5b76fd86490a009aa91a294584e1436d74b0a01fa9fde45e333a4c657b58168b04da424
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-bytecode@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.5"
-  checksum: 4e868de92587e131a7f22bc4eb44eee60c178d4c2c3eeabcb973b4eac73ec477f25d5f838394797265dbe4b600e781c6e150c762a45f249b94bf0711e73409a7
+"@webassemblyjs/helper-wasm-bytecode@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-wasm-bytecode@npm:1.11.6"
+  checksum: 3535ef4f1fba38de3475e383b3980f4bbf3de72bbb631c2b6584c7df45be4eccd62c6ff48b5edd3f1bcff275cfd605a37679ec199fc91fd0a7705d7f1e3972dc
   languageName: node
   linkType: hard
 
-"@webassemblyjs/helper-wasm-section@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.5"
+"@webassemblyjs/helper-wasm-section@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/helper-wasm-section@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
-    "@webassemblyjs/helper-buffer": 1.11.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
-    "@webassemblyjs/wasm-gen": 1.11.5
-  checksum: 1752d7e0dbbf236a5cdc2257e1626a3562bfb0a7d2e967dc5e798c73088f18f20a991491565e2ffee61615f08035b4760e7aa080380bb60b86b393b6eb7486ae
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.11.6
+  checksum: b2cf751bf4552b5b9999d27bbb7692d0aca75260140195cb58ea6374d7b9c2dc69b61e10b211a0e773f66209c3ddd612137ed66097e3684d7816f854997682e9
   languageName: node
   linkType: hard
 
-"@webassemblyjs/ieee754@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/ieee754@npm:1.11.5"
+"@webassemblyjs/ieee754@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/ieee754@npm:1.11.6"
   dependencies:
     "@xtuc/ieee754": ^1.2.0
-  checksum: 68a855a3e3dd488fff4d2d100e491cb6ac07f728c9432f3216b8e1bb0a374b397b0a5f58fd3b71195e525d49c0c827db15c18897e1c220c629e759b19978e64c
+  checksum: 13574b8e41f6ca39b700e292d7edf102577db5650fe8add7066a320aa4b7a7c09a5056feccac7a74eb68c10dea9546d4461412af351f13f6b24b5f32379b49de
   languageName: node
   linkType: hard
 
-"@webassemblyjs/leb128@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/leb128@npm:1.11.5"
+"@webassemblyjs/leb128@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/leb128@npm:1.11.6"
   dependencies:
     "@xtuc/long": 4.2.2
-  checksum: 555314708b6615c203c31a9dd810141c6de728e0043c2169ca69905ccf4d8603102994cb74ac5d057ac229bfc2be40f69cad2edd134ef2b909ef694eefe7bba6
+  checksum: 7ea942dc9777d4b18a5ebfa3a937b30ae9e1d2ce1fee637583ed7f376334dd1d4274f813d2e250056cca803e0952def4b954913f1a3c9068bcd4ab4ee5143bf0
   languageName: node
   linkType: hard
 
-"@webassemblyjs/utf8@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/utf8@npm:1.11.5"
-  checksum: d8f67a5650d9bf26810da76e72d0547211a44f30f35657953f547e08185facb39ff326920bddec96d35b5cc65e4e66b1f23c6461847e2f93fad2a60b0bb20211
+"@webassemblyjs/utf8@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/utf8@npm:1.11.6"
+  checksum: 807fe5b5ce10c390cfdd93e0fb92abda8aebabb5199980681e7c3743ee3306a75729bcd1e56a3903980e96c885ee53ef901fcbaac8efdfa480f9c0dae1d08713
   languageName: node
   linkType: hard
 
 "@webassemblyjs/wasm-edit@npm:^1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/wasm-edit@npm:1.11.5"
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-edit@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
-    "@webassemblyjs/helper-buffer": 1.11.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
-    "@webassemblyjs/helper-wasm-section": 1.11.5
-    "@webassemblyjs/wasm-gen": 1.11.5
-    "@webassemblyjs/wasm-opt": 1.11.5
-    "@webassemblyjs/wasm-parser": 1.11.5
-    "@webassemblyjs/wast-printer": 1.11.5
-  checksum: 790142a1e282848201c7b68860aabc0141ee44a98a62c3f0af05f8de3cc69b439c3af54ae9a06acbbfbf7fd192b30ee97fb31eda3e08973cae373534ad2135c7
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@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
+  checksum: 29ce75870496d6fad864d815ebb072395a8a3a04dc9c3f4e1ffdc63fc5fa58b1f34304a1117296d8240054cfdbc38aca88e71fb51483cf29ffab0a61ef27b481
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-gen@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/wasm-gen@npm:1.11.5"
+"@webassemblyjs/wasm-gen@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-gen@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
-    "@webassemblyjs/ieee754": 1.11.5
-    "@webassemblyjs/leb128": 1.11.5
-    "@webassemblyjs/utf8": 1.11.5
-  checksum: 0122df4e5ce52d873f19f34b3ebe8237072e9e6a69667cbec42a2d98ba49f85ea2ed3d935195e6a7ad4f64b9dd7da42883f057fe1103d2062bc90f3428b063fe
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: a645a2eecbea24833c3260a249704a7f554ef4a94c6000984728e94bb2bc9140a68dfd6fd21d5e0bbb09f6dfc98e083a45760a83ae0417b41a0196ff6d45a23a
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-opt@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/wasm-opt@npm:1.11.5"
+"@webassemblyjs/wasm-opt@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-opt@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
-    "@webassemblyjs/helper-buffer": 1.11.5
-    "@webassemblyjs/wasm-gen": 1.11.5
-    "@webassemblyjs/wasm-parser": 1.11.5
-  checksum: f9416b0dece071e308616fb30e560f0c3c53b5bb23cc4409781b8c47d31e935b27e9a248c65aee9dd9136271e37a4c5cb0971b27e5adf623020fbb298423fe55
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-buffer": 1.11.6
+    "@webassemblyjs/wasm-gen": 1.11.6
+    "@webassemblyjs/wasm-parser": 1.11.6
+  checksum: b4557f195487f8e97336ddf79f7bef40d788239169aac707f6eaa2fa5fe243557c2d74e550a8e57f2788e70c7ae4e7d32f7be16101afe183d597b747a3bdd528
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wasm-parser@npm:1.11.5, @webassemblyjs/wasm-parser@npm:^1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/wasm-parser@npm:1.11.5"
+"@webassemblyjs/wasm-parser@npm:1.11.6, @webassemblyjs/wasm-parser@npm:^1.11.5":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wasm-parser@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
-    "@webassemblyjs/helper-api-error": 1.11.5
-    "@webassemblyjs/helper-wasm-bytecode": 1.11.5
-    "@webassemblyjs/ieee754": 1.11.5
-    "@webassemblyjs/leb128": 1.11.5
-    "@webassemblyjs/utf8": 1.11.5
-  checksum: 094b3df07532cd2a1db91710622cbaf3d7467a361f9f73dc564999385a472fcc08497d8ccf9294bd7c8813d5e2056c06a81e032abb60520168899605fde9b12c
+    "@webassemblyjs/ast": 1.11.6
+    "@webassemblyjs/helper-api-error": 1.11.6
+    "@webassemblyjs/helper-wasm-bytecode": 1.11.6
+    "@webassemblyjs/ieee754": 1.11.6
+    "@webassemblyjs/leb128": 1.11.6
+    "@webassemblyjs/utf8": 1.11.6
+  checksum: 8200a8d77c15621724a23fdabe58d5571415cda98a7058f542e670ea965dd75499f5e34a48675184947c66f3df23adf55df060312e6d72d57908e3f049620d8a
   languageName: node
   linkType: hard
 
-"@webassemblyjs/wast-printer@npm:1.11.5":
-  version: 1.11.5
-  resolution: "@webassemblyjs/wast-printer@npm:1.11.5"
+"@webassemblyjs/wast-printer@npm:1.11.6":
+  version: 1.11.6
+  resolution: "@webassemblyjs/wast-printer@npm:1.11.6"
   dependencies:
-    "@webassemblyjs/ast": 1.11.5
+    "@webassemblyjs/ast": 1.11.6
     "@xtuc/long": 4.2.2
-  checksum: c2995224c56b403be7fce7afbb3ad6b2ceadce07a47b28bce745eabb0435fa363c0180bca907d28703ece02422d0de219e689253b55de288c79b8f92416c1d71
+  checksum: d2fa6a4c427325ec81463e9c809aa6572af6d47f619f3091bf4c4a6fc34f1da3df7caddaac50b8e7a457f8784c62cd58c6311b6cb69b0162ccd8d4c072f79cf8
   languageName: node
   linkType: hard
 
@@ -6102,29 +5295,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/api-client@npm:^24.16.0":
-  version: 24.16.0
-  resolution: "@wireapp/api-client@npm:24.16.0"
+"@wireapp/api-client@npm:^26.4.0":
+  version: 26.4.0
+  resolution: "@wireapp/api-client@npm:26.4.0"
   dependencies:
-    "@wireapp/commons": ^5.1.0
-    "@wireapp/priority-queue": ^2.1.1
+    "@wireapp/commons": ^5.2.1
+    "@wireapp/priority-queue": ^2.1.4
     "@wireapp/protocol-messaging": 1.44.0
-    axios: 1.4.0
-    axios-retry: 3.5.0
-    http-status-codes: 2.2.0
+    axios: 1.5.1
+    axios-retry: 3.8.0
+    http-status-codes: 2.3.0
     logdown: 3.3.1
+    pako: 2.1.0
     reconnecting-websocket: 4.4.0
     spark-md5: 3.0.2
     tough-cookie: 4.1.3
-    ws: 8.11.0
-  checksum: 92af35a97144148d460a68c163f9b159fd9b4796376301e1434bf84698fad46980da0bd1409cada959ab82b0de282907e57a2a720955210077f1b96267c22c40
+    ws: 8.14.2
+    zod: 3.22.4
+  checksum: 900233b8ec83803ade60e5ec4121ef21103be33e6587a6065bd82713d0b235b010c89db59be58c50711175bd7518584477adcb06f05ce67ef54e722e3fcb5f1b
   languageName: node
   linkType: hard
 
-"@wireapp/avs@npm:9.2.15":
-  version: 9.2.15
-  resolution: "@wireapp/avs@npm:9.2.15"
-  checksum: 2d4def0f02959cce907ddc0dfcae54338aa3ff6e66dbb6f1b543d0f22dbaff59c93be0dbeafb26e99c6ed8bad0c9b770c36db3d21b04ad61260716a9a15c3fe6
+"@wireapp/avs@npm:9.5.2":
+  version: 9.5.2
+  resolution: "@wireapp/avs@npm:9.5.2"
+  checksum: e728dfed25af97c6dee587a7f9174466971866993e098a0017eba37ed40a70b4a4155f4f9ab25968020e048ee1a31ced8ae9a224ee77cb793a556b40a01950af
   languageName: node
   linkType: hard
 
@@ -6135,63 +5330,64 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "@wireapp/commons@npm:5.1.0"
+"@wireapp/commons@npm:5.2.1, @wireapp/commons@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "@wireapp/commons@npm:5.2.1"
   dependencies:
     ansi-regex: 5.0.1
     fs-extra: 11.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: 1abb97ff5ab0f0cf0b9882997f71929170abb7e0d4b5d1cd0bff3821b94e38aaddcebf9fb410493601d3595a843b86582c81e5036e567997be011741c6e0ec28
+  checksum: 1510b705a40d45ceaf07b12b5a199d94fe977d3b2faaafc298ff167a65b820471f5863f9f93f27d2003f9f44ee3401423d6e12bb38ecd7808f8b2fc72821d411
   languageName: node
   linkType: hard
 
-"@wireapp/copy-config@npm:2.1.1":
-  version: 2.1.1
-  resolution: "@wireapp/copy-config@npm:2.1.1"
+"@wireapp/copy-config@npm:2.1.9":
+  version: 2.1.9
+  resolution: "@wireapp/copy-config@npm:2.1.9"
   dependencies:
-    axios: 1.4.0
+    axios: 1.5.1
     copy: 0.3.2
-    cosmiconfig: 8.2.0
+    cosmiconfig: 8.3.6
     fs-extra: 11.1.0
     jszip: 3.10.1
     logdown: 3.3.1
   bin:
     copy-config: lib/cli.js
-  checksum: 2af760dafb3597deb071c0332e0f1d5938ad00b6a599c23ac053f5cc8cceb94797c3e6f947242436b9129413c1a37d6fff00bd527e44cb77d9ebe19f4c82d847
+  checksum: 37ee9d82c6eabc33573ede5c0d9e467c2d6c3dd8f0c2717378ef8c4b84b568613d64e33f4f2903b9d4d612b25ea40f22881e0f44b51cd4f72185f0606294a168
   languageName: node
   linkType: hard
 
-"@wireapp/core-crypto@npm:1.0.0-pre.5":
-  version: 1.0.0-pre.5
-  resolution: "@wireapp/core-crypto@npm:1.0.0-pre.5"
-  checksum: 627e55ab7272f25047afda61d4e9f1f496a85a2326a2d01970fdf70f08abac996fabfa0c42d9bb8ee049abd03529b8f58ed72f0dcfb1c01f2a1c193ae6d14ad4
+"@wireapp/core-crypto@npm:1.0.0-rc.13":
+  version: 1.0.0-rc.13
+  resolution: "@wireapp/core-crypto@npm:1.0.0-rc.13"
+  checksum: 8edbf8ffbda8db2b0a2a9dd93fe5c823fb337bb6f4eef0333d3c96ea8d594739b50511eb8d463e11863205537e505fe78fe8a25fcf6e61c675ad30a335cf1b5d
   languageName: node
   linkType: hard
 
-"@wireapp/core@npm:40.6.0":
-  version: 40.6.0
-  resolution: "@wireapp/core@npm:40.6.0"
+"@wireapp/core@npm:42.17.0":
+  version: 42.17.0
+  resolution: "@wireapp/core@npm:42.17.0"
   dependencies:
-    "@wireapp/api-client": ^24.16.0
-    "@wireapp/commons": ^5.1.0
-    "@wireapp/core-crypto": 1.0.0-pre.5
+    "@wireapp/api-client": ^26.4.0
+    "@wireapp/commons": ^5.2.1
+    "@wireapp/core-crypto": 1.0.0-rc.13
     "@wireapp/cryptobox": 12.8.0
-    "@wireapp/promise-queue": ^2.2.0
+    "@wireapp/promise-queue": ^2.2.6
     "@wireapp/protocol-messaging": 1.44.0
-    "@wireapp/store-engine": 5.1.1
-    "@wireapp/store-engine-dexie": ^2.1.2
-    axios: 1.4.0
-    bazinga64: 6.1.1
-    deepmerge-ts: 4.3.0
+    "@wireapp/store-engine": 5.1.4
+    "@wireapp/store-engine-dexie": ^2.1.6
+    axios: 1.5.1
+    bazinga64: ^6.3.1
+    deepmerge-ts: 5.1.0
     hash.js: 1.1.7
-    http-status-codes: 2.2.0
+    http-status-codes: 2.3.0
     idb: 7.1.1
     logdown: 3.3.1
     long: ^5.2.0
     uuidjs: 4.2.13
-  checksum: e27e71409de6224847a283d30a3c98ed748da40d4a881c940eb372964f3586263fc7691782eaa2ad2239cabaa6b27fa9dd3066c98ca8fc7e5a6511f63788ba99
+    zod: 3.22.4
+  checksum: 97176143fbab1c36abb7cb0ec6372347b108729cb49d43c8d332c11bba023b3ccbb49806d6edaea1a116f27e3e34ed7c53ade665e3e59fd0552129c2c10cb4eb
   languageName: node
   linkType: hard
 
@@ -6209,35 +5405,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/eslint-config@npm:2.2.2":
-  version: 2.2.2
-  resolution: "@wireapp/eslint-config@npm:2.2.2"
-  peerDependencies:
+"@wireapp/eslint-config@npm:3.0.4":
+  version: 3.0.4
+  resolution: "@wireapp/eslint-config@npm:3.0.4"
+  dependencies:
     "@types/eslint": ^8
-    "@types/prettier": ^2
-    "@typescript-eslint/eslint-plugin": ^5
-    "@typescript-eslint/parser": ^5
+    "@types/prettier": ^3
+    "@typescript-eslint/eslint-plugin": ^6.0.0
+    "@typescript-eslint/parser": ^6.0.0
+    eslint: ^8
+    eslint-config-prettier: ^9
+    eslint-import-resolver-alias: ^1.1.2
+    eslint-import-resolver-typescript: ^3.5.2
+    eslint-plugin-better-styled-components: ^1.1.2
+    eslint-plugin-header: ^3.1.1
+    eslint-plugin-import: ^2.26.0
+    eslint-plugin-jest: ^27.1.4
+    eslint-plugin-jest-dom: ^5.0.2
+    eslint-plugin-jsdoc: ^46.2.3
+    eslint-plugin-jsx-a11y: ^6.6.1
+    eslint-plugin-no-unsanitized: ^4.0.1
+    eslint-plugin-prettier: ^5
+    eslint-plugin-react: ^7.31.10
+    eslint-plugin-react-hooks: ^4.6.0
+    eslint-plugin-simple-import-sort: ^10.0.0
+    eslint-plugin-testing-library: ^6.0.0
+    eslint-plugin-unused-imports: ^3
+    prettier: ^3
+    typescript: ^5
+  peerDependencies:
     eslint: ^8
-    eslint-config-prettier: ^8
-    eslint-import-resolver-alias: ^1
-    eslint-import-resolver-typescript: ^3
-    eslint-plugin-better-styled-components: ^1
-    eslint-plugin-header: ^3
-    eslint-plugin-import: ^2
-    eslint-plugin-jest: ^27
-    eslint-plugin-jest-dom: ^4
-    eslint-plugin-jsdoc: ^39
-    eslint-plugin-jsx-a11y: ^6
-    eslint-plugin-no-unsanitized: ^4
-    eslint-plugin-prettier: ^4
-    eslint-plugin-react: ^7
-    eslint-plugin-react-hooks: ^4
-    eslint-plugin-simple-import-sort: ^8
-    eslint-plugin-testing-library: ^5
-    eslint-plugin-unused-imports: ^2
-    prettier: ^2
-    typescript: ^4
-  checksum: c468c3713d275b5e54b7f382aa167f433678ba9011647679d2be04b5c2068b602d2b215e1a7804e1a26184e3769c7bbc66e003f6e411f9db233ceaaaa1e89527
+    prettier: ^3
+  checksum: 31d1652961c9155b72e1bb82db65376ccdd28306f3f6743604c242427d883f37a7450f3cab3bc91a9c8b4e137eabf9ce171d076ebeebced4dd31e0dcf9963505
   languageName: node
   linkType: hard
 
@@ -6248,10 +5447,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/prettier-config@npm:0.6.0":
-  version: 0.6.0
-  resolution: "@wireapp/prettier-config@npm:0.6.0"
-  checksum: 17092b05bbacc0d3f2677b573761f39d2257d6a705c35a4cef3a8ce9064032237dd86e2415de5295e4d0a97d5ac1150d11cc8c13f0bed0dd5481b00dbf14c992
+"@wireapp/prettier-config@npm:0.6.3":
+  version: 0.6.3
+  resolution: "@wireapp/prettier-config@npm:0.6.3"
+  checksum: 21c5cb71bc5c0f40c83ea3d3998040858e9896fb939010b07d86cb1b629d6354a65aa961f6b92dededb844311712d4c35de4d6a810d40cc58f6bba0acec3f72f
   languageName: node
   linkType: hard
 
@@ -6264,17 +5463,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/priority-queue@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "@wireapp/priority-queue@npm:2.1.1"
-  checksum: e25286e228732a43edc8d7f8cc596f1e6fb414fed472db99d269d81289a5c59bfe5cce09f9e793aa0100d5ea7abe36c8931af9be50c275cb3e18894e1c5077dc
+"@wireapp/priority-queue@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "@wireapp/priority-queue@npm:2.1.4"
+  checksum: 2e188dbcd12ff75038c66a37709d0ed99cfd58bf92210c9ef720ea39f916f95a3627a3d693e3d017c30e0a92a50a556244b62f1e6961fa2ffdc7028ed6050c7c
   languageName: node
   linkType: hard
 
-"@wireapp/promise-queue@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@wireapp/promise-queue@npm:2.2.0"
-  checksum: c0c6c66be8316844cdeadb77d176846103f98087027dd8c88f99ab664b62982918a49cab6aeb16a35c7d07347f80a3f6bc200edc20877ed382b635cab6d61ff9
+"@wireapp/promise-queue@npm:^2.2.6":
+  version: 2.2.6
+  resolution: "@wireapp/promise-queue@npm:2.2.6"
+  checksum: 6de05205a44b62dea38b6a0c00ec8d8f9bd96c98d8e4fa6cf711a9fb5cf5fd39f818432d3c676649e1d5cb638fe9386b24cc098b4514c378d995295ed2f8f3d6
   languageName: node
   linkType: hard
 
@@ -6302,14 +5501,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/react-ui-kit@npm:9.7.5":
-  version: 9.7.5
-  resolution: "@wireapp/react-ui-kit@npm:9.7.5"
+"@wireapp/react-ui-kit@npm:9.9.11":
+  version: 9.9.11
+  resolution: "@wireapp/react-ui-kit@npm:9.9.11"
   dependencies:
-    "@types/color": 3.0.3
+    "@types/color": 3.0.4
     color: 4.2.3
     emotion-normalize: 11.0.1
-    react-select: 5.7.3
+    react-select: 5.7.5
     react-transition-group: 4.4.5
   peerDependencies:
     "@emotion/react": 11.10.4
@@ -6319,29 +5518,18 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 0f8178f46f3780c659e2fe4099f7607d82551a5ab5fc862c941abe3ac435e0c3f7087dd596461cc4a9a4a79d1f014d3fd9f980938375ad60ac65935022ca965f
-  languageName: node
-  linkType: hard
-
-"@wireapp/store-engine-dexie@npm:2.1.1":
-  version: 2.1.1
-  resolution: "@wireapp/store-engine-dexie@npm:2.1.1"
-  dependencies:
-    dexie: 3.2.3
-  peerDependencies:
-    "@wireapp/store-engine": 5.x.x
-  checksum: 0b1bf146d7cdb08b0ddb826c823d94d85c75e92b821cb0430b3b79c075aaec06a63dd3e60cbf2ac31ce4aa7c78e64e44d86c5ec2d459ddefcac301cc2b709be4
+  checksum: 2bb5023b171b9b5da5084b783b8a55221f971b60acd8f7f8770f81578dd2edfa05ed8854c856235f0648231278762ac977305d602a953f31c89e762abb396b85
   languageName: node
   linkType: hard
 
-"@wireapp/store-engine-dexie@npm:^2.1.2":
-  version: 2.1.2
-  resolution: "@wireapp/store-engine-dexie@npm:2.1.2"
+"@wireapp/store-engine-dexie@npm:2.1.6, @wireapp/store-engine-dexie@npm:^2.1.6":
+  version: 2.1.6
+  resolution: "@wireapp/store-engine-dexie@npm:2.1.6"
   dependencies:
-    dexie: 3.2.4
+    dexie: ^3.2.0
   peerDependencies:
     "@wireapp/store-engine": 5.x.x
-  checksum: a09d59ecd8248188a62f45e64d9d250555eb0da7d4eecc7105e7cc0d30dcd84bdc23278fbe7863ac6eb49c3b7694dde0ac881665335fa42f2f73f26f938313eb
+  checksum: d7a16d3681ef8b2e49f649e7c57d1efa22eb403d58697e2654f42d9c60651af6be78197c255aa946c5b82e5a37712a5cdc2809c9f9c9939995da3a6c8dd4d2d2
   languageName: node
   linkType: hard
 
@@ -6367,17 +5555,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/store-engine@npm:5.1.1, @wireapp/store-engine@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "@wireapp/store-engine@npm:5.1.1"
-  checksum: 90177b191677645facf9d6b4059f1f83598368d708f85e3ad98fbc1c56d305139f15ad2db29e4b35b75224af177c0d878036ab42bdf338a50f57c98893ef3cfa
+"@wireapp/store-engine@npm:5.1.4, @wireapp/store-engine@npm:^5.1.4":
+  version: 5.1.4
+  resolution: "@wireapp/store-engine@npm:5.1.4"
+  checksum: 878b194c5d0774ed54a120bcf718e12992715cd2d546a3d2780b884adf3da2460ab6516024467e1f7d8df5eab83fc96db0dbae54b27620c24567c4a7603b8232
   languageName: node
   linkType: hard
 
-"@wireapp/webapp-events@npm:0.17.0":
-  version: 0.17.0
-  resolution: "@wireapp/webapp-events@npm:0.17.0"
-  checksum: 9257321dc120d7ac33e11c2ae66cc5f04de64fed029c6d50644d86bf283044b3c74e18d487721793171333261b22de2d032266554b95d36f99da623d11d3cc10
+"@wireapp/webapp-events@npm:0.18.3":
+  version: 0.18.3
+  resolution: "@wireapp/webapp-events@npm:0.18.3"
+  checksum: 03e16464df7599ca4877a0b5242c7557933b6ae93fdf5c475864db2235f5903e6ccddbb8798051de81cb2e0e9b20b7e6f9e4444dad5510d1fe183dc04347df12
   languageName: node
   linkType: hard
 
@@ -6432,22 +5620,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-dynamic-import@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "acorn-dynamic-import@npm:4.0.0"
-  peerDependencies:
-    acorn: ^6.0.0
-  checksum: ef7298e632e9d107b2be06b47d607de94d7213ca2417fced02af76b0c71e13074d98924e270c7bfec421c1049ed9001a97ed4d0f28020d9cfa1aae16ca20664a
-  languageName: node
-  linkType: hard
-
-"acorn-globals@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "acorn-globals@npm:6.0.0"
+"acorn-globals@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "acorn-globals@npm:7.0.1"
   dependencies:
-    acorn: ^7.1.1
-    acorn-walk: ^7.1.1
-  checksum: 72d95e5b5e585f9acd019b993ab8bbba68bb3cbc9d9b5c1ebb3c2f1fe5981f11deababfb4949f48e6262f9c57878837f5958c0cca396f81023814680ca878042
+    acorn: ^8.1.0
+    acorn-walk: ^8.0.2
+  checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
   languageName: node
   linkType: hard
 
@@ -6460,7 +5639,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-jsx@npm:^5.2.0, acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
+"acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
@@ -6513,35 +5692,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^7.1.1":
-  version: 7.2.0
-  resolution: "acorn-walk@npm:7.2.0"
-  checksum: 9252158a79b9d92f1bc0dd6acc0fcfb87a67339e84bcc301bb33d6078936d27e35d606b4d35626d2962cd43c256d6f27717e70cbe15c04fff999ab0b2260b21f
-  languageName: node
-  linkType: hard
-
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.1.1":
+"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
   checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.1.1":
-  version: 7.4.1
-  resolution: "acorn@npm:7.4.1"
-  bin:
-    acorn: bin/acorn
-  checksum: 1860f23c2107c910c6177b7b7be71be350db9e1080d814493fae143ae37605189504152d1ba8743ba3178d0b37269ce1ffc42b101547fdc1827078f82671e407
-  languageName: node
-  linkType: hard
-
-"acorn@npm:^8.0.4, acorn@npm:^8.4.1, acorn@npm:^8.5.0, acorn@npm:^8.7.1, acorn@npm:^8.8.0":
-  version: 8.8.0
-  resolution: "acorn@npm:8.8.0"
+"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.10.0
+  resolution: "acorn@npm:8.10.0"
   bin:
     acorn: bin/acorn
-  checksum: 7270ca82b242eafe5687a11fea6e088c960af712683756abf0791b68855ea9cace3057bd5e998ffcef50c944810c1e0ca1da526d02b32110e13c722aa959afdc
+  checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d
   languageName: node
   linkType: hard
 
@@ -6562,13 +5725,11 @@ __metadata:
   linkType: hard
 
 "agentkeepalive@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "agentkeepalive@npm:4.2.1"
+  version: 4.5.0
+  resolution: "agentkeepalive@npm:4.5.0"
   dependencies:
-    debug: ^4.1.0
-    depd: ^1.1.2
     humanize-ms: ^1.2.1
-  checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18
+  checksum: 13278cd5b125e51eddd5079f04d6fe0914ac1b8b91c1f3db2c1822f99ac1a7457869068997784342fe455d59daaff22e14fb7b8c3da4e741896e7e31faf92481
   languageName: node
   linkType: hard
 
@@ -6605,18 +5766,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv-keywords@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "ajv-keywords@npm:5.0.0"
+"ajv-keywords@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "ajv-keywords@npm:5.1.0"
   dependencies:
     fast-deep-equal: ^3.1.3
   peerDependencies:
-    ajv: ^8.0.0
-  checksum: 239dd46383a861f9e1dda1f463542ddfa07b4aed886eccb2a4328672c886030b5fdbb7869e0e293ba5549c9b86b23b40fa0e3c0785047e081302f00e41b1e4c1
+    ajv: ^8.8.2
+  checksum: c35193940b853119242c6757787f09ecf89a2c19bcd36d03ed1a615e710d19d450cb448bfda407b939aba54b002368c8bff30529cc50a0536a8e10bcce300421
   languageName: node
   linkType: hard
 
-"ajv@npm:^6.10.0, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+"ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -6628,15 +5789,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.8.0":
-  version: 8.8.1
-  resolution: "ajv@npm:8.8.1"
+"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.6.0, ajv@npm:^8.9.0":
+  version: 8.12.0
+  resolution: "ajv@npm:8.12.0"
   dependencies:
     fast-deep-equal: ^3.1.1
     json-schema-traverse: ^1.0.0
     require-from-string: ^2.0.2
     uri-js: ^4.2.2
-  checksum: 1d586cea81b266f5f984c3a9f392a70f59181eb895ecb3463c4fc5c6acd5a4aefbe28f6d361dec4b04078fa6ec8343113cc8abdf577c8b99790d30ef71eea6b2
+  checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001
   languageName: node
   linkType: hard
 
@@ -6649,12 +5810,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0":
-  version: 4.3.1
-  resolution: "ansi-escapes@npm:4.3.1"
+"ansi-escapes@npm:^4.2.1":
+  version: 4.3.2
+  resolution: "ansi-escapes@npm:4.3.2"
+  dependencies:
+    type-fest: ^0.21.3
+  checksum: 93111c42189c0a6bed9cdb4d7f2829548e943827ee8479c74d6e0b22ee127b2a21d3f8b5ca57723b8ef78ce011fbfc2784350eb2bde3ccfccf2f575fa8489815
+  languageName: node
+  linkType: hard
+
+"ansi-escapes@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "ansi-escapes@npm:5.0.0"
   dependencies:
-    type-fest: ^0.11.0
-  checksum: c4962c1791cc4e29efb9976680bad7b23f322ca039e588406680fffc8b6bc6e223721193eb481dab076309d9a7371bbfc4e835efe5fe267e3395ffa047da239d
+    type-fest: ^1.0.2
+  checksum: d4b5eb8207df38367945f5dd2ef41e08c28edc192dc766ef18af6b53736682f49d8bfcfa4e4d6ecbc2e2f97c258fda084fb29a9e43b69170b71090f771afccac
   languageName: node
   linkType: hard
 
@@ -6722,10 +5892,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^6.0.0":
-  version: 6.1.0
-  resolution: "ansi-styles@npm:6.1.0"
-  checksum: 7a7f8528c07a9d20c3a92bccd2b6bc3bb4d26e5cb775c02826921477377bd495d615d61f710d56216344b6238d1d11ef2b0348e146c5b128715578bfb3217229
+"ansi-styles@npm:^6.0.0, ansi-styles@npm:^6.1.0":
+  version: 6.2.1
+  resolution: "ansi-styles@npm:6.2.1"
+  checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9
   languageName: node
   linkType: hard
 
@@ -6739,26 +5909,17 @@ __metadata:
 "any-base@npm:^1.1.0":
   version: 1.1.0
   resolution: "any-base@npm:1.1.0"
-  checksum: c1fd040de52e710e2de7d9ae4df52bac589f35622adb24686c98ce21c7b824859a8db9614bc119ed8614f42fd08918b2612e6a6c385480462b3100a1af59289d
-  languageName: node
-  linkType: hard
-
-"anymatch@npm:^3.0.3":
-  version: 3.1.1
-  resolution: "anymatch@npm:3.1.1"
-  dependencies:
-    normalize-path: ^3.0.0
-    picomatch: ^2.0.4
-  checksum: c951385862bf114807d594bdffccb769bd7219ddc14f24fc135cde075ad2477a97991567b8bb5032d4f279f96897f0c2af6468a350a6c674ac0a5ee3b62a26d6
+  checksum: c1fd040de52e710e2de7d9ae4df52bac589f35622adb24686c98ce21c7b824859a8db9614bc119ed8614f42fd08918b2612e6a6c385480462b3100a1af59289d
   languageName: node
   linkType: hard
 
-"append-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "append-buffer@npm:1.0.2"
+"anymatch@npm:^3.0.3, anymatch@npm:^3.1.3":
+  version: 3.1.3
+  resolution: "anymatch@npm:3.1.3"
   dependencies:
-    buffer-equal: ^1.0.0
-  checksum: e809940b5137c0bfa6f6d4aefcae45b5a15a28938749c0ef50eb39e4d877978fcabf08ceba10d6f214fc15f021681f308fe24865d6557126e2923c58e9c3a134
+    normalize-path: ^3.0.0
+    picomatch: ^2.0.4
+  checksum: 3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2
   languageName: node
   linkType: hard
 
@@ -6769,36 +5930,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"archiver-utils@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "archiver-utils@npm:2.1.0"
+"archiver-utils@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "archiver-utils@npm:4.0.1"
   dependencies:
-    glob: ^7.1.4
+    glob: ^8.0.0
     graceful-fs: ^4.2.0
     lazystream: ^1.0.0
-    lodash.defaults: ^4.2.0
-    lodash.difference: ^4.5.0
-    lodash.flatten: ^4.4.0
-    lodash.isplainobject: ^4.0.6
-    lodash.union: ^4.6.0
+    lodash: ^4.17.15
     normalize-path: ^3.0.0
-    readable-stream: ^2.0.0
-  checksum: 5665f40bde87ee82cb638177bdccca8cc6e55edea1b94338f7e6b56a1d9367b0d9a39e42b47866eaf84b8c67669a7d250900a226207ecc30fa163b52aae859a5
+    readable-stream: ^3.6.0
+  checksum: 2917cdf63a912c74002a4a1e6de3076a4691030b4e722efdd6d862447b61cd64c8b7688d331b1d35f8d4fc661d6e34f91bc1ffc79478fca2e48ad060acece18c
   languageName: node
   linkType: hard
 
-"archiver@npm:^5.3.1":
-  version: 5.3.1
-  resolution: "archiver@npm:5.3.1"
+"archiver@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "archiver@npm:6.0.1"
   dependencies:
-    archiver-utils: ^2.1.0
-    async: ^3.2.3
+    archiver-utils: ^4.0.1
+    async: ^3.2.4
     buffer-crc32: ^0.2.1
     readable-stream: ^3.6.0
-    readdir-glob: ^1.0.0
-    tar-stream: ^2.2.0
-    zip-stream: ^4.1.0
-  checksum: 905b198ed04d26c951b80545d45c7f2e0432ef89977a93af8a762501d659886e39dda0fbffb0d517ff3fa450a3d09a29146e4273c2170624e1988f889fb5302c
+    readdir-glob: ^1.1.2
+    tar-stream: ^3.0.0
+    zip-stream: ^5.0.1
+  checksum: 20549eef7366173440a86873387412226568744a410626f826998b0dda85fe84e739c542d9db9aca3923b772436eb795eafdff29c2983e683355fdd9faaa0fdb
+  languageName: node
+  linkType: hard
+
+"are-docs-informative@npm:^0.0.2":
+  version: 0.0.2
+  resolution: "are-docs-informative@npm:0.0.2"
+  checksum: 7a48ca90d66e29afebc4387d7029d86cfe97bad7e796c8e7de01309e02dcfc027250231c02d4ca208d2984170d09026390b946df5d3d02ac638ab35f74501c74
   languageName: node
   linkType: hard
 
@@ -6845,7 +6009,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:^5.0.0, aria-query@npm:^5.1.3":
+"aria-query@npm:5.1.3":
   version: 5.1.3
   resolution: "aria-query@npm:5.1.3"
   dependencies:
@@ -6854,6 +6018,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-query@npm:^5.1.3":
+  version: 5.3.0
+  resolution: "aria-query@npm:5.3.0"
+  dependencies:
+    dequal: ^2.0.3
+  checksum: 305bd73c76756117b59aba121d08f413c7ff5e80fa1b98e217a3443fcddb9a232ee790e24e432b59ae7625aebcf4c47cb01c2cac872994f0b426f5bdfcd96ba9
+  languageName: node
+  linkType: hard
+
 "arr-union@npm:^3.1.0":
   version: 3.1.0
   resolution: "arr-union@npm:3.1.0"
@@ -6861,16 +6034,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.5, array-includes@npm:^3.1.6":
-  version: 3.1.6
-  resolution: "array-includes@npm:3.1.6"
+"array-buffer-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "array-buffer-byte-length@npm:1.0.0"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    get-intrinsic: ^1.1.3
+    is-array-buffer: ^3.0.1
+  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+  languageName: node
+  linkType: hard
+
+"array-includes@npm:^3.1.6":
+  version: 3.1.7
+  resolution: "array-includes@npm:3.1.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
     is-string: ^1.0.7
-  checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5
+  checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc
   languageName: node
   linkType: hard
 
@@ -6888,40 +6071,68 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlastindex@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "array.prototype.findlastindex@npm:1.2.3"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+    get-intrinsic: ^1.2.1
+  checksum: 31f35d7b370c84db56484618132041a9af401b338f51899c2e78ef7690fbba5909ee7ca3c59a7192085b328cc0c68c6fd1f6d1553db01a689a589ae510f3966e
+  languageName: node
+  linkType: hard
+
 "array.prototype.flat@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "array.prototype.flat@npm:1.3.1"
+  version: 1.3.2
+  resolution: "array.prototype.flat@npm:1.3.2"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-  checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b
+  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
   languageName: node
   linkType: hard
 
 "array.prototype.flatmap@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "array.prototype.flatmap@npm:1.3.1"
+  version: 1.3.2
+  resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-  checksum: 8c1c43a4995f12cf12523436da28515184c753807b3f0bc2ca6c075f71c470b099e2090cc67dba8e5280958fea401c1d0c59e1db0143272aef6cd1103921a987
+  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
   languageName: node
   linkType: hard
 
 "array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+  version: 1.1.2
+  resolution: "array.prototype.tosorted@npm:1.1.2"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
     es-shim-unscopables: ^1.0.0
-    get-intrinsic: ^1.1.3
-  checksum: 7923324a67e70a2fc0a6e40237405d92395e45ebd76f5cb89c2a5cf1e66b47aca6baacd0cd628ffd88830b90d47fff268071493d09c9ae123645613dac2c2ca3
+    get-intrinsic: ^1.2.1
+  checksum: 3607a7d6b117f0ffa6f4012457b7af0d47d38cf05e01d50e09682fd2fb782a66093a5e5fbbdbad77c8c824794a9d892a51844041641f719ad41e3a974f0764de
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+  dependencies:
+    array-buffer-byte-length: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    is-array-buffer: ^3.0.2
+    is-shared-array-buffer: ^1.0.2
+  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
   languageName: node
   linkType: hard
 
@@ -6932,6 +6143,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asn1js@npm:^3.0.5":
+  version: 3.0.5
+  resolution: "asn1js@npm:3.0.5"
+  dependencies:
+    pvtsutils: ^1.3.2
+    pvutils: ^1.1.3
+    tslib: ^2.4.0
+  checksum: 3b6af1bbadd5762ef8ead5daf2f6bda1bc9e23bc825c4dcc996aa1f9521ad7390a64028565d95d98090d69c8431f004c71cccb866004759169d7c203cf9075eb
+  languageName: node
+  linkType: hard
+
 "ast-types-flow@npm:^0.0.7":
   version: 0.0.7
   resolution: "ast-types-flow@npm:0.0.7"
@@ -6954,16 +6176,25 @@ __metadata:
   linkType: hard
 
 "async-each@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "async-each@npm:1.0.3"
-  checksum: 868651cfeb209970b367fbb96df1e1c8dc0b22c681cda7238417005ab2a5fbd944ee524b43f2692977259a57b7cc2547e03ff68f2b5113dbdf953d48cc078dc3
+  version: 1.0.6
+  resolution: "async-each@npm:1.0.6"
+  checksum: d237e8c39348d5f1441edbd3893692912afbacaf83a2ccce8978ebeea804529a8838654b12208fbbc08c8b0411a1248948ee9bf9291ebe1921aabd5b613bc5db
   languageName: node
   linkType: hard
 
-"async@npm:^3.2.3":
-  version: 3.2.3
-  resolution: "async@npm:3.2.3"
-  checksum: c4bee57ab2249af3dc83ca3ef9acfa8e822c0d5e5aa41bae3eaf7f673648343cd64ecd7d26091ffd357f3f044428b17b5f00098494b6cf8b6b3e9681f0636ca1
+"async@npm:^3.2.3, async@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "async@npm:3.2.4"
+  checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
+  languageName: node
+  linkType: hard
+
+"asynciterator.prototype@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "asynciterator.prototype@npm:1.0.0"
+  dependencies:
+    has-symbols: ^1.0.3
+  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
   languageName: node
   linkType: hard
 
@@ -6981,13 +6212,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^10.4.13, autoprefixer@npm:^10.4.14":
-  version: 10.4.14
-  resolution: "autoprefixer@npm:10.4.14"
+"autoprefixer@npm:^10.4.16":
+  version: 10.4.16
+  resolution: "autoprefixer@npm:10.4.16"
   dependencies:
-    browserslist: ^4.21.5
-    caniuse-lite: ^1.0.30001464
-    fraction.js: ^4.2.0
+    browserslist: ^4.21.10
+    caniuse-lite: ^1.0.30001538
+    fraction.js: ^4.3.6
     normalize-range: ^0.1.2
     picocolors: ^1.0.0
     postcss-value-parser: ^4.2.0
@@ -6995,7 +6226,7 @@ __metadata:
     postcss: ^8.1.0
   bin:
     autoprefixer: bin/autoprefixer
-  checksum: e9f18e664a4e4a54a8f4ec5f6b49ed228ec45afaa76efcae361c93721795dc5ab644f36d2fdfc0dea446b02a8067b9372f91542ea431994399e972781ed46d95
+  checksum: 45fad7086495048dacb14bb7b00313e70e135b5d8e8751dcc60548889400763705ab16fc2d99ea628b44c3472698fb0e39598f595ba28409c965ab159035afde
   languageName: node
   linkType: hard
 
@@ -7007,69 +6238,76 @@ __metadata:
   linkType: hard
 
 "axe-core@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "axe-core@npm:4.6.2"
-  checksum: 81523eeaf101a3a129545a936d448d235ecf1f8c0daccdee224d29f63bec716fa38cf1a65c8462548b1f995624277eed790d9d9977ae40ba692c4cadf1196403
+  version: 4.8.2
+  resolution: "axe-core@npm:4.8.2"
+  checksum: 8c19f507dabfcb8514e4280c7fc66e85143be303ddb57ec9f119338021228dc9b80560993938003837bda415fde7c07bba3a96560008ffa5f4145a248ed8f5fe
   languageName: node
   linkType: hard
 
-"axios-retry@npm:3.5.0":
-  version: 3.5.0
-  resolution: "axios-retry@npm:3.5.0"
+"axios-retry@npm:3.8.0":
+  version: 3.8.0
+  resolution: "axios-retry@npm:3.8.0"
   dependencies:
     "@babel/runtime": ^7.15.4
     is-retry-allowed: ^2.2.0
-  checksum: db8391bcda7aef5d7255da2471565aaf46007ecdde45cc7027218e9fb2ada8546cecc172767d0c44ef4acaacf87e0f319dbd7084b3938f2880c3993834342d15
+  checksum: 448d951b971ccd35eaedc0f10ff1129a6bf2b3dfe13ce57749809bd37975332ae0e906ea4e67a41c9c98215bb1bf8a554e6880f1272419c758f91e4d68ca6b55
   languageName: node
   linkType: hard
 
-"axios@npm:1.4.0":
-  version: 1.4.0
-  resolution: "axios@npm:1.4.0"
+"axios@npm:1.5.1":
+  version: 1.5.1
+  resolution: "axios@npm:1.5.1"
   dependencies:
     follow-redirects: ^1.15.0
     form-data: ^4.0.0
     proxy-from-env: ^1.1.0
-  checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b
+  checksum: 4444f06601f4ede154183767863d2b8e472b4a6bfc5253597ed6d21899887e1fd0ee2b3de792ac4f8459fe2e359d2aa07c216e45fd8b9e4e0688a6ebf48a5a8d
   languageName: node
   linkType: hard
 
 "axobject-query@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "axobject-query@npm:3.1.1"
+  version: 3.2.1
+  resolution: "axobject-query@npm:3.2.1"
   dependencies:
-    deep-equal: ^2.0.5
-  checksum: c12a5da10dc7bab75e1cda9b6a3b5fcf10eba426ddf1a17b71ef65a434ed707ede7d1c4f013ba1609e970bc8c0cddac01365080d376204314e9b294719acd8a5
+    dequal: ^2.0.3
+  checksum: a94047e702b57c91680e6a952ec4a1aaa2cfd0d80ead76bc8c954202980d8c51968a6ea18b4d8010e8e2cf95676533d8022a8ebba9abc1dfe25686721df26fd2
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-jest@npm:29.5.0"
+"b4a@npm:^1.6.4":
+  version: 1.6.4
+  resolution: "b4a@npm:1.6.4"
+  checksum: 81b086f9af1f8845fbef4476307236bda3d660c158c201db976f19cdce05f41f93110ab6b12fd7a2696602a490cc43d5410ee36a56d6eef93afb0d6ca69ac3b2
+  languageName: node
+  linkType: hard
+
+"babel-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "babel-jest@npm:29.7.0"
   dependencies:
-    "@jest/transform": ^29.5.0
+    "@jest/transform": ^29.7.0
     "@types/babel__core": ^7.1.14
     babel-plugin-istanbul: ^6.1.1
-    babel-preset-jest: ^29.5.0
+    babel-preset-jest: ^29.6.3
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
     slash: ^3.0.0
   peerDependencies:
     "@babel/core": ^7.8.0
-  checksum: eafb6d37deb71f0c80bf3c80215aa46732153e5e8bcd73f6ff47d92e5c0c98c8f7f75995d0efec6289c371edad3693cd8fa2367b0661c4deb71a3a7117267ede
+  checksum: ee6f8e0495afee07cac5e4ee167be705c711a8cc8a737e05a587a131fdae2b3c8f9aa55dfd4d9c03009ac2d27f2de63d8ba96d3e8460da4d00e8af19ef9a83f7
   languageName: node
   linkType: hard
 
-"babel-loader@npm:9.1.2":
-  version: 9.1.2
-  resolution: "babel-loader@npm:9.1.2"
+"babel-loader@npm:9.1.3":
+  version: 9.1.3
+  resolution: "babel-loader@npm:9.1.3"
   dependencies:
-    find-cache-dir: ^3.3.2
+    find-cache-dir: ^4.0.0
     schema-utils: ^4.0.0
   peerDependencies:
     "@babel/core": ^7.12.0
     webpack: ">=5"
-  checksum: f0edb8e157f9806b810ba3f2c8ca8fa489d377ae5c2b7b00c2ace900a6925641ce4ec520b9c12f70e37b94aa5366e7003e0f6271b26821643e109966ce741cb7
+  checksum: b168dde5b8cf11206513371a79f86bb3faa7c714e6ec9fffd420876b61f3d7f5f4b976431095ef6a14bc4d324505126deb91045fd41e312ba49f4deaa166fe28
   languageName: node
   linkType: hard
 
@@ -7086,15 +6324,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-jest-hoist@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-plugin-jest-hoist@npm:29.5.0"
+"babel-plugin-jest-hoist@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-plugin-jest-hoist@npm:29.6.3"
   dependencies:
     "@babel/template": ^7.3.3
     "@babel/types": ^7.3.3
     "@types/babel__core": ^7.1.14
     "@types/babel__traverse": ^7.0.6
-  checksum: 099b5254073b6bc985b6d2d045ad26fb8ed30ff8ae6404c4fe8ee7cd0e98a820f69e3dfb871c7c65aae0f4b65af77046244c07bb92d49ef9005c90eedf681539
+  checksum: 51250f22815a7318f17214a9d44650ba89551e6d4f47a2dc259128428324b52f5a73979d010cefd921fd5a720d8c1d55ad74ff601cd94c7bd44d5f6292fde2d1
   languageName: node
   linkType: hard
 
@@ -7109,87 +6347,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-corejs2@npm:^0.3.3":
-  version: 0.3.3
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3"
-  dependencies:
-    "@babel/compat-data": ^7.17.7
-    "@babel/helper-define-polyfill-provider": ^0.3.3
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 7db3044993f3dddb3cc3d407bc82e640964a3bfe22de05d90e1f8f7a5cb71460011ab136d3c03c6c1ba428359ebf635688cd6205e28d0469bba221985f5c6179
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs2@npm:^0.4.3":
-  version: 0.4.3
-  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.3"
-  dependencies:
-    "@babel/compat-data": ^7.17.7
-    "@babel/helper-define-polyfill-provider": ^0.4.0
-    semver: ^6.1.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 09ba40b9f8ac66a733628b2f12722bb764bdcc4f9600b93d60f1994418a8f84bc4b1ed9ab07c9d288debbf6210413fdff0721a3a43bd89c7f77adf76b0310adc
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.6.0"
-  dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.3
-    core-js-compat: ^3.25.1
-  peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: 470bb8c59f7c0912bd77fe1b5a2e72f349b3f65bbdee1d60d6eb7e1f4a085c6f24b2dd5ab4ac6c2df6444a96b070ef6790eccc9edb6a2668c60d33133bfb62c6
-  languageName: node
-  linkType: hard
-
-"babel-plugin-polyfill-corejs3@npm:^0.8.1":
-  version: 0.8.1
-  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.1"
+"babel-plugin-polyfill-corejs2@npm:^0.4.6":
+  version: 0.4.6
+  resolution: "babel-plugin-polyfill-corejs2@npm:0.4.6"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.0
-    core-js-compat: ^3.30.1
+    "@babel/compat-data": ^7.22.6
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    semver: ^6.3.1
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: c23a581973c141a4687126cf964981180ef27e3eb0b34b911161db4f5caf9ba7ff60bee0ebe46d650ba09e03a6a3ac2cd6a6ae5f4f5363a148470e5cd8447df2
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 08896811df31530be6a9bcdd630cb9fd4b5ae5181039d18db3796efbc54e38d57a42af460845c10a04434e1bc45c0d47743c7e6c860383cc6b141083cde22030
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.4.1"
+"babel-plugin-polyfill-corejs3@npm:^0.8.5":
+  version: 0.8.5
+  resolution: "babel-plugin-polyfill-corejs3@npm:0.8.5"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.3.3
+    "@babel/helper-define-polyfill-provider": ^0.4.3
+    core-js-compat: ^3.32.2
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ab0355efbad17d29492503230387679dfb780b63b25408990d2e4cf421012dae61d6199ddc309f4d2409ce4e9d3002d187702700dd8f4f8770ebbba651ed066c
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 54ff3956c4f88e483d38b27ceec6199b9e73fceac10ebf969469d215e6a62929384e4433f85335c9a6ba809329636e27f9bdae2f54075f833e7a745341c07d84
   languageName: node
   linkType: hard
 
-"babel-plugin-polyfill-regenerator@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.0"
+"babel-plugin-polyfill-regenerator@npm:^0.5.3":
+  version: 0.5.3
+  resolution: "babel-plugin-polyfill-regenerator@npm:0.5.3"
   dependencies:
-    "@babel/helper-define-polyfill-provider": ^0.4.0
+    "@babel/helper-define-polyfill-provider": ^0.4.3
   peerDependencies:
-    "@babel/core": ^7.0.0-0
-  checksum: ef2bcffc7c9a5e4426fc2dbf89bf3a46999a8415c21cd741c3ab3cb4b5ab804aaa3d71ef733f0eda1bcc0b91d9d80f98d33983a66dab9b8bed166ec38f8f8ad1
+    "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0
+  checksum: 2bb546582cda1870d19e646a7183baeb2cccd56e0ef3e4eaeabd28e120daf17cb87399194a9ccdcf32506bcaa68d23e73440fc8ab990a7a0f8c5a77c12d5d4bc
   languageName: node
   linkType: hard
 
-"babel-plugin-transform-import-meta@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "babel-plugin-transform-import-meta@npm:2.2.0"
+"babel-plugin-transform-import-meta@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "babel-plugin-transform-import-meta@npm:2.2.1"
   dependencies:
     "@babel/template": ^7.4.4
     tslib: ^2.4.0
   peerDependencies:
     "@babel/core": ^7.10.0
-  checksum: 305b0750f957e4df3ce08e0b24359dc55fb789c96477e944d113d259a8292e7bb8d665944e04b5a690c82a8dc23f54b711a85917d80988dffe1e046e1db940ee
+  checksum: 2868e3ac22fc403003b19750dd04f9f05303d2ade3d005e2e557ba8e260ac0b8ee3717f772ec4db8a9e6a8aac13dc61eb82b79a6479f933290cef2d89e4b731b
   languageName: node
   linkType: hard
 
@@ -7215,15 +6417,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-preset-jest@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "babel-preset-jest@npm:29.5.0"
+"babel-preset-jest@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "babel-preset-jest@npm:29.6.3"
   dependencies:
-    babel-plugin-jest-hoist: ^29.5.0
+    babel-plugin-jest-hoist: ^29.6.3
     babel-preset-current-node-syntax: ^1.0.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5566ca2762766c9319b4973d018d2fa08c0fcf6415c72cc54f4c8e7199e851ea8f5e6c6730f03ed7ed44fc8beefa959dd15911f2647dee47c615ff4faeddb1ad
+  checksum: aa4ff2a8a728d9d698ed521e3461a109a1e66202b13d3494e41eea30729a5e7cc03b3a2d56c594423a135429c37bf63a9fa8b0b9ce275298be3095a88c69f6fb
   languageName: node
   linkType: hard
 
@@ -7241,12 +6443,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64-arraybuffer-es6@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "base64-arraybuffer-es6@npm:0.6.0"
-  peerDependencies:
-    core-js-bundle: ^3.6.5
-  checksum: 007c51d4445c6dda58db70c99a3465aef1a6812a2382ef47a7d65a3f514d4029afb43462a364e5c622fd7fe641bd7753acb5b1f77e92945e3f73143b67ad5a8c
+"base64-arraybuffer-es6@npm:^0.7.0":
+  version: 0.7.0
+  resolution: "base64-arraybuffer-es6@npm:0.7.0"
+  checksum: 6d2fd114df49201b476cea5d470504e5d4e8c4cd42544152b312c9bdcb824313086fe83f1ffc34262e9e276b82d46aefc6e63bb85553f016932061137b355cdf
   languageName: node
   linkType: hard
 
@@ -7271,16 +6471,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bazinga64@npm:6.1.1":
-  version: 6.1.1
-  resolution: "bazinga64@npm:6.1.1"
-  checksum: efc69a787ea972a009e9b24991403eab3f619dc5bd51b053f2f710c56f7be8c3f023750991c029cc7f9186a8546c0e817e88820cccfc5574689bcf24a84991c7
+"bazinga64@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "bazinga64@npm:6.3.1"
+  checksum: f720936b3919f8df3b903675a9557f36b5a959ec458d7536756b805a9a1e3c81d5d6a367adb0245b80e1ef870cd5f94491ac9566738016b5613b5e5e3bccce6e
   languageName: node
   linkType: hard
 
-"beautiful-react-hooks@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "beautiful-react-hooks@npm:4.3.0"
+"beautiful-react-hooks@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "beautiful-react-hooks@npm:5.0.0"
   dependencies:
     lodash.debounce: ^4.0.8
     lodash.throttle: ^4.1.1
@@ -7289,7 +6489,14 @@ __metadata:
     react-dom: 18.2.0
     react-router-dom: ">=5.0.0"
     rxjs: ">=7.0.0"
-  checksum: 8c26fb0870a10338ef7a4a2923d3c8f8248542bb6026aacca6f75ba6ca21f0824b3c6c8c9184065f52db1c523e8bb6e85e6e2fc95a0db7a2840e0fdb75ec627b
+  checksum: 62f235366dbc27419edc25c3cd05c6c2b43d0e1da63340f3faf0110ce1ffaa2e99a9694768ee46710c7be5549958a26803db02ef76e1645b1e86b2aee7b27a98
+  languageName: node
+  linkType: hard
+
+"big-integer@npm:^1.6.44":
+  version: 1.6.51
+  resolution: "big-integer@npm:1.6.51"
+  checksum: 3d444173d1b2e20747e2c175568bedeebd8315b0637ea95d75fd27830d3b8e8ba36c6af40374f36bdaea7b5de376dcada1b07587cb2a79a928fccdb6e6e3c518
   languageName: node
   linkType: hard
 
@@ -7300,7 +6507,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bl@npm:^4.0.3, bl@npm:^4.1.0":
+"bl@npm:^4.1.0":
   version: 4.1.0
   resolution: "bl@npm:4.1.0"
   dependencies:
@@ -7311,6 +6518,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bl@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "bl@npm:5.1.0"
+  dependencies:
+    buffer: ^6.0.3
+    inherits: ^2.0.4
+    readable-stream: ^3.4.0
+  checksum: a7a438ee0bc540e80b8eb68cc1ad759a9c87df06874a99411d701d01cc0b36f30cd20050512ac3e77090138890960e07bfee724f3ee6619bb39a569f5cc3b1bc
+  languageName: node
+  linkType: hard
+
 "bluebird@npm:^3.0.6, bluebird@npm:^3.4.1, bluebird@npm:^3.7.2":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
@@ -7332,6 +6550,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bplist-parser@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "bplist-parser@npm:0.2.0"
+  dependencies:
+    big-integer: ^1.6.44
+  checksum: d5339dd16afc51de6c88f88f58a45b72ed6a06aa31f5557d09877575f220b7c1d3fbe375da0b62e6a10d4b8ed80523567e351f24014f5bc886ad523758142cdd
+  languageName: node
+  linkType: hard
+
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -7360,38 +6587,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browser-process-hrtime@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "browser-process-hrtime@npm:1.0.0"
-  checksum: e30f868cdb770b1201afb714ad1575dd86366b6e861900884665fb627109b3cc757c40067d3bfee1ff2a29c835257ea30725a8018a9afd02ac1c24b408b1e45f
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.16.6, browserslist@npm:^4.21.3, browserslist@npm:^4.21.4, browserslist@npm:^4.21.5":
-  version: 4.21.5
-  resolution: "browserslist@npm:4.21.5"
-  dependencies:
-    caniuse-lite: ^1.0.30001449
-    electron-to-chromium: ^1.4.284
-    node-releases: ^2.0.8
-    update-browserslist-db: ^1.0.10
-  bin:
-    browserslist: cli.js
-  checksum: 9755986b22e73a6a1497fd8797aedd88e04270be33ce66ed5d85a1c8a798292a65e222b0f251bafa1c2522261e237d73b08b58689d4920a607e5a53d56dc4706
-  languageName: node
-  linkType: hard
-
-"browserslist@npm:^4.21.9":
-  version: 4.21.9
-  resolution: "browserslist@npm:4.21.9"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
+  version: 4.22.1
+  resolution: "browserslist@npm:4.22.1"
   dependencies:
-    caniuse-lite: ^1.0.30001503
-    electron-to-chromium: ^1.4.431
-    node-releases: ^2.0.12
-    update-browserslist-db: ^1.0.11
+    caniuse-lite: ^1.0.30001541
+    electron-to-chromium: ^1.4.535
+    node-releases: ^2.0.13
+    update-browserslist-db: ^1.0.13
   bin:
     browserslist: cli.js
-  checksum: 80d3820584e211484ad1b1a5cfdeca1dd00442f47be87e117e1dda34b628c87e18b81ae7986fa5977b3e6a03154f6d13cd763baa6b8bf5dd9dd19f4926603698
+  checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862
   languageName: node
   linkType: hard
 
@@ -7404,7 +6610,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-crc32@npm:^0.2.1, buffer-crc32@npm:^0.2.13":
+"buffer-crc32@npm:^0.2.1":
   version: 0.2.13
   resolution: "buffer-crc32@npm:0.2.13"
   checksum: 06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
@@ -7418,13 +6624,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-equal@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "buffer-equal@npm:1.0.0"
-  checksum: c63a62d25ffc6f3a7064a86dd0d92d93a32d03b14f22d17374790bc10e94bca2312302895fdd28a2b0060999d4385cf90cbf6ad1a6678065156c664016d3be45
-  languageName: node
-  linkType: hard
-
 "buffer-from@npm:^1.0.0":
   version: 1.1.2
   resolution: "buffer-from@npm:1.1.2"
@@ -7432,7 +6631,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:6.0.3":
+"buffer@npm:6.0.3, buffer@npm:^6.0.3":
   version: 6.0.3
   resolution: "buffer@npm:6.0.3"
   dependencies:
@@ -7452,36 +6651,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builtin-modules@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "builtin-modules@npm:3.2.0"
-  checksum: 0265aa1ba78e1a16f4e18668d815cb43fb364e6a6b8aa9189c6f44c7b894a551a43b323c40206959d2d4b2568c1f2805607ad6c88adc306a776ce6904cca6715
+"builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0":
+  version: 3.3.0
+  resolution: "builtin-modules@npm:3.3.0"
+  checksum: db021755d7ed8be048f25668fe2117620861ef6703ea2c65ed2779c9e3636d5c3b82325bd912244293959ff3ae303afa3471f6a15bf5060c103e4cc3a839749d
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.1.0":
-  version: 16.1.3
-  resolution: "cacache@npm:16.1.3"
+"bundle-name@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "bundle-name@npm:3.0.0"
   dependencies:
-    "@npmcli/fs": ^2.1.0
-    "@npmcli/move-file": ^2.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    glob: ^8.0.1
-    infer-owner: ^1.0.4
+    run-applescript: ^5.0.0
+  checksum: edf2b1fbe6096ed32e7566947ace2ea937ee427391744d7510a2880c4b9a5b3543d3f6c551236a29e5c87d3195f8e2912516290e638c15bcbede7b37cc375615
+  languageName: node
+  linkType: hard
+
+"cacache@npm:^17.0.0":
+  version: 17.1.4
+  resolution: "cacache@npm:17.1.4"
+  dependencies:
+    "@npmcli/fs": ^3.1.0
+    fs-minipass: ^3.0.0
+    glob: ^10.2.2
     lru-cache: ^7.7.1
-    minipass: ^3.1.6
+    minipass: ^7.0.3
     minipass-collect: ^1.0.2
     minipass-flush: ^1.0.5
     minipass-pipeline: ^1.2.4
-    mkdirp: ^1.0.4
     p-map: ^4.0.0
-    promise-inflight: ^1.0.1
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
+    ssri: ^10.0.0
     tar: ^6.1.11
-    unique-filename: ^2.0.0
-  checksum: d91409e6e57d7d9a3a25e5dcc589c84e75b178ae8ea7de05cbf6b783f77a5fae938f6e8fda6f5257ed70000be27a681e1e44829251bfffe4c10216002f8f14e6
+    unique-filename: ^3.0.0
+  checksum: b7751df756656954a51201335addced8f63fc53266fa56392c9f5ae83c8d27debffb4458ac2d168a744a4517ec3f2163af05c20097f93d17bdc2dc8a385e14a6
   languageName: node
   linkType: hard
 
@@ -7512,14 +6714,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase-keys@npm:^6.2.2":
-  version: 6.2.2
-  resolution: "camelcase-keys@npm:6.2.2"
+"camelcase-keys@npm:^7.0.0":
+  version: 7.0.2
+  resolution: "camelcase-keys@npm:7.0.2"
   dependencies:
-    camelcase: ^5.3.1
-    map-obj: ^4.0.0
-    quick-lru: ^4.0.1
-  checksum: 43c9af1adf840471e54c68ab3e5fe8a62719a6b7dbf4e2e86886b7b0ff96112c945736342b837bd2529ec9d1c7d1934e5653318478d98e0cf22c475c04658e2a
+    camelcase: ^6.3.0
+    map-obj: ^4.1.0
+    quick-lru: ^5.1.1
+    type-fest: ^1.2.1
+  checksum: b5821cc48dd00e8398a30c5d6547f06837ab44de123f1b3a603d0a03399722b2fc67a485a7e47106eb02ef543c3b50c5ebaabc1242cde4b63a267c3258d2365b
   languageName: node
   linkType: hard
 
@@ -7537,7 +6740,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^6.2.0":
+"camelcase@npm:^6.2.0, camelcase@npm:^6.3.0":
   version: 6.3.0
   resolution: "camelcase@npm:6.3.0"
   checksum: 8c96818a9076434998511251dcb2761a94817ea17dbdc37f47ac080bd088fc62c7369429a19e2178b993497132c8cbcf5cc1f44ba963e76782ba469c0474938d
@@ -7556,24 +6759,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001449, caniuse-lite@npm:^1.0.30001464":
-  version: 1.0.30001481
-  resolution: "caniuse-lite@npm:1.0.30001481"
-  checksum: 8200a043c191b4fd4fe0beda37a58fd61869c895ab93f87bdd0420e5927453f48434d716ce9da8552ff6c3ecc4dcd1366354cda3a134f3cc844af741574a7cab
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001503":
-  version: 1.0.30001506
-  resolution: "caniuse-lite@npm:1.0.30001506"
-  checksum: 0a090745824622df146e2f6dde79c7f7920a899dec1b3a599d2ef9acf41cef5e179fd133bb59f2030286a4ea935f4230e05438d7394694c414e8ada345eb5268
-  languageName: node
-  linkType: hard
-
-"caniuse-lite@npm:^1.0.30001507":
-  version: 1.0.30001507
-  resolution: "caniuse-lite@npm:1.0.30001507"
-  checksum: 7044172bdf65140c927cdaaff50368a97676f06a9fd8b515c046613bdf52cb769e9efb832ee491b8f8cc21f82c15f154a896efbab690f431bb064c95f3a2b7a8
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001541":
+  version: 1.0.30001549
+  resolution: "caniuse-lite@npm:1.0.30001549"
+  checksum: 7f2abeedc8cf8b92cc0613855d71b995ce436068c0bcdd798c5af7d297ccf9f52496b00181beda42d82d25079dd4b6e389c67486156d40d8854e5707a25cb054
   languageName: node
   linkType: hard
 
@@ -7586,14 +6775,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:5.2.0":
-  version: 5.2.0
-  resolution: "chalk@npm:5.2.0"
-  checksum: 03d8060277de6cf2fd567dc25fcf770593eb5bb85f460ce443e49255a30ff1242edd0c90a06a03803b0466ff0687a939b41db1757bec987113e83de89a003caa
+"chalk-template@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "chalk-template@npm:1.1.0"
+  dependencies:
+    chalk: ^5.2.0
+  checksum: 868aae8d4e7556ad2f35de4e04fe65dbe1ea6c5c80ad783f1c156d0a5c33f444c6814f49cbb68fe348c78e99daf2bcf566b47ad7e13603e4691ca78b2f422824
+  languageName: node
+  linkType: hard
+
+"chalk@npm:5.3.0, chalk@npm:^5.2.0, chalk@npm:^5.3.0":
+  version: 5.3.0
+  resolution: "chalk@npm:5.3.0"
+  checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.0, chalk@npm:^2.3.0":
+"chalk@npm:^2.3.0, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -7629,29 +6827,27 @@ __metadata:
   linkType: hard
 
 "chrome-trace-event@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "chrome-trace-event@npm:1.0.2"
-  dependencies:
-    tslib: ^1.9.0
-  checksum: a104606fd07e6191848fa15d4031ac41c1715d025074574bdbb27d998a20d75d860a2060a5aca840bfbf97ec2ef6b72df9b387ed4109a8fc6eb5c362477c9294
+  version: 1.0.3
+  resolution: "chrome-trace-event@npm:1.0.3"
+  checksum: cb8b1fc7e881aaef973bd0c4a43cd353c2ad8323fb471a041e64f7c2dd849cde4aad15f8b753331a32dda45c973f032c8a03b8177fc85d60eaa75e91e08bfb97
   languageName: node
   linkType: hard
 
 "ci-info@npm:^3.2.0":
-  version: 3.3.0
-  resolution: "ci-info@npm:3.3.0"
-  checksum: c3d86fe374938ecda5093b1ba39acb535d8309185ba3f23587747c6a057e63f45419b406d880304dbc0e1d72392c9a33e42fe9a1e299209bc0ded5efaa232b66
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 6b19dc9b2966d1f8c2041a838217299718f15d6c4b63ae36e4674edd2bee48f780e94761286a56aa59eb305a85fbea4ddffb7630ec063e7ec7e7e5ad42549a87
   languageName: node
   linkType: hard
 
 "cjs-module-lexer@npm:^1.0.0":
-  version: 1.2.2
-  resolution: "cjs-module-lexer@npm:1.2.2"
-  checksum: 977f3f042bd4f08e368c890d91eecfbc4f91da0bc009a3c557bc4dfbf32022ad1141244ac1178d44de70fc9f3dea7add7cd9a658a34b9fae98a55d8f92331ce5
+  version: 1.2.3
+  resolution: "cjs-module-lexer@npm:1.2.3"
+  checksum: 5ea3cb867a9bb609b6d476cd86590d105f3cfd6514db38ff71f63992ab40939c2feb68967faa15a6d2b1f90daa6416b79ea2de486e9e2485a6f8b66a21b4fb0a
   languageName: node
   linkType: hard
 
-"classnames@npm:*, classnames@npm:2.3.2":
+"classnames@npm:2.3.2":
   version: 2.3.2
   resolution: "classnames@npm:2.3.2"
   checksum: 2c62199789618d95545c872787137262e741f9db13328e216b093eea91c85ef2bfb152c1f9e63027204e2559a006a92eb74147d46c800a9f96297ae1d9f96f4e
@@ -7659,11 +6855,11 @@ __metadata:
   linkType: hard
 
 "clean-css@npm:^5.2.2":
-  version: 5.3.1
-  resolution: "clean-css@npm:5.3.1"
+  version: 5.3.2
+  resolution: "clean-css@npm:5.3.2"
   dependencies:
     source-map: ~0.6.0
-  checksum: 860696c60503cbfec480b5f92f62729246304b55950571af7292f2687b57f86b277f2b9fefe6f64643d409008018b78383972b55c2cc859792dcc8658988fb16
+  checksum: 8787b281acc9878f309b5f835d410085deedfd4e126472666773040a6a8a72f472a1d24185947d23b87b1c419bf2c5ed429395d5c5ff8279c98b05d8011e9758
   languageName: node
   linkType: hard
 
@@ -7693,20 +6889,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-spinners@npm:^2.5.0":
-  version: 2.7.0
-  resolution: "cli-spinners@npm:2.7.0"
-  checksum: a9afaf73f58d1f951fb23742f503631b3cf513f43f4c7acb1b640100eb76bfa16efbcd1994d149ffc6603a6d75dd3d4a516a76f125f90dce437de9b16fd0ee6f
+"cli-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cli-cursor@npm:4.0.0"
+  dependencies:
+    restore-cursor: ^4.0.0
+  checksum: ab3f3ea2076e2176a1da29f9d64f72ec3efad51c0960898b56c8a17671365c26e67b735920530eaf7328d61f8bd41c27f46b9cf6e4e10fe2fa44b5e8c0e392cc
   languageName: node
   linkType: hard
 
-"cli-truncate@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-truncate@npm:2.1.0"
-  dependencies:
-    slice-ansi: ^3.0.0
-    string-width: ^4.2.0
-  checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d
+"cli-spinners@npm:^2.5.0":
+  version: 2.9.1
+  resolution: "cli-spinners@npm:2.9.1"
+  checksum: 1780618be58309c469205bc315db697934bac68bce78cd5dfd46248e507a533172d623c7348ecfd904734f597ce0a4e5538684843d2cfb7af485d4466699940c
   languageName: node
   linkType: hard
 
@@ -7742,13 +6937,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clone-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "clone-buffer@npm:1.0.0"
-  checksum: a39a35e7fd081e0f362ba8195bd15cbc8205df1fbe4598bb4e09c1f9a13c0320a47ab8a61a8aa83561e4ed34dc07666d73254ee952ddd3985e4286b082fe63b9
-  languageName: node
-  linkType: hard
-
 "clone-deep@npm:^4.0.0, clone-deep@npm:^4.0.1":
   version: 4.0.1
   resolution: "clone-deep@npm:4.0.1"
@@ -7781,21 +6969,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clone@npm:^2.1.1":
+"clone@npm:^2.1.2":
   version: 2.1.2
   resolution: "clone@npm:2.1.2"
   checksum: aaf106e9bc025b21333e2f4c12da539b568db4925c0501a1bf4070836c9e848c892fa22c35548ce0d1132b08bbbfa17a00144fe58fccdab6fa900fec4250f67d
   languageName: node
   linkType: hard
 
-"cloneable-readable@npm:^1.0.0":
-  version: 1.1.3
-  resolution: "cloneable-readable@npm:1.1.3"
-  dependencies:
-    inherits: ^2.0.1
-    process-nextick-args: ^2.0.0
-    readable-stream: ^2.3.5
-  checksum: 23b3741225a80c1760dff58aafb6a45383d5ee2d42de7124e4e674387cfad2404493d685b35ebfca9098f99c296e5c5719e748c9750c13838a2016ea2d2bb83a
+"clsx@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "clsx@npm:1.2.1"
+  checksum: 30befca8019b2eb7dbad38cff6266cf543091dae2825c856a62a8ccf2c3ab9c2907c4d12b288b73101196767f66812365400a227581484a05f968b0307cfaf12
   languageName: node
   linkType: hard
 
@@ -7814,9 +6998,9 @@ __metadata:
   linkType: hard
 
 "collect-v8-coverage@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "collect-v8-coverage@npm:1.0.1"
-  checksum: 4efe0a1fccd517b65478a2364b33dadd0a43fc92a56f59aaece9b6186fe5177b2de471253587de7c91516f07c7268c2f6770b6cbcffc0e0ece353b766ec87e55
+  version: 1.0.2
+  resolution: "collect-v8-coverage@npm:1.0.2"
+  checksum: c10f41c39ab84629d16f9f6137bc8a63d332244383fc368caf2d2052b5e04c20cd1fd70f66fcf4e2422b84c8226598b776d39d5f2d2a51867cc1ed5d1982b4da
   languageName: node
   linkType: hard
 
@@ -7888,10 +7072,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.19":
-  version: 2.0.19
-  resolution: "colorette@npm:2.0.19"
-  checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427
+"colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.20":
+  version: 2.0.20
+  resolution: "colorette@npm:2.0.20"
+  checksum: 0c016fea2b91b733eb9f4bcdb580018f52c0bc0979443dad930e5037a968237ac53d9beb98e218d2e9235834f8eebce7f8e080422d6194e957454255bde71d3d
   languageName: node
   linkType: hard
 
@@ -7904,7 +7088,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^10.0.0, commander@npm:^10.0.1":
+"commander@npm:11.1.0, commander@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "commander@npm:11.1.0"
+  checksum: fd1a8557c6b5b622c89ecdfde703242ab7db3b628ea5d1755784c79b8e7cb0d74d65b4a262289b533359cd58e1bfc0bf50245dfbcd2954682a6f367c828b79ef
+  languageName: node
+  linkType: hard
+
+"commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
   checksum: 436901d64a818295803c1996cd856621a74f30b9f9e28a588e726b2b1670665bccd7c1a77007ebf328729f0139838a88a19265858a0fa7a8728c4656796db948
@@ -7933,9 +7124,9 @@ __metadata:
   linkType: hard
 
 "commander@npm:^9.0.0":
-  version: 9.4.1
-  resolution: "commander@npm:9.4.1"
-  checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13
+  version: 9.5.0
+  resolution: "commander@npm:9.5.0"
+  checksum: c7a3e27aa59e913b54a1bafd366b88650bc41d6651f0cbe258d4ff09d43d6a7394232a4dadd0bf518b3e696fdf595db1028a0d82c785b88bd61f8a440cecfade
   languageName: node
   linkType: hard
 
@@ -7952,36 +7143,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"comment-parser@npm:1.3.1":
-  version: 1.3.1
-  resolution: "comment-parser@npm:1.3.1"
-  checksum: 421e6a113a3afd548500e7174ab46a2049dccf92e82bbaa3b209031b1bdf97552aabfa1ae2a120c0b62df17e1ba70e0d8b05d68504fee78e1ef974c59bcfe718
+"comment-parser@npm:1.4.0":
+  version: 1.4.0
+  resolution: "comment-parser@npm:1.4.0"
+  checksum: e086da3b14af9455177f1ab801bc54de9139a77fcef55dbfb751ae68d687ac83b0effb83d113ccf8cd217d9d93ce2b472002953cac342092a3fadfb9f5cd8e38
   languageName: node
   linkType: hard
 
-"common-tags@npm:^1.8.0":
-  version: 1.8.0
-  resolution: "common-tags@npm:1.8.0"
-  checksum: fb0cc9420d149176f2bd2b1fc9e6df622cd34eccaca60b276aa3253a7c9241e8a8ed1ec0702b2679eba7e47aeef721869c686bbd7257b75b5c44993c8462cd7f
+"common-path-prefix@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "common-path-prefix@npm:3.0.0"
+  checksum: fdb3c4f54e51e70d417ccd950c07f757582de800c0678ca388aedefefc84982039f346f9fd9a1252d08d2da9e9ef4019f580a1d1d3a10da031e4bb3c924c5818
   languageName: node
   linkType: hard
 
-"commondir@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "commondir@npm:1.0.1"
-  checksum: 59715f2fc456a73f68826285718503340b9f0dd89bfffc42749906c5cf3d4277ef11ef1cca0350d0e79204f00f1f6d83851ececc9095dc88512a697ac0b9bdcb
+"common-tags@npm:^1.8.0":
+  version: 1.8.2
+  resolution: "common-tags@npm:1.8.2"
+  checksum: 767a6255a84bbc47df49a60ab583053bb29a7d9687066a18500a516188a062c4e4cd52de341f22de0b07062e699b1b8fe3cfa1cb55b241cb9301aeb4f45b4dff
   languageName: node
   linkType: hard
 
-"compress-commons@npm:^4.1.0":
-  version: 4.1.1
-  resolution: "compress-commons@npm:4.1.1"
+"compress-commons@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "compress-commons@npm:5.0.1"
   dependencies:
-    buffer-crc32: ^0.2.13
-    crc32-stream: ^4.0.2
+    crc-32: ^1.2.0
+    crc32-stream: ^5.0.0
     normalize-path: ^3.0.0
     readable-stream: ^3.6.0
-  checksum: 0176483211a7304a4a8aa52dbcc149a4c9181ac8a04bfbcc3d1a379174bf5fa56c3b15cec19e5ae3d31f1b1ce35ebb275b792b867000c77bac7162ce4e0ca268
+  checksum: 65a68e56211a8d1dbe9dab0d35f1bd60a4df27aa01e6c3f0883080263e228c460758bab4f083637a380d4a96d2326722972a42ea1951360cc69728a3915f209f
   languageName: node
   linkType: hard
 
@@ -7992,17 +7183,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"configstore@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "configstore@npm:5.0.1"
+"configstore@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "configstore@npm:6.0.0"
   dependencies:
-    dot-prop: ^5.2.0
-    graceful-fs: ^4.1.2
-    make-dir: ^3.0.0
-    unique-string: ^2.0.0
-    write-file-atomic: ^3.0.0
-    xdg-basedir: ^4.0.0
-  checksum: 60ef65d493b63f96e14b11ba7ec072fdbf3d40110a94fb7199d1c287761bdea5c5244e76b2596325f30c1b652213aa75de96ea20afd4a5f82065e61ea090988e
+    dot-prop: ^6.0.1
+    graceful-fs: ^4.2.6
+    unique-string: ^3.0.0
+    write-file-atomic: ^3.0.3
+    xdg-basedir: ^5.0.1
+  checksum: 81995351c10bc04c58507f17748477aeac6f47465109d20e3534cebc881d22e927cfd29e73dd852c46c55f62c2b7be4cd1fe6eb3a93ba51f7f9813c218f9bae0
   languageName: node
   linkType: hard
 
@@ -8013,12 +7203,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"convert-source-map@npm:^1.5.0, convert-source-map@npm:^1.6.0, convert-source-map@npm:^1.7.0":
-  version: 1.7.0
-  resolution: "convert-source-map@npm:1.7.0"
-  dependencies:
-    safe-buffer: ~5.1.1
-  checksum: bcd2e3ea7d37f96b85a6e362c8a89402ccc73757256e3ee53aa2c22fe915adb854c66b1f81111be815a3a6a6ce3c58e8001858e883c9d5b4fe08a853fa865967
+"convert-source-map@npm:^1.5.0":
+  version: 1.9.0
+  resolution: "convert-source-map@npm:1.9.0"
+  checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8
   languageName: node
   linkType: hard
 
@@ -8030,11 +7218,11 @@ __metadata:
   linkType: hard
 
 "copy-anything@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "copy-anything@npm:2.0.1"
+  version: 2.0.6
+  resolution: "copy-anything@npm:2.0.6"
   dependencies:
-    is-what: ^3.7.1
-  checksum: a5524a2378579133b7cb6393aea8a750b30e5b94bfb69d8987b53548221e595011e822c40a4c4c348b2ae6bda3d22128d472a31dc1f959fd3fd716f01b66846f
+    is-what: ^3.14.1
+  checksum: 7318dc00ca14f846d14fc886845cff63bf20a3c5f4fcdd31f68c40a213648c78a1093426947ac0f8f8577845e9a7a11eeaaeefb05d9a6f1b78ca5ec60c2aaf6e
   languageName: node
   linkType: hard
 
@@ -8079,28 +7267,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.25.1":
-  version: 3.25.1
-  resolution: "core-js-compat@npm:3.25.1"
+"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.32.2":
+  version: 3.33.0
+  resolution: "core-js-compat@npm:3.33.0"
   dependencies:
-    browserslist: ^4.21.3
-  checksum: 34dbec657adc2f660f4cd701709c9c5e27cbd608211c65df09458f80f3e357b9492ba1c5173e17cca72d889dcc6da01268cadf88fb407cf1726e76d301c6143e
+    browserslist: ^4.22.1
+  checksum: 83ae54008c09b8e0ae3c59457039866c342c7e28b0d30eebb638a5b51c01432e63fe97695c90645cbc6a8b073a4f9a8b0e75f0818bbf8b4b054e01f4c17d3181
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.30.1, core-js-compat@npm:^3.30.2":
-  version: 3.30.2
-  resolution: "core-js-compat@npm:3.30.2"
-  dependencies:
-    browserslist: ^4.21.5
-  checksum: 4c81d635559eebc2f81db60f5095a235f580a2f90698113c4124c72761393592b139e30974cce6095a9a6aad6bb3cd467b24b20c32e77ed24ca74eb5944d0638
-  languageName: node
-  linkType: hard
-
-"core-js@npm:3.25.5":
-  version: 3.25.5
-  resolution: "core-js@npm:3.25.5"
-  checksum: 208b308c49bc022f90d4349d4c99802a73c9d55053976b3c529f10014c1e37845926defad8c519f2c7f71ea0acf18d2b323ab6aaee34dc85b4c4b3ced0623f3f
+"core-js@npm:3.33.1":
+  version: 3.33.1
+  resolution: "core-js@npm:3.33.1"
+  checksum: 3a95003b0e77995203587117f3bde7f4e96adf434b6b78033dbe60347ffe38b2bac31eafab6a4cc641e5766062846b52f336ab4553fc0902c278959af4778e53
   languageName: node
   linkType: hard
 
@@ -8123,19 +7302,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:8.2.0, cosmiconfig@npm:^8.2.0":
-  version: 8.2.0
-  resolution: "cosmiconfig@npm:8.2.0"
+"cosmiconfig@npm:8.3.6, cosmiconfig@npm:^8.2.0":
+  version: 8.3.6
+  resolution: "cosmiconfig@npm:8.3.6"
   dependencies:
-    import-fresh: ^3.2.1
+    import-fresh: ^3.3.0
     js-yaml: ^4.1.0
-    parse-json: ^5.0.0
+    parse-json: ^5.2.0
     path-type: ^4.0.0
-  checksum: 836d5d8efa750f3fb17b03d6ca74cd3154ed025dffd045304b3ef59637f662bde1e5dc88f8830080d180ec60841719cf4ea2ce73fb21ec694b16865c478ff297
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: dc339ebea427898c9e03bf01b56ba7afbac07fc7d2a2d5a15d6e9c14de98275a9565da949375aee1809591c152c0a3877bb86dbeaf74d5bd5aaa79955ad9e7a0
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.1.0":
+"cosmiconfig@npm:^7.0.0":
   version: 7.1.0
   resolution: "cosmiconfig@npm:7.1.0"
   dependencies:
@@ -8148,10 +7332,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"countly-sdk-web@npm:23.2.2":
-  version: 23.2.2
-  resolution: "countly-sdk-web@npm:23.2.2"
-  checksum: 0d05eeadd7dbf65bb28dd077268851f4c421ed73112ab0f8ece41dbdfeb62fe50c4919d89d7ef4792b01574c58a511f6124aed369b832b8d5021b2187fd50489
+"countly-sdk-web@npm:23.6.2":
+  version: 23.6.2
+  resolution: "countly-sdk-web@npm:23.6.2"
+  checksum: 37a40c7c48bd9c7f2d496a5a5f3e1f86370f3724a425f97f25423d8c013383c1e29978137fbc835da78d833233936e8625c4ae0a9adb6b0302062d9c00dda2f2
   languageName: node
   linkType: hard
 
@@ -8178,13 +7362,30 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crc32-stream@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "crc32-stream@npm:4.0.2"
+"crc32-stream@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "crc32-stream@npm:5.0.0"
   dependencies:
     crc-32: ^1.2.0
     readable-stream: ^3.4.0
-  checksum: 1099559283b86e8a55390228b57ff4d57a74cac6aa8086aa4730f84317c9f93e914aeece115352f2d706a9df7ed75327ffacd86cfe23f040aef821231b528e76
+  checksum: 8e5dd04f22f3fbecc623492395107fbed2114f225bd606e39e8ed338f2fc1c454ac02a05741243620ab526473cb867fa86411a44a7ffcd88457cc1c2af82d0bc
+  languageName: node
+  linkType: hard
+
+"create-jest@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "create-jest@npm:29.7.0"
+  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
+  bin:
+    create-jest: bin/create-jest.js
+  checksum: 1427d49458adcd88547ef6fa39041e1fe9033a661293aa8d2c3aa1b4967cb5bf4f0c00436c7a61816558f28ba2ba81a94d5c962e8022ea9a883978fc8e1f2945
   languageName: node
   linkType: hard
 
@@ -8207,7 +7408,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
+"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.1, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
   dependencies:
@@ -8218,6 +7419,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"crypto-js@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "crypto-js@npm:4.1.1"
+  checksum: b3747c12ee3a7632fab3b3e171ea50f78b182545f0714f6d3e7e2858385f0f4101a15f2517e033802ce9d12ba50a391575ff4638c9de3dd9b2c4bc47768d5425
+  languageName: node
+  linkType: hard
+
 "crypto-random-string@npm:^2.0.0":
   version: 2.0.0
   resolution: "crypto-random-string@npm:2.0.0"
@@ -8225,166 +7433,178 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cspell-dictionary@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-dictionary@npm:6.31.1"
+"crypto-random-string@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "crypto-random-string@npm:4.0.0"
+  dependencies:
+    type-fest: ^1.0.1
+  checksum: 91f148f27bcc8582798f0fb3e75a09d9174557f39c3c40a89dd1bd70fb5a14a02548245aa26fa7d663c426ac5026f4729841231c84f9e30e8c8ece5e38656741
+  languageName: node
+  linkType: hard
+
+"cspell-dictionary@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-dictionary@npm:7.3.8"
   dependencies:
-    "@cspell/cspell-pipe": 6.31.1
-    "@cspell/cspell-types": 6.31.1
-    cspell-trie-lib: 6.31.1
+    "@cspell/cspell-pipe": 7.3.8
+    "@cspell/cspell-types": 7.3.8
+    cspell-trie-lib: 7.3.8
     fast-equals: ^4.0.3
-    gensequence: ^5.0.2
-  checksum: 8f6b773a1dcb990fc4e1d8a393d3dcaffaf2813da5ee75d67b6ff8bd2c03466d95aa08f0ee2f7e9f48eee771c9eba1788077b9aa7c7ce6d90abaa126501c630b
+    gensequence: ^6.0.0
+  checksum: 836370155da32bf446c289ad4f75beed5463f8c6fa617f62da7322f0e7fb5d66bc85be047a98cc4797da257b1571c0a44f4a9ca3704bbff23cdb3c9a28c916e9
   languageName: node
   linkType: hard
 
-"cspell-gitignore@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-gitignore@npm:6.31.1"
+"cspell-gitignore@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-gitignore@npm:7.3.8"
   dependencies:
-    cspell-glob: 6.31.1
+    cspell-glob: 7.3.8
     find-up: ^5.0.0
   bin:
     cspell-gitignore: bin.mjs
-  checksum: 73198debc6051c862155f2b1b9d7f41e51f4339738bfec5a25805026dd565d791441aa6cd70ed32cf2c1f8f8d211287aaa5e8a275be5307c230f0a3329af385f
+  checksum: 806d25c537e75e287f056e9614bda37943e61fb4d452da6bfe557489d19eeca8c5f1162cfedf05796414c0d5e747b85389241f0cb5599c62f016e4004a5279f6
   languageName: node
   linkType: hard
 
-"cspell-glob@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-glob@npm:6.31.1"
+"cspell-glob@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-glob@npm:7.3.8"
   dependencies:
     micromatch: ^4.0.5
-  checksum: 06df3fde7d88a73d64106ab9db7d1b8f7d9dc4a92705c07709683569e0140327b7b28d09ff4a4452f8ed62bc28dc7d1904978c917fce69c39a78e4e1b2d8a723
+  checksum: 14a64d50c99a98e3ee10e4502e6e12d543aea573a171aa13134b7a2180e5a86c15de5a3115b75728f188431cf8833dbadc36e97fca6812e954cc67db112cb485
   languageName: node
   linkType: hard
 
-"cspell-grammar@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-grammar@npm:6.31.1"
+"cspell-grammar@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-grammar@npm:7.3.8"
   dependencies:
-    "@cspell/cspell-pipe": 6.31.1
-    "@cspell/cspell-types": 6.31.1
+    "@cspell/cspell-pipe": 7.3.8
+    "@cspell/cspell-types": 7.3.8
   bin:
     cspell-grammar: bin.mjs
-  checksum: ef7ea4e4d43d08067a700effa7264ec0b195de3e3822ea7e9e3194454b4af3d20f51db90ee175ec1a52b0765cc212b8fc716f9b710de26c507ae5d14b3839f62
+  checksum: 59de9f21d580bdcea4e3de12f27f5fa417bfb8c713189cfcb36c1aa6de6cf793a755ba06573e026598be27295821583062aa00beec850738b0d6616b25df1e8e
   languageName: node
   linkType: hard
 
-"cspell-io@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-io@npm:6.31.1"
+"cspell-io@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-io@npm:7.3.8"
   dependencies:
-    "@cspell/cspell-service-bus": 6.31.1
-    node-fetch: ^2.6.9
-  checksum: 694efbf0b72a4ffe65f5edb60f22bcf06a14b353fc46df57994786063892d7c190cdb98a7a8ca74a06f6f92c83e64078d4cba1f51b9c20475e4a9a6192d5783d
+    "@cspell/cspell-service-bus": 7.3.8
+    node-fetch: ^2.7.0
+  checksum: 32dfd895d5833e4272622fe68b052f1d181e989e08926c2e046115cd9bd1d815721940137e9125d02dd108c9570c3d7532637c15317f4097e55633b49834fa7e
   languageName: node
   linkType: hard
 
-"cspell-lib@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-lib@npm:6.31.1"
-  dependencies:
-    "@cspell/cspell-bundled-dicts": 6.31.1
-    "@cspell/cspell-pipe": 6.31.1
-    "@cspell/cspell-types": 6.31.1
-    "@cspell/strong-weak-map": 6.31.1
+"cspell-lib@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-lib@npm:7.3.8"
+  dependencies:
+    "@cspell/cspell-bundled-dicts": 7.3.8
+    "@cspell/cspell-pipe": 7.3.8
+    "@cspell/cspell-resolver": 7.3.8
+    "@cspell/cspell-types": 7.3.8
+    "@cspell/dynamic-import": 7.3.8
+    "@cspell/strong-weak-map": 7.3.8
     clear-module: ^4.1.2
     comment-json: ^4.2.3
-    configstore: ^5.0.1
+    configstore: ^6.0.0
     cosmiconfig: 8.0.0
-    cspell-dictionary: 6.31.1
-    cspell-glob: 6.31.1
-    cspell-grammar: 6.31.1
-    cspell-io: 6.31.1
-    cspell-trie-lib: 6.31.1
-    fast-equals: ^4.0.3
-    find-up: ^5.0.0
-    gensequence: ^5.0.2
+    cspell-dictionary: 7.3.8
+    cspell-glob: 7.3.8
+    cspell-grammar: 7.3.8
+    cspell-io: 7.3.8
+    cspell-trie-lib: 7.3.8
+    fast-equals: ^5.0.1
+    find-up: ^6.3.0
+    gensequence: ^6.0.0
     import-fresh: ^3.3.0
     resolve-from: ^5.0.0
-    resolve-global: ^1.0.0
-    vscode-languageserver-textdocument: ^1.0.8
-    vscode-uri: ^3.0.7
-  checksum: c3626cf6eea21ac609cb1ae74c2e331938e815a41315919e241318ac56ec732b910ad3a0e9d27cc9c378de8f420f40af4d6d3e3c3baa0edc2ddd22bdbd20a3e3
+    vscode-languageserver-textdocument: ^1.0.11
+    vscode-uri: ^3.0.8
+  checksum: f554a3f51a54e8ca73551ce6f48eaf7c740e322895c66b419a1ae44b467a72308fb82e64dc7b895142cdf430963b00c96c72f425e75bf0d9824cdacd53862f59
   languageName: node
   linkType: hard
 
-"cspell-trie-lib@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell-trie-lib@npm:6.31.1"
+"cspell-trie-lib@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell-trie-lib@npm:7.3.8"
   dependencies:
-    "@cspell/cspell-pipe": 6.31.1
-    "@cspell/cspell-types": 6.31.1
-    gensequence: ^5.0.2
-  checksum: e1f5afd65c2d132e5724657743fdbc7d44b8a93155514eeba0b48750fb2147ee3fa07b1bb2427b84371788fde12f34e2ee9ff1cf2de3d368a830e0491f70ff43
+    "@cspell/cspell-pipe": 7.3.8
+    "@cspell/cspell-types": 7.3.8
+    gensequence: ^6.0.0
+  checksum: ae2c39f0bef4c11e594ce77f1a2b3641ef081abf862dc17ad09a3046085027e1b3b6fae1239b61e10db905718a0bee0947d0ec9680ce6537a8b0dc52569a8811
   languageName: node
   linkType: hard
 
-"cspell@npm:6.31.1":
-  version: 6.31.1
-  resolution: "cspell@npm:6.31.1"
-  dependencies:
-    "@cspell/cspell-pipe": 6.31.1
-    "@cspell/dynamic-import": 6.31.1
-    chalk: ^4.1.2
-    commander: ^10.0.0
-    cspell-gitignore: 6.31.1
-    cspell-glob: 6.31.1
-    cspell-io: 6.31.1
-    cspell-lib: 6.31.1
-    fast-glob: ^3.2.12
+"cspell@npm:7.3.8":
+  version: 7.3.8
+  resolution: "cspell@npm:7.3.8"
+  dependencies:
+    "@cspell/cspell-json-reporter": 7.3.8
+    "@cspell/cspell-pipe": 7.3.8
+    "@cspell/cspell-types": 7.3.8
+    "@cspell/dynamic-import": 7.3.8
+    chalk: ^5.3.0
+    chalk-template: ^1.1.0
+    commander: ^11.1.0
+    cspell-gitignore: 7.3.8
+    cspell-glob: 7.3.8
+    cspell-io: 7.3.8
+    cspell-lib: 7.3.8
+    fast-glob: ^3.3.1
     fast-json-stable-stringify: ^2.1.0
-    file-entry-cache: ^6.0.1
-    get-stdin: ^8.0.0
-    imurmurhash: ^0.1.4
-    semver: ^7.3.8
-    strip-ansi: ^6.0.1
-    vscode-uri: ^3.0.7
+    file-entry-cache: ^7.0.1
+    get-stdin: ^9.0.0
+    semver: ^7.5.4
+    strip-ansi: ^7.1.0
+    vscode-uri: ^3.0.8
   bin:
-    cspell: bin.js
+    cspell: bin.mjs
     cspell-esm: bin.mjs
-  checksum: aa6bcb130225f50666313d919f1a83615df02c2c2109b3ce8847d7d67ebc65e141100b1f63644c303dbfca42f3357e26c0e4657e8cedde792028080e37473cdd
+  checksum: 662d8249c7b816afb40e3b66e33f0b1685d28db6f6a82665afeec1b159a3b24fd34049a24bc32b25bcb5e6724d394824e35189a4f88c2eda594da6301a36affa
   languageName: node
   linkType: hard
 
-"css-blank-pseudo@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "css-blank-pseudo@npm:5.0.2"
+"css-blank-pseudo@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "css-blank-pseudo@npm:6.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 3b005c044634435941a9adfe2291d0d07b1118823ad94c6c9ef3bcff8af4621a82b516a0ae307a3faaec12fc3ca4cbe7402875cbc5f8c62f61e3bbba4b9d69a5
+  checksum: d005d57610af249708d385ce3f5e1f0b60ac3d7fb22d5a5b065b76a15db68c1f92498c8358e9ae4b819c93e24def312c4975e4d7a6be45569880ffc0e61a1693
   languageName: node
   linkType: hard
 
 "css-declaration-sorter@npm:^6.3.1":
-  version: 6.3.1
-  resolution: "css-declaration-sorter@npm:6.3.1"
+  version: 6.4.1
+  resolution: "css-declaration-sorter@npm:6.4.1"
   peerDependencies:
     postcss: ^8.0.9
-  checksum: ff0d9989ee21ec4c42430b9bb86c43f973ed5024d68f30edc1e3fb07a22828ce3c3e5b922019f2ccbff606722e43c407c5c76e3cddac523ac4afcb31e4b2601c
+  checksum: cbdc9e0d481011b1a28fd5b60d4eb55fe204391d31a0b1b490b2cecf4baa85810f9b8c48adab4df644f4718104ed3ed72c64a9745e3216173767bf4aeca7f9b8
   languageName: node
   linkType: hard
 
-"css-functions-list@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "css-functions-list@npm:3.1.0"
-  checksum: 8a7c9d4ae57cb2f01500263e65a21372048d359ca7aa6430a32a736fe2a421decfebe45e579124b9a158ec68aba2eadcd733e568495a7698240d9607d31f681b
+"css-functions-list@npm:^3.2.0":
+  version: 3.2.1
+  resolution: "css-functions-list@npm:3.2.1"
+  checksum: 57d7deb3b05e84d95b88ba9b3244cf60d33b40652b3357f084c805b24a9febda5987ade44ef25a56be41e73249a7dcc157abd704d8a0e998b2c1c2e2d5de6461
   languageName: node
   linkType: hard
 
-"css-has-pseudo@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "css-has-pseudo@npm:5.0.2"
+"css-has-pseudo@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "css-has-pseudo@npm:6.0.0"
   dependencies:
-    "@csstools/selector-specificity": ^2.0.1
-    postcss-selector-parser: ^6.0.10
+    "@csstools/selector-specificity": ^3.0.0
+    postcss-selector-parser: ^6.0.13
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 596c8c37e6ceb2f6133f9ad0501157863743e4cc9141d2c48299598c13fe18ee5fb7d50e5060d2f34b49f786868d64ac080cf5817ab26147a1089db5e831c2e8
+  checksum: 0d1fecb8339e815c0e5d04c2d4d36357b92974dcb51f328c64b9aa668c509aade348235fcd169441fd71e1411a7984f5c309128b092033e00070200b0043bf11
   languageName: node
   linkType: hard
 
@@ -8406,12 +7626,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-prefers-color-scheme@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "css-prefers-color-scheme@npm:8.0.2"
+"css-prefers-color-scheme@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "css-prefers-color-scheme@npm:9.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 4429d9a532ec54730cb5e3a41d19dc14aea3301d855970f0dcb0b0555c620c192a9437cd7cb76932cf331953bb6404db239a0a4197769bd9907f3322994ae7a2
+  checksum: 8508fbb8ca223bf53095ce71a962ceeff34ee7349705f6d7e36e148260bfb2e25fd93517a3d83d39d0ac9c60fe5fd5ec3bf4443b5d01ca711922d1b176d0b0e2
   languageName: node
   linkType: hard
 
@@ -8428,27 +7648,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-tree@npm:^1.1.2, css-tree@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "css-tree@npm:1.1.3"
+"css-select@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "css-select@npm:5.1.0"
   dependencies:
-    mdn-data: 2.0.14
-    source-map: ^0.6.1
-  checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f
+    boolbase: ^1.0.0
+    css-what: ^6.1.0
+    domhandler: ^5.0.2
+    domutils: ^3.0.1
+    nth-check: ^2.0.1
+  checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda
+  languageName: node
+  linkType: hard
+
+"css-tree@npm:^2.2.1, css-tree@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "css-tree@npm:2.3.1"
+  dependencies:
+    mdn-data: 2.0.30
+    source-map-js: ^1.0.1
+  checksum: 493cc24b5c22b05ee5314b8a0d72d8a5869491c1458017ae5ed75aeb6c3596637dbe1b11dac2548974624adec9f7a1f3a6cf40593dc1f9185eb0e8279543fbc0
+  languageName: node
+  linkType: hard
+
+"css-tree@npm:~2.2.0":
+  version: 2.2.1
+  resolution: "css-tree@npm:2.2.1"
+  dependencies:
+    mdn-data: 2.0.28
+    source-map-js: ^1.0.1
+  checksum: b94aa8cc2f09e6f66c91548411fcf74badcbad3e150345074715012d16333ce573596ff5dfca03c2a87edf1924716db765120f94247e919d72753628ba3aba27
   languageName: node
   linkType: hard
 
-"css-what@npm:^6.0.1":
+"css-what@npm:^6.0.1, css-what@npm:^6.1.0":
   version: 6.1.0
   resolution: "css-what@npm:6.1.0"
   checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe
   languageName: node
   linkType: hard
 
-"cssdb@npm:^7.6.0":
-  version: 7.6.0
-  resolution: "cssdb@npm:7.6.0"
-  checksum: 3b63c87f5e1ac49a131437165d62a7b850a003e6eca00d4dd66cda41269386464ead7e67ec5da21f7d612134a7a264a85795f496529baaa6a9b098eb6f3d8ec4
+"cssdb@npm:^7.8.0":
+  version: 7.8.0
+  resolution: "cssdb@npm:7.8.0"
+  checksum: 4071a60df6edaeba1d7df63432836c59023b41bdf3c0a2b4f434cb46a4a6e1b6a5717d0003eb264503187d183827c4b24209f4ad3009b76b96df65654444207d
   languageName: node
   linkType: hard
 
@@ -8468,73 +7711,72 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssnano-preset-default@npm:^5.2.13":
-  version: 5.2.13
-  resolution: "cssnano-preset-default@npm:5.2.13"
+"cssnano-preset-default@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "cssnano-preset-default@npm:6.0.1"
   dependencies:
     css-declaration-sorter: ^6.3.1
-    cssnano-utils: ^3.1.0
-    postcss-calc: ^8.2.3
-    postcss-colormin: ^5.3.0
-    postcss-convert-values: ^5.1.3
-    postcss-discard-comments: ^5.1.2
-    postcss-discard-duplicates: ^5.1.0
-    postcss-discard-empty: ^5.1.1
-    postcss-discard-overridden: ^5.1.0
-    postcss-merge-longhand: ^5.1.7
-    postcss-merge-rules: ^5.1.3
-    postcss-minify-font-values: ^5.1.0
-    postcss-minify-gradients: ^5.1.1
-    postcss-minify-params: ^5.1.4
-    postcss-minify-selectors: ^5.2.1
-    postcss-normalize-charset: ^5.1.0
-    postcss-normalize-display-values: ^5.1.0
-    postcss-normalize-positions: ^5.1.1
-    postcss-normalize-repeat-style: ^5.1.1
-    postcss-normalize-string: ^5.1.0
-    postcss-normalize-timing-functions: ^5.1.0
-    postcss-normalize-unicode: ^5.1.1
-    postcss-normalize-url: ^5.1.0
-    postcss-normalize-whitespace: ^5.1.1
-    postcss-ordered-values: ^5.1.3
-    postcss-reduce-initial: ^5.1.1
-    postcss-reduce-transforms: ^5.1.0
-    postcss-svgo: ^5.1.0
-    postcss-unique-selectors: ^5.1.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
   peerDependencies:
     postcss: ^8.2.15
-  checksum: f773de44f67f71e7301e1f4b4664b894c3a48bba4dadc16c559acd0b14ceafed228bdc76fe19d500b0ded9394732377069daadff2184465fa369f8dfd72d47e2
+  checksum: 451080ae47c93e6525c7133c36426968ee758eb9115132ba481e6b12d50775f4d086635bb2f807957e017fc9d253aa876aa64800be6b3d000ada90721b9ea410
   languageName: node
   linkType: hard
 
-"cssnano-utils@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "cssnano-utils@npm:3.1.0"
+"cssnano-utils@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "cssnano-utils@npm:4.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 975c84ce9174cf23bb1da1e9faed8421954607e9ea76440cd3bb0c1bea7e17e490d800fca5ae2812d1d9e9d5524eef23ede0a3f52497d7ccc628e5d7321536f2
+  checksum: 7db9b3eb4ec7cc7b2d1a3caf8c2d3b6b067bb8404b93dc183907325db3231e396350a50e5388beda02dab03404d5e8d226977b2b87adc11768173e0259e80219
   languageName: node
   linkType: hard
 
-"cssnano@npm:^5.1.14":
-  version: 5.1.14
-  resolution: "cssnano@npm:5.1.14"
+"cssnano@npm:6.0.1":
+  version: 6.0.1
+  resolution: "cssnano@npm:6.0.1"
   dependencies:
-    cssnano-preset-default: ^5.2.13
-    lilconfig: ^2.0.3
-    yaml: ^1.10.2
+    cssnano-preset-default: ^6.0.1
+    lilconfig: ^2.1.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 73463c723c5e598b37b8b4d2f014145bd72133e6581349a1b154904e0830e58de17afb1e801ed3ea3b18e386883964ce4d0299e43d4dc37d339214a956c6697f
+  checksum: 15e0777189edf2d4287ed3628f65d78c9934a2c0729e29811e85bd760653a0142477b3c2dde9e0a51438c509b2b926e6482215cd8d4e6704e3eb1ab38d1dba0c
   languageName: node
   linkType: hard
 
-"csso@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "csso@npm:4.2.0"
+"csso@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "csso@npm:5.0.5"
   dependencies:
-    css-tree: ^1.1.2
-  checksum: 380ba9663da3bcea58dee358a0d8c4468bb6539be3c439dc266ac41c047217f52fd698fb7e4b6b6ccdfb8cf53ef4ceed8cc8ceccb8dfca2aa628319826b5b998
+    css-tree: ~2.2.0
+  checksum: 0ad858d36bf5012ed243e9ec69962a867509061986d2ee07cc040a4b26e4d062c00d4c07e5ba8d430706ceb02dd87edd30a52b5937fd45b1b6f2119c4993d59a
   languageName: node
   linkType: hard
 
@@ -8562,9 +7804,9 @@ __metadata:
   linkType: hard
 
 "csstype@npm:^3.0.2":
-  version: 3.0.6
-  resolution: "csstype@npm:3.0.6"
-  checksum: de13bc52ba307b1408dcd29ae4a177ed5fca08226c67b17777e93c7deb1e71accccd251755fa73485ee3cde69df041c8edcd738dc44f904c0c9d246b161286e9
+  version: 3.1.2
+  resolution: "csstype@npm:3.1.2"
+  checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5
   languageName: node
   linkType: hard
 
@@ -8595,7 +7837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -8607,7 +7849,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:^3.2.7":
+"debug@npm:^3.2.6, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
   dependencies:
@@ -8617,45 +7859,58 @@ __metadata:
   linkType: hard
 
 "decamelize-keys@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "decamelize-keys@npm:1.1.0"
+  version: 1.1.1
+  resolution: "decamelize-keys@npm:1.1.1"
   dependencies:
     decamelize: ^1.1.0
     map-obj: ^1.0.0
-  checksum: 8bc5d32e035a072f5dffc1f1f3d26ca7ab1fb44a9cade34c97ab6cd1e62c81a87e718101e96de07d78cecda20a3fdb955df958e46671ccad01bb8dcf0de2e298
+  checksum: fc645fe20b7bda2680bbf9481a3477257a7f9304b1691036092b97ab04c0ab53e3bf9fcc2d2ae382536568e402ec41fb11e1d4c3836a9abe2d813dd9ef4311e0
   languageName: node
   linkType: hard
 
-"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1, decamelize@npm:^1.2.0":
+"decamelize@npm:^1.1.0, decamelize@npm:^1.1.1":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
   checksum: ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.3.1":
-  version: 10.4.1
-  resolution: "decimal.js@npm:10.4.1"
-  checksum: 5da6dc74af5b73d954741b24d404ef6da07841794d9e51412a2708ec384dd7b4bced3365fb178f4cd119b7ef45f0b34344014a4dc0494c8374c5e746df3cb410
+"decamelize@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "decamelize@npm:5.0.1"
+  checksum: 7c3b1ed4b3e60e7fbc00a35fb248298527c1cdfe603e41dfcf05e6c4a8cb9efbee60630deb677ed428908fb4e74e322966c687a094d1478ddc9c3a74e9dc7140
+  languageName: node
+  linkType: hard
+
+"decimal.js@npm:^10.4.2":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
   languageName: node
   linkType: hard
 
-"dedent@npm:^0.7.0":
-  version: 0.7.0
-  resolution: "dedent@npm:0.7.0"
-  checksum: 87de191050d9a40dd70cad01159a0bcf05ecb59750951242070b6abf9569088684880d00ba92a955b4058804f16eeaf91d604f283929b4f614d181cd7ae633d2
+"dedent@npm:^1.0.0":
+  version: 1.5.1
+  resolution: "dedent@npm:1.5.1"
+  peerDependencies:
+    babel-plugin-macros: ^3.1.0
+  peerDependenciesMeta:
+    babel-plugin-macros:
+      optional: true
+  checksum: c3c300a14edf1bdf5a873f9e4b22e839d62490bc5c8d6169c1f15858a1a76733d06a9a56930e963d677a2ceeca4b6b0894cc5ea2f501aa382ca5b92af3413c2a
   languageName: node
   linkType: hard
 
 "deep-equal@npm:^2.0.5":
-  version: 2.2.0
-  resolution: "deep-equal@npm:2.2.0"
+  version: 2.2.2
+  resolution: "deep-equal@npm:2.2.2"
   dependencies:
+    array-buffer-byte-length: ^1.0.0
     call-bind: ^1.0.2
-    es-get-iterator: ^1.1.2
-    get-intrinsic: ^1.1.3
+    es-get-iterator: ^1.1.3
+    get-intrinsic: ^1.2.1
     is-arguments: ^1.1.1
-    is-array-buffer: ^3.0.1
+    is-array-buffer: ^3.0.2
     is-date-object: ^1.0.5
     is-regex: ^1.1.4
     is-shared-array-buffer: ^1.0.2
@@ -8663,12 +7918,12 @@ __metadata:
     object-is: ^1.1.5
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
+    regexp.prototype.flags: ^1.5.0
     side-channel: ^1.0.4
     which-boxed-primitive: ^1.0.2
     which-collection: ^1.0.1
     which-typed-array: ^1.1.9
-  checksum: 46a34509d2766d6c6dc5aec4756089cf0cc137e46787e91f08f1ee0bb570d874f19f0493146907df0cf18aed4a7b4b50f6f62c899240a76c323f057528b122e3
+  checksum: eb61c35157b6ecb96a5359b507b083fbff8ddb4c86a78a781ee38485f77a667465e45d63ee2ebd8a00e86d94c80e499906900cd82c2debb400237e1662cd5397
   languageName: node
   linkType: hard
 
@@ -8679,17 +7934,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deepmerge-ts@npm:4.3.0":
-  version: 4.3.0
-  resolution: "deepmerge-ts@npm:4.3.0"
-  checksum: d5f8a96df9a2bc7177d59544b9390ba76e50fb725f776669068ca04eef319e98ee8870cf7b7ecca9f636b711d57cea571ac61553ee01101a614c045f7a86e0be
+"deepmerge-ts@npm:5.1.0":
+  version: 5.1.0
+  resolution: "deepmerge-ts@npm:5.1.0"
+  checksum: 6b57db93c2985e4a35f24b2451db31715050d143988b7d6346f4049c9aec21a6c289514b88d3ee3d6e0697e72ef5d96ff0bbb7cb75422d56fee55ee85c7168e7
   languageName: node
   linkType: hard
 
 "deepmerge@npm:^4.0.0, deepmerge@npm:^4.2.2":
-  version: 4.2.2
-  resolution: "deepmerge@npm:4.2.2"
-  checksum: a8c43a1ed8d6d1ed2b5bf569fa4c8eb9f0924034baf75d5d406e47e157a451075c4db353efea7b6bcc56ec48116a8ce72fccf867b6e078e7c561904b5897530b
+  version: 4.3.1
+  resolution: "deepmerge@npm:4.3.1"
+  checksum: 2024c6a980a1b7128084170c4cf56b0fd58a63f2da1660dcfe977415f27b17dbe5888668b59d0b063753f3220719d5e400b7f113609489c90160bb9a5518d052
+  languageName: node
+  linkType: hard
+
+"default-browser-id@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "default-browser-id@npm:3.0.0"
+  dependencies:
+    bplist-parser: ^0.2.0
+    untildify: ^4.0.0
+  checksum: 279c7ad492542e5556336b6c254a4eaf31b2c63a5433265655ae6e47301197b6cfb15c595a6fdc6463b2ff8e1a1a1ed3cba56038a60e1527ba4ab1628c6b9941
+  languageName: node
+  linkType: hard
+
+"default-browser@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "default-browser@npm:4.0.0"
+  dependencies:
+    bundle-name: ^3.0.0
+    default-browser-id: ^3.0.0
+    execa: ^7.1.1
+    titleize: ^3.0.0
+  checksum: 40c5af984799042b140300be5639c9742599bda76dc9eba5ac9ad5943c83dd36cebc4471eafcfddf8e0ec817166d5ba89d56f08e66a126c7c7908a179cead1a7
   languageName: node
   linkType: hard
 
@@ -8702,20 +7979,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-lazy-prop@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "define-lazy-prop@npm:2.0.0"
-  checksum: 0115fdb065e0490918ba271d7339c42453d209d4cb619dfe635870d906731eff3e1ade8028bb461ea27ce8264ec5e22c6980612d332895977e89c1bbc80fcee2
+"define-data-property@npm:^1.0.1":
+  version: 1.1.1
+  resolution: "define-data-property@npm:1.1.1"
+  dependencies:
+    get-intrinsic: ^1.2.1
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.0
+  checksum: a29855ad3f0630ea82e3c5012c812efa6ca3078d5c2aa8df06b5f597c1cde6f7254692df41945851d903e05a1668607b6d34e778f402b9ff9ffb38111f1a3f0d
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "define-properties@npm:1.1.4"
+"define-lazy-prop@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "define-lazy-prop@npm:3.0.0"
+  checksum: 54884f94caac0791bf6395a3ec530ce901cf71c47b0196b8754f3fd17edb6c0e80149c1214429d851873bb0d689dbe08dcedbb2306dc45c8534a5934723851b6
+  languageName: node
+  linkType: hard
+
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "define-properties@npm:1.2.1"
   dependencies:
+    define-data-property: ^1.0.1
     has-property-descriptors: ^1.0.0
     object-keys: ^1.1.1
-  checksum: ce0aef3f9eb193562b5cfb79b2d2c86b6a109dfc9fdcb5f45d680631a1a908c06824ddcdb72b7573b54e26ace07f0a23420aaba0d5c627b34d2c1de8ef527e2b
+  checksum: b4ccd00597dd46cb2d4a379398f5b19fca84a16f3374e2249201992f36b30f6835949a9429669ee6b41b6e837205a163eadd745e472069e70dfc10f03e5fcc12
   languageName: node
   linkType: hard
 
@@ -8742,17 +8031,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"depd@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "depd@npm:1.1.2"
-  checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9
+"dequal@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "dequal@npm:2.0.3"
+  checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90
   languageName: node
   linkType: hard
 
 "detect-libc@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "detect-libc@npm:2.0.1"
-  checksum: ccb05fcabbb555beb544d48080179c18523a343face9ee4e1a86605a8715b4169f94d663c21a03c310ac824592f2ba9a5270218819bb411ad7be578a527593d7
+  version: 2.0.2
+  resolution: "detect-libc@npm:2.0.2"
+  checksum: 2b2cd3649b83d576f4be7cc37eb3b1815c79969c8b1a03a40a4d55d83bc74d010753485753448eacb98784abf22f7dbd3911fd3b60e29fda28fed2d1a997944d
   languageName: node
   linkType: hard
 
@@ -8772,31 +8061,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-dexie@latest:
-  version: 3.2.2
-  resolution: "dexie@npm:3.2.2"
-  checksum: 7a21079f7ab139ebd724a009917f9293f2b01c341e2a3cd51d2455dda4d4e78b9ca7de0373e963108395cf1921ce7f6556cac967c1e957005a3c7c11794ceccf
-  languageName: node
-  linkType: hard
-
-"dexie@npm:3.2.3":
-  version: 3.2.3
-  resolution: "dexie@npm:3.2.3"
-  checksum: 54fd7bc94364ed601dc2d53f8b488e49ac61d4ec532f001a68fde9ffccb4bf3c6a8af310b41d8f52c94c1a99c0e165437d7b223b655df582ceda90b9bfcd60e7
-  languageName: node
-  linkType: hard
-
-"dexie@npm:3.2.4":
+"dexie@npm:3.2.4, dexie@npm:^3.2.0, dexie@npm:latest":
   version: 3.2.4
   resolution: "dexie@npm:3.2.4"
   checksum: 4e5294a954118b6862c864b8c3970904a1733daebcd919488624520696411e2e81ed1bceeac3634c5c15a21e37ce4b8502ed41c4edfbc5ba3f5925c34d56497b
   languageName: node
   linkType: hard
 
-"diff-sequences@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "diff-sequences@npm:29.4.3"
-  checksum: 28b265e04fdddcf7f9f814effe102cc95a9dec0564a579b5aed140edb24fc345c611ca52d76d725a3cab55d3888b915b5e8a4702e0f6058968a90fa5f41fcde7
+"diff-sequences@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "diff-sequences@npm:29.6.3"
+  checksum: f4914158e1f2276343d98ff5b31fc004e7304f5470bf0f1adb2ac6955d85a531a6458d33e87667f98f6ae52ebd3891bb47d420bb48a5bd8b7a27ee25b20e33aa
   languageName: node
   linkType: hard
 
@@ -8842,9 +8117,9 @@ dexie@latest:
   linkType: hard
 
 "dom-accessibility-api@npm:^0.5.9":
-  version: 0.5.13
-  resolution: "dom-accessibility-api@npm:0.5.13"
-  checksum: a5a5f14c01e466d424750aaac9225f1dc43cf16d101a1c40e01a554abce63c48084707002c39b805f2ce212273c179dd6d2258175997cd06d5f79851bf52dd40
+  version: 0.5.16
+  resolution: "dom-accessibility-api@npm:0.5.16"
+  checksum: 005eb283caef57fc1adec4d5df4dd49189b628f2f575af45decb210e04d634459e3f1ee64f18b41e2dcf200c844bc1d9279d80807e686a30d69a4756151ad248
   languageName: node
   linkType: hard
 
@@ -8858,12 +8133,12 @@ dexie@latest:
   linkType: hard
 
 "dom-helpers@npm:^5.0.1":
-  version: 5.2.0
-  resolution: "dom-helpers@npm:5.2.0"
+  version: 5.2.1
+  resolution: "dom-helpers@npm:5.2.1"
   dependencies:
     "@babel/runtime": ^7.8.7
     csstype: ^3.0.2
-  checksum: bea3e7217c2adac5f89285b7786dbcc3a356226f6ff12934c9626689829b00e7fa7630a8f77973028d039db1aba6b882b1494854aa910422d1644486136b1e55
+  checksum: 863ba9e086f7093df3376b43e74ce4422571d404fc9828bf2c56140963d5edf0e56160f9b2f3bb61b282c07f8fc8134f023c98fd684bddcb12daf7b0f14d951c
   languageName: node
   linkType: hard
 
@@ -8878,6 +8153,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"dom-serializer@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "dom-serializer@npm:2.0.0"
+  dependencies:
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.2
+    entities: ^4.2.0
+  checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6
+  languageName: node
+  linkType: hard
+
 "dom-walk@npm:^0.1.0":
   version: 0.1.2
   resolution: "dom-walk@npm:0.1.2"
@@ -8885,7 +8171,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0":
+"domelementtype@npm:^2.0.1, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0":
   version: 2.3.0
   resolution: "domelementtype@npm:2.3.0"
   checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6
@@ -8919,6 +8205,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"domhandler@npm:^5.0.2, domhandler@npm:^5.0.3":
+  version: 5.0.3
+  resolution: "domhandler@npm:5.0.3"
+  dependencies:
+    domelementtype: ^2.3.0
+  checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c
+  languageName: node
+  linkType: hard
+
 "domutils@npm:^2.5.2, domutils@npm:^2.8.0":
   version: 2.8.0
   resolution: "domutils@npm:2.8.0"
@@ -8930,6 +8225,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"domutils@npm:^3.0.1":
+  version: 3.1.0
+  resolution: "domutils@npm:3.1.0"
+  dependencies:
+    dom-serializer: ^2.0.0
+    domelementtype: ^2.3.0
+    domhandler: ^5.0.3
+  checksum: e5757456ddd173caa411cfc02c2bb64133c65546d2c4081381a3bafc8a57411a41eed70494551aa58030be9e58574fcc489828bebd673863d39924fb4878f416
+  languageName: node
+  linkType: hard
+
 "dot-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "dot-case@npm:3.0.4"
@@ -8940,12 +8246,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"dot-prop@npm:^5.2.0":
-  version: 5.3.0
-  resolution: "dot-prop@npm:5.3.0"
+"dot-prop@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "dot-prop@npm:6.0.1"
   dependencies:
     is-obj: ^2.0.0
-  checksum: d5775790093c234ef4bfd5fbe40884ff7e6c87573e5339432870616331189f7f5d86575c5b5af2dcf0f61172990f4f734d07844b1f23482fff09e3c4bead05ea
+  checksum: 0f47600a4b93e1dc37261da4e6909652c008832a5d3684b5bf9a9a0d3f4c67ea949a86dceed9b72f5733ed8e8e6383cc5958df3bbd0799ee317fd181f2ece700
   languageName: node
   linkType: hard
 
@@ -8956,20 +8262,20 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"dpdm@npm:3.13.1":
-  version: 3.13.1
-  resolution: "dpdm@npm:3.13.1"
+"dpdm@npm:3.14.0":
+  version: 3.14.0
+  resolution: "dpdm@npm:3.14.0"
   dependencies:
     chalk: ^4.1.2
     fs-extra: ^11.1.1
-    glob: ^9.3.1
+    glob: ^10.3.4
     ora: ^5.4.1
-    tslib: ^2.5.0
-    typescript: ^5.0.2
-    yargs: ^17.7.1
+    tslib: ^2.6.2
+    typescript: ^5.2.2
+    yargs: ^17.7.2
   bin:
     dpdm: lib/bin/dpdm.js
-  checksum: a19260fb6cfc72a81317c65d1f1104f811c763b80404e7a86f7621cd2de7002b57272718ea1dcf4649836e70656a53fe28344a92cd1c699c586ef5aa4d7bd65b
+  checksum: 86870216326db1b5d714d8297271e7cbafb0bb4e4e60b7c8eeffd22cab8cf8a1464b66db5ce62a4ba9ddb4efdba25b7903b8932b5aeb97df0e89374651c77c11
   languageName: node
   linkType: hard
 
@@ -8980,18 +8286,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"duplexify@npm:^3.6.0":
-  version: 3.7.1
-  resolution: "duplexify@npm:3.7.1"
-  dependencies:
-    end-of-stream: ^1.0.0
-    inherits: ^2.0.1
-    readable-stream: ^2.0.0
-    stream-shift: ^1.0.0
-  checksum: 3c2ed2223d956a5da713dae12ba8295acb61d9acd966ccbba938090d04f4574ca4dca75cca089b5077c2d7e66101f32e6ea9b36a78ca213eff574e7a8b8accf2
-  languageName: node
-  linkType: hard
-
 "eastasianwidth@npm:^0.2.0":
   version: 0.2.0
   resolution: "eastasianwidth@npm:0.2.0"
@@ -9000,27 +8294,20 @@ dexie@latest:
   linkType: hard
 
 "ejs@npm:^3.1.6":
-  version: 3.1.7
-  resolution: "ejs@npm:3.1.7"
+  version: 3.1.9
+  resolution: "ejs@npm:3.1.9"
   dependencies:
     jake: ^10.8.5
   bin:
     ejs: bin/cli.js
-  checksum: fe40764af39955ce8f8b116716fc8b911959946698edb49ecab85df597746c07aa65d5b74ead28a1e2ffa75b0f92d9bedd752f1c29437da6137b3518271e988c
+  checksum: af6f10eb815885ff8a8cfacc42c6b6cf87daf97a4884f87a30e0c3271fedd85d76a3a297d9c33a70e735b97ee632887f85e32854b9cdd3a2d97edf931519a35f
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.284":
-  version: 1.4.340
-  resolution: "electron-to-chromium@npm:1.4.340"
-  checksum: b7ffa64814efa49891c23ca0560f6831a992fa904c463bbf635ceccd57821dd0f4ecc22fa066860d34d9614b0ef4b27b385a5f59aed5dcf73ed832d58f746780
-  languageName: node
-  linkType: hard
-
-"electron-to-chromium@npm:^1.4.431":
-  version: 1.4.437
-  resolution: "electron-to-chromium@npm:1.4.437"
-  checksum: 3453e4fc148305a2fc33a94f2e173a8ae3d22f54f121aa6f2beffdbb83ebfca249776297f9fa1957b7fccf896acad2f55c4c64eedff87902a3c720be874c5b5c
+"electron-to-chromium@npm:^1.4.535":
+  version: 1.4.554
+  resolution: "electron-to-chromium@npm:1.4.554"
+  checksum: cbac43c50b43777327f4a7bf149ee3088c1da8b91bbcd80f78d2cc77bc52763f6d0941574499239d9caefd3430d3093f865e5f1093371418f7d6b70301eeae9b
   languageName: node
   linkType: hard
 
@@ -9031,6 +8318,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"emoji-picker-react@npm:4.5.3":
+  version: 4.5.3
+  resolution: "emoji-picker-react@npm:4.5.3"
+  dependencies:
+    clsx: ^1.2.1
+  peerDependencies:
+    react: ">=16"
+  checksum: 79681d0e4f3a733c9fa715559b8e3e6c20810e745844718d7072d909f9e5eb2870ba782df5d23d74e0b3ce6d733bbe045b42bf4b27bf1cfc0f5ecfbc971cfe61
+  languageName: node
+  linkType: hard
+
 "emoji-regex@npm:^8.0.0":
   version: 8.0.0
   resolution: "emoji-regex@npm:8.0.0"
@@ -9071,26 +8369,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1":
-  version: 1.4.4
-  resolution: "end-of-stream@npm:1.4.4"
-  dependencies:
-    once: ^1.4.0
-  checksum: 530a5a5a1e517e962854a31693dbb5c0b2fc40b46dad2a56a2deec656ca040631124f4795823acc68238147805f8b021abbe221f4afed5ef3c8e8efc2024908b
-  languageName: node
-  linkType: hard
-
-"enhanced-resolve@npm:^5.12.0":
-  version: 5.13.0
-  resolution: "enhanced-resolve@npm:5.13.0"
-  dependencies:
-    graceful-fs: ^4.2.4
-    tapable: ^2.2.0
-  checksum: 76d6844c4393d76beed5b3ce6cf5a98dee3ad5c84a9887f49ccde1224e3b7af201dfbd5a57ebf2b49f623b74883df262d50ff480d3cc02fc2881fc58b84e1bbe
-  languageName: node
-  linkType: hard
-
-"enhanced-resolve@npm:^5.15.0":
+"enhanced-resolve@npm:^5.12.0, enhanced-resolve@npm:^5.15.0":
   version: 5.15.0
   resolution: "enhanced-resolve@npm:5.15.0"
   dependencies:
@@ -9107,17 +8386,24 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"entities@npm:^2.0.0, entities@npm:~2.1.0":
-  version: 2.1.0
-  resolution: "entities@npm:2.1.0"
-  checksum: a10a877e489586a3f6a691fe49bf3fc4e58f06c8e80522f08214a5150ba457e7017b447d4913a3fa041bda06ee4c92517baa4d8d75373eaa79369e9639225ffd
+"entities@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "entities@npm:2.2.0"
+  checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3
   languageName: node
   linkType: hard
 
-"entities@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "entities@npm:4.4.0"
-  checksum: 84d250329f4b56b40fa93ed067b194db21e8815e4eb9b59f43a086f0ecd342814f6bc483de8a77da5d64e0f626033192b1b4f1792232a7ea6b970ebe0f3187c2
+"entities@npm:^4.2.0, entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
+"entities@npm:~2.1.0":
+  version: 2.1.0
+  resolution: "entities@npm:2.1.0"
+  checksum: a10a877e489586a3f6a691fe49bf3fc4e58f06c8e80522f08214a5150ba457e7017b447d4913a3fa041bda06ee4c92517baa4d8d75373eaa79369e9639225ffd
   languageName: node
   linkType: hard
 
@@ -9136,11 +8422,11 @@ dexie@latest:
   linkType: hard
 
 "envinfo@npm:^7.7.3":
-  version: 7.7.3
-  resolution: "envinfo@npm:7.7.3"
+  version: 7.10.0
+  resolution: "envinfo@npm:7.10.0"
   bin:
     envinfo: dist/cli.js
-  checksum: d8fb5c308fafaa18bff0e415d1a538df58de09ce168259b4b3fa6d10b3391df300ae6c64679e382c9949e26102fc703e7f675abc8a56958546baa8f509dc3df4
+  checksum: 05e81a5768c42cbd5c580dc3f274db3401facadd53e9bd52e2aa49dfbb5d8b26f6181c25a6652d79618a6994185bd2b1c137673101690b147f758e4e71d42f7d
   languageName: node
   linkType: hard
 
@@ -9178,39 +8464,54 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.4":
-  version: 1.20.4
-  resolution: "es-abstract@npm:1.20.4"
+"es-abstract@npm:^1.22.1":
+  version: 1.22.2
+  resolution: "es-abstract@npm:1.22.2"
   dependencies:
+    array-buffer-byte-length: ^1.0.0
+    arraybuffer.prototype.slice: ^1.0.2
+    available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
+    es-set-tostringtag: ^2.0.1
     es-to-primitive: ^1.2.1
-    function-bind: ^1.1.1
-    function.prototype.name: ^1.1.5
-    get-intrinsic: ^1.1.3
+    function.prototype.name: ^1.1.6
+    get-intrinsic: ^1.2.1
     get-symbol-description: ^1.0.0
+    globalthis: ^1.0.3
+    gopd: ^1.0.1
     has: ^1.0.3
     has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
+    internal-slot: ^1.0.5
+    is-array-buffer: ^3.0.2
     is-callable: ^1.2.7
     is-negative-zero: ^2.0.2
     is-regex: ^1.1.4
     is-shared-array-buffer: ^1.0.2
     is-string: ^1.0.7
+    is-typed-array: ^1.1.12
     is-weakref: ^1.0.2
-    object-inspect: ^1.12.2
+    object-inspect: ^1.12.3
     object-keys: ^1.1.1
     object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.4.3
+    regexp.prototype.flags: ^1.5.1
+    safe-array-concat: ^1.0.1
     safe-regex-test: ^1.0.0
-    string.prototype.trimend: ^1.0.5
-    string.prototype.trimstart: ^1.0.5
+    string.prototype.trim: ^1.2.8
+    string.prototype.trimend: ^1.0.7
+    string.prototype.trimstart: ^1.0.7
+    typed-array-buffer: ^1.0.0
+    typed-array-byte-length: ^1.0.0
+    typed-array-byte-offset: ^1.0.0
+    typed-array-length: ^1.0.4
     unbox-primitive: ^1.0.2
-  checksum: 89297cc785c31aedf961a603d5a07ed16471e435d3a1b6d070b54f157cf48454b95cda2ac55e4b86ff4fe3276e835fcffd2771578e6fa634337da49b26826141
+    which-typed-array: ^1.1.11
+  checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.1.2":
+"es-get-iterator@npm:^1.1.3":
   version: 1.1.3
   resolution: "es-get-iterator@npm:1.1.3"
   dependencies:
@@ -9227,10 +8528,43 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"es-iterator-helpers@npm:^1.0.12":
+  version: 1.0.15
+  resolution: "es-iterator-helpers@npm:1.0.15"
+  dependencies:
+    asynciterator.prototype: ^1.0.0
+    call-bind: ^1.0.2
+    define-properties: ^1.2.1
+    es-abstract: ^1.22.1
+    es-set-tostringtag: ^2.0.1
+    function-bind: ^1.1.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    has-property-descriptors: ^1.0.0
+    has-proto: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.5
+    iterator.prototype: ^1.1.2
+    safe-array-concat: ^1.0.1
+  checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "es-module-lexer@npm:1.2.1"
-  checksum: c4145b853e1491eaa5d591e4580926d242978c38071ad3d09165c3b6d50314cc0ae3bf6e1dec81a9e53768b9299df2063d2e4a67d7742a5029ddeae6c4fc26f0
+  version: 1.3.1
+  resolution: "es-module-lexer@npm:1.3.1"
+  checksum: 3beafa7e171eb1e8cc45695edf8d51638488dddf65294d7911f8d6a96249da6a9838c87529262cc6ea53988d8272cec0f4bff93f476ed031a54ba3afb51a0ed3
+  languageName: node
+  linkType: hard
+
+"es-set-tostringtag@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "es-set-tostringtag@npm:2.0.1"
+  dependencies:
+    get-intrinsic: ^1.1.3
+    has: ^1.0.3
+    has-tostringtag: ^1.0.0
+  checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884
   languageName: node
   linkType: hard
 
@@ -9302,13 +8636,12 @@ dexie@latest:
   linkType: hard
 
 "escodegen@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "escodegen@npm:2.0.0"
+  version: 2.1.0
+  resolution: "escodegen@npm:2.1.0"
   dependencies:
     esprima: ^4.0.1
     estraverse: ^5.2.0
     esutils: ^2.0.2
-    optionator: ^0.8.1
     source-map: ~0.6.1
   dependenciesMeta:
     source-map:
@@ -9316,18 +8649,18 @@ dexie@latest:
   bin:
     escodegen: bin/escodegen.js
     esgenerate: bin/esgenerate.js
-  checksum: 5aa6b2966fafe0545e4e77936300cc94ad57cfe4dc4ebff9950492eaba83eef634503f12d7e3cbd644ecc1bab388ad0e92b06fd32222c9281a75d1cf02ec6cef
+  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:^8.8.0":
-  version: 8.8.0
-  resolution: "eslint-config-prettier@npm:8.8.0"
+"eslint-config-prettier@npm:^9":
+  version: 9.0.0
+  resolution: "eslint-config-prettier@npm:9.0.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 1e94c3882c4d5e41e1dcfa2c368dbccbfe3134f6ac7d40101644d3bfbe3eb2f2ffac757f3145910b5eacf20c0e85e02b91293d3126d770cbf3dc390b3564681c
+  checksum: 362e991b6cb343f79362bada2d97c202e5303e6865888918a7445c555fb75e4c078b01278e90be98aa98ae22f8597d8e93d48314bec6824f540f7efcab3ce451
   languageName: node
   linkType: hard
 
@@ -9341,55 +8674,43 @@ dexie@latest:
   linkType: hard
 
 "eslint-import-resolver-node@npm:^0.3.7":
-  version: 0.3.7
-  resolution: "eslint-import-resolver-node@npm:0.3.7"
+  version: 0.3.9
+  resolution: "eslint-import-resolver-node@npm:0.3.9"
   dependencies:
     debug: ^3.2.7
-    is-core-module: ^2.11.0
-    resolve: ^1.22.1
-  checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e
+    is-core-module: ^2.13.0
+    resolve: ^1.22.4
+  checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-typescript@npm:^3.5.5":
-  version: 3.5.5
-  resolution: "eslint-import-resolver-typescript@npm:3.5.5"
+"eslint-import-resolver-typescript@npm:^3.5.2":
+  version: 3.6.1
+  resolution: "eslint-import-resolver-typescript@npm:3.6.1"
   dependencies:
     debug: ^4.3.4
     enhanced-resolve: ^5.12.0
     eslint-module-utils: ^2.7.4
+    fast-glob: ^3.3.1
     get-tsconfig: ^4.5.0
-    globby: ^13.1.3
     is-core-module: ^2.11.0
     is-glob: ^4.0.3
-    synckit: ^0.8.5
   peerDependencies:
     eslint: "*"
     eslint-plugin-import: "*"
-  checksum: 27e6276fdff5d377c9036362ff736ac29852106e883ff589ea9092dc57d4bc2a67a82d75134221124f05045f9a7e2114a159b2c827d1f9f64d091f7afeab0f58
+  checksum: 454fa0646533050fb57f13d27daf8c71f51b0bb9156d6a461290ccb8576d892209fcc6702a89553f3f5ea8e5b407395ca2e5de169a952c953685f1f7c46b4496
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.4":
-  version: 2.7.4
-  resolution: "eslint-module-utils@npm:2.7.4"
+"eslint-module-utils@npm:^2.7.4, eslint-module-utils@npm:^2.8.0":
+  version: 2.8.0
+  resolution: "eslint-module-utils@npm:2.8.0"
   dependencies:
     debug: ^3.2.7
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 5da13645daff145a5c922896b258f8bba560722c3767254e458d894ff5fbb505d6dfd945bffa932a5b0ae06714da2379bd41011c4c20d2d59cc83e23895360f7
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-babel@npm:5.3.1":
-  version: 5.3.1
-  resolution: "eslint-plugin-babel@npm:5.3.1"
-  dependencies:
-    eslint-rule-composer: ^0.3.0
-  peerDependencies:
-    eslint: ">=4.0.0"
-  checksum: 18b0bfda53deab4056160a4f3a89a4649b6ae17e4970cc836f7d586c8abab5ebb492440e2acf4770a463138a44a4ee7f9b22b4ed1fdbe69c652f714c1d973e38
+  checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2
   languageName: node
   linkType: hard
 
@@ -9412,51 +8733,56 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:^2.27.5":
-  version: 2.27.5
-  resolution: "eslint-plugin-import@npm:2.27.5"
+"eslint-plugin-import@npm:^2.26.0":
+  version: 2.28.1
+  resolution: "eslint-plugin-import@npm:2.28.1"
   dependencies:
     array-includes: ^3.1.6
+    array.prototype.findlastindex: ^1.2.2
     array.prototype.flat: ^1.3.1
     array.prototype.flatmap: ^1.3.1
     debug: ^3.2.7
     doctrine: ^2.1.0
     eslint-import-resolver-node: ^0.3.7
-    eslint-module-utils: ^2.7.4
+    eslint-module-utils: ^2.8.0
     has: ^1.0.3
-    is-core-module: ^2.11.0
+    is-core-module: ^2.13.0
     is-glob: ^4.0.3
     minimatch: ^3.1.2
+    object.fromentries: ^2.0.6
+    object.groupby: ^1.0.0
     object.values: ^1.1.6
-    resolve: ^1.22.1
-    semver: ^6.3.0
-    tsconfig-paths: ^3.14.1
+    semver: ^6.3.1
+    tsconfig-paths: ^3.14.2
   peerDependencies:
     eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: f500571a380167e25d72a4d925ef9a7aae8899eada57653e5f3051ec3d3c16d08271fcefe41a30a9a2f4fefc232f066253673ee4ea77b30dba65ae173dade85d
+  checksum: e8ae6dd8f06d8adf685f9c1cfd46ac9e053e344a05c4090767e83b63a85c8421ada389807a39e73c643b9bff156715c122e89778169110ed68d6428e12607edf
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest-dom@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "eslint-plugin-jest-dom@npm:4.0.3"
+"eslint-plugin-jest-dom@npm:^5.0.2":
+  version: 5.1.0
+  resolution: "eslint-plugin-jest-dom@npm:5.1.0"
   dependencies:
     "@babel/runtime": ^7.16.3
-    "@testing-library/dom": ^8.11.1
     requireindex: ^1.2.0
   peerDependencies:
+    "@testing-library/dom": ^8.0.0 || ^9.0.0
     eslint: ^6.8.0 || ^7.0.0 || ^8.0.0
-  checksum: 6bd22cdb7951a4b9ac65fe35c7bdc3e44cbe09918c79535fa698433d730392ef7a6faa55468b84d1cb0303a923266a05d45e38278d88380b0f09c8e8f57c75de
+  peerDependenciesMeta:
+    "@testing-library/dom":
+      optional: true
+  checksum: bd190a5501b9f5bb6ac9057fbee124d54d3854f992e13a7415aba5d34ecedd0c7362263d6b8e956549d76c40008b70232da84476200b5762c4162021e3af052c
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:^27.2.2":
-  version: 27.2.2
-  resolution: "eslint-plugin-jest@npm:27.2.2"
+"eslint-plugin-jest@npm:^27.1.4":
+  version: 27.4.2
+  resolution: "eslint-plugin-jest@npm:27.4.2"
   dependencies:
     "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0
+    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0
     eslint: ^7.0.0 || ^8.0.0
     jest: "*"
   peerDependenciesMeta:
@@ -9464,28 +8790,30 @@ dexie@latest:
       optional: true
     jest:
       optional: true
-  checksum: 98b63252d985f5dedf36ce9587dd4a0d24daf71ca8a997258343402c0d33ddd5070502378dafd9ac7fc0ef2e0d557b5c77f18e09ad73c71a52de8061db88293f
+  checksum: 99a8301ae00c37da97866b8b13c89a077716d2c653b26bc417d242e7300a43237c0017fd488c43966fa38585f19050facdbbc71d03ca36a1ce6f2ba930a9143e
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsdoc@npm:^39.8.0":
-  version: 39.8.0
-  resolution: "eslint-plugin-jsdoc@npm:39.8.0"
+"eslint-plugin-jsdoc@npm:^46.2.3":
+  version: 46.8.2
+  resolution: "eslint-plugin-jsdoc@npm:46.8.2"
   dependencies:
-    "@es-joy/jsdoccomment": ~0.36.1
-    comment-parser: 1.3.1
+    "@es-joy/jsdoccomment": ~0.40.1
+    are-docs-informative: ^0.0.2
+    comment-parser: 1.4.0
     debug: ^4.3.4
     escape-string-regexp: ^4.0.0
-    esquery: ^1.4.0
-    semver: ^7.3.8
+    esquery: ^1.5.0
+    is-builtin-module: ^3.2.1
+    semver: ^7.5.4
     spdx-expression-parse: ^3.0.1
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: fe2fec06605c9effe30c3c136f91ba5720d0dec519f5d54dc336f86dc3375793053399e9ca37a33e8eb04cc10571ded800c5babe8b09822922209a0b63751855
+  checksum: ec2c435246cd45847b7c3ff3c04cc1713c658e3a6023e55577bda25c7ce1547d022aab0bf3b4920c6f792d52ff473c031d61167308e314183c15b57d23ce59c3
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsx-a11y@npm:^6.7.1":
+"eslint-plugin-jsx-a11y@npm:^6.6.1":
   version: 6.7.1
   resolution: "eslint-plugin-jsx-a11y@npm:6.7.1"
   dependencies:
@@ -9511,7 +8839,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-no-unsanitized@npm:^4.0.2":
+"eslint-plugin-no-unsanitized@npm:^4.0.1":
   version: 4.0.2
   resolution: "eslint-plugin-no-unsanitized@npm:4.0.2"
   peerDependencies:
@@ -9520,18 +8848,22 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "eslint-plugin-prettier@npm:4.2.1"
+"eslint-plugin-prettier@npm:^5, eslint-plugin-prettier@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eslint-plugin-prettier@npm:5.0.1"
   dependencies:
     prettier-linter-helpers: ^1.0.0
+    synckit: ^0.8.5
   peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
+    "@types/eslint": ">=8.0.0"
+    eslint: ">=8.0.0"
+    prettier: ">=3.0.0"
   peerDependenciesMeta:
+    "@types/eslint":
+      optional: true
     eslint-config-prettier:
       optional: true
-  checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6
+  checksum: c2261033b97bafe99ccb7cc47c2fac6fa85b8bbc8b128042e52631f906b69e12afed2cdd9d7e3021cc892ee8dd4204a3574e1f32a0b718b4bb3b440944b6983b
   languageName: node
   linkType: hard
 
@@ -9544,14 +8876,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.32.2":
-  version: 7.32.2
-  resolution: "eslint-plugin-react@npm:7.32.2"
+"eslint-plugin-react@npm:^7.31.10":
+  version: 7.33.2
+  resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
     array-includes: ^3.1.6
     array.prototype.flatmap: ^1.3.1
     array.prototype.tosorted: ^1.1.1
     doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.12
     estraverse: ^5.3.0
     jsx-ast-utils: ^2.4.1 || ^3.0.0
     minimatch: ^3.1.2
@@ -9561,73 +8894,46 @@ dexie@latest:
     object.values: ^1.1.6
     prop-types: ^15.8.1
     resolve: ^2.0.0-next.4
-    semver: ^6.3.0
+    semver: ^6.3.1
     string.prototype.matchall: ^4.0.8
   peerDependencies:
     eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 2232b3b8945aa50b7773919c15cd96892acf35d2f82503667a79e2f55def90f728ed4f0e496f0f157acbe1bd4397c5615b676ae7428fe84488a544ca53feb944
+  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
   languageName: node
   linkType: hard
 
-"eslint-plugin-simple-import-sort@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "eslint-plugin-simple-import-sort@npm:8.0.0"
+"eslint-plugin-simple-import-sort@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "eslint-plugin-simple-import-sort@npm:10.0.0"
   peerDependencies:
     eslint: ">=5.0.0"
-  checksum: d2a92a7d148803ee9ad4f081892a8d03820198c36a0f4f16a97d9f686a714edc9c9a9e51cc79cb0ba1afff76a1fde6a5eae50e9e3754928068227c92a2db5d6b
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-sort-keys-fix@npm:1.1.2":
-  version: 1.1.2
-  resolution: "eslint-plugin-sort-keys-fix@npm:1.1.2"
-  dependencies:
-    espree: ^6.1.2
-    esutils: ^2.0.2
-    natural-compare: ^1.4.0
-    requireindex: ~1.2.0
-  checksum: d089e4ec4f8cea4ec239132f85c807ce71e500370e3ef778d684697da5011b413e625d6f5b9bf3b5b1cf7c4eafffc39d386bffca271b7c3e7983409fb0d7d2c6
+  checksum: 23221ff63f80f9c52da807d388ee8a51bc36a3b73345f60ec886e7973c28d75eb1d1e47f7f2916a7c1f94a1b5037b1450356a64a8fbd58096fd6bee57c6e3e48
   languageName: node
   linkType: hard
 
-"eslint-plugin-testing-library@npm:^5.11.0":
-  version: 5.11.0
-  resolution: "eslint-plugin-testing-library@npm:5.11.0"
+"eslint-plugin-testing-library@npm:^6.0.0":
+  version: 6.1.0
+  resolution: "eslint-plugin-testing-library@npm:6.1.0"
   dependencies:
     "@typescript-eslint/utils": ^5.58.0
   peerDependencies:
     eslint: ^7.5.0 || ^8.0.0
-  checksum: 7f19d3dedd7788b411ca3d9045de682feb26025b9c26d97d4e2f0bf62f5eaa276147d946bd5d0cd967b822e546a954330fdb7ef80485301264f646143f011a02
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-typescript-sort-keys@npm:2.3.0":
-  version: 2.3.0
-  resolution: "eslint-plugin-typescript-sort-keys@npm:2.3.0"
-  dependencies:
-    "@typescript-eslint/experimental-utils": ^5.0.0
-    json-schema: ^0.4.0
-    natural-compare-lite: ^1.4.0
-  peerDependencies:
-    "@typescript-eslint/parser": ^1 || ^2 || ^3 || ^4 || ^5
-    eslint: ^5 || ^6 || ^7 || ^8
-    typescript: ^3 || ^4 || ^5
-  checksum: 3c00e77c2761dbd7c5b6d61883ddfb587eb32f4f5bddf2694f88ec278ac4e1f1c14694d04755c55cc6ed5313d7dcd407c376034cbc1871904f242f368a013091
+  checksum: 67d2f521a6af623c157d05bbefa743d9aa360d5462a9b38a82a79b0ba008cb4d6ba3f604f54ac9d12405c53b6744695fc7fde7875f2b83aa3f85a8ced7687be3
   languageName: node
   linkType: hard
 
-"eslint-plugin-unused-imports@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "eslint-plugin-unused-imports@npm:2.0.0"
+"eslint-plugin-unused-imports@npm:^3":
+  version: 3.0.0
+  resolution: "eslint-plugin-unused-imports@npm:3.0.0"
   dependencies:
     eslint-rule-composer: ^0.3.0
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0
+    "@typescript-eslint/eslint-plugin": ^6.0.0
     eslint: ^8.0.0
   peerDependenciesMeta:
     "@typescript-eslint/eslint-plugin":
       optional: true
-  checksum: 8aa1e03e75da2a62a354065e0cb8fe370118c6f8d9720a32fe8c1da937de6adb81a4fed7d0d391d115ac9453b49029fb19f970d180a2cf3dba451fd4c20f0dc4
+  checksum: 51666f62cc8dccba2895ced83f3c1e0b78b68c357e17360e156c4db548bfdeda34cbd8725192fb4903f22d5069400fb22ded6039631df01ee82fd618dc307247
   languageName: node
   linkType: hard
 
@@ -9648,75 +8954,98 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"eslint-scope@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "eslint-scope@npm:7.2.0"
+"eslint-scope@npm:^7.2.2":
+  version: 7.2.2
+  resolution: "eslint-scope@npm:7.2.2"
   dependencies:
     esrecurse: ^4.3.0
     estraverse: ^5.2.0
-  checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae
-  languageName: node
-  linkType: hard
-
-"eslint-utils@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "eslint-utils@npm:3.0.0"
-  dependencies:
-    eslint-visitor-keys: ^2.0.0
-  peerDependencies:
-    eslint: ">=5"
-  checksum: 0668fe02f5adab2e5a367eee5089f4c39033af20499df88fe4e6aba2015c20720404d8c3d6349b6f716b08fdf91b9da4e5d5481f265049278099c4c836ccb619
-  languageName: node
-  linkType: hard
-
-"eslint-visitor-keys@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "eslint-visitor-keys@npm:1.3.0"
-  checksum: 37a19b712f42f4c9027e8ba98c2b06031c17e0c0a4c696cd429bd9ee04eb43889c446f2cd545e1ff51bef9593fcec94ecd2c2ef89129fcbbf3adadbef520376a
+  checksum: ec97dbf5fb04b94e8f4c5a91a7f0a6dd3c55e46bfc7bbcd0e3138c3a76977570e02ed89a1810c778dcd72072ff0e9621ba1379b4babe53921d71e2e4486fda3e
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^2.0.0, eslint-visitor-keys@npm:^2.1.0":
+"eslint-visitor-keys@npm:^2.1.0":
   version: 2.1.0
   resolution: "eslint-visitor-keys@npm:2.1.0"
   checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "eslint-visitor-keys@npm:3.4.0"
-  checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c
+"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60
   languageName: node
   linkType: hard
 
-"eslint-visitor-keys@npm:^3.4.1":
-  version: 3.4.1
-  resolution: "eslint-visitor-keys@npm:3.4.1"
-  checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c
+"eslint@npm:^8":
+  version: 8.51.0
+  resolution: "eslint@npm:8.51.0"
+  dependencies:
+    "@eslint-community/eslint-utils": ^4.2.0
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.2
+    "@eslint/js": 8.51.0
+    "@humanwhocodes/config-array": ^0.11.11
+    "@humanwhocodes/module-importer": ^1.0.1
+    "@nodelib/fs.walk": ^1.2.8
+    ajv: ^6.12.4
+    chalk: ^4.0.0
+    cross-spawn: ^7.0.2
+    debug: ^4.3.2
+    doctrine: ^3.0.0
+    escape-string-regexp: ^4.0.0
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
+    esquery: ^1.4.2
+    esutils: ^2.0.2
+    fast-deep-equal: ^3.1.3
+    file-entry-cache: ^6.0.1
+    find-up: ^5.0.0
+    glob-parent: ^6.0.2
+    globals: ^13.19.0
+    graphemer: ^1.4.0
+    ignore: ^5.2.0
+    imurmurhash: ^0.1.4
+    is-glob: ^4.0.0
+    is-path-inside: ^3.0.3
+    js-yaml: ^4.1.0
+    json-stable-stringify-without-jsonify: ^1.0.1
+    levn: ^0.4.1
+    lodash.merge: ^4.6.2
+    minimatch: ^3.1.2
+    natural-compare: ^1.4.0
+    optionator: ^0.9.3
+    strip-ansi: ^6.0.1
+    text-table: ^0.2.0
+  bin:
+    eslint: bin/eslint.js
+  checksum: 214fa5d1fcb67af1b8992ce9584ccd85e1aa7a482f8b8ea5b96edc28fa838a18a3b69456db45fc1ed3ef95f1e9efa9714f737292dc681e572d471d02fda9649c
   languageName: node
   linkType: hard
 
-"eslint@npm:^8.41.0":
-  version: 8.41.0
-  resolution: "eslint@npm:8.41.0"
+"eslint@npm:^8.52.0":
+  version: 8.52.0
+  resolution: "eslint@npm:8.52.0"
   dependencies:
     "@eslint-community/eslint-utils": ^4.2.0
-    "@eslint-community/regexpp": ^4.4.0
-    "@eslint/eslintrc": ^2.0.3
-    "@eslint/js": 8.41.0
-    "@humanwhocodes/config-array": ^0.11.8
+    "@eslint-community/regexpp": ^4.6.1
+    "@eslint/eslintrc": ^2.1.2
+    "@eslint/js": 8.52.0
+    "@humanwhocodes/config-array": ^0.11.13
     "@humanwhocodes/module-importer": ^1.0.1
     "@nodelib/fs.walk": ^1.2.8
-    ajv: ^6.10.0
+    "@ungap/structured-clone": ^1.2.0
+    ajv: ^6.12.4
     chalk: ^4.0.0
     cross-spawn: ^7.0.2
     debug: ^4.3.2
     doctrine: ^3.0.0
     escape-string-regexp: ^4.0.0
-    eslint-scope: ^7.2.0
-    eslint-visitor-keys: ^3.4.1
-    espree: ^9.5.2
+    eslint-scope: ^7.2.2
+    eslint-visitor-keys: ^3.4.3
+    espree: ^9.6.1
     esquery: ^1.4.2
     esutils: ^2.0.2
     fast-deep-equal: ^3.1.3
@@ -9726,7 +9055,6 @@ dexie@latest:
     globals: ^13.19.0
     graphemer: ^1.4.0
     ignore: ^5.2.0
-    import-fresh: ^3.0.0
     imurmurhash: ^0.1.4
     is-glob: ^4.0.0
     is-path-inside: ^3.0.3
@@ -9736,56 +9064,33 @@ dexie@latest:
     lodash.merge: ^4.6.2
     minimatch: ^3.1.2
     natural-compare: ^1.4.0
-    optionator: ^0.9.1
+    optionator: ^0.9.3
     strip-ansi: ^6.0.1
-    strip-json-comments: ^3.1.0
     text-table: ^0.2.0
   bin:
     eslint: bin/eslint.js
-  checksum: 09979a6f8451dcc508a7005b6670845c8a518376280b3fd96657a406b8b6ef29d0e480d1ba11b4eb48da93d607e0c55c9b877676fe089d09973ec152354e23b2
-  languageName: node
-  linkType: hard
-
-"espree@npm:^6.1.2":
-  version: 6.2.1
-  resolution: "espree@npm:6.2.1"
-  dependencies:
-    acorn: ^7.1.1
-    acorn-jsx: ^5.2.0
-    eslint-visitor-keys: ^1.1.0
-  checksum: 99c508950b5b9f53d008d781d2abb7a4ef3496ea699306fb6eb737c7e513aa594644314364c50ec27abb220124c6851fff64a6b62c358479534369904849360b
+  checksum: fd22d1e9bd7090e31b00cbc7a3b98f3b76020a4c4641f987ae7d0c8f52e1b88c3b268bdfdabac2e1a93513e5d11339b718ff45cbff48a44c35d7e52feba510ed
   languageName: node
   linkType: hard
 
-"espree@npm:^9.0.0":
-  version: 9.5.1
-  resolution: "espree@npm:9.5.1"
+"espree@npm:^9.0.0, espree@npm:^9.6.0, espree@npm:^9.6.1":
+  version: 9.6.1
+  resolution: "espree@npm:9.6.1"
   dependencies:
-    acorn: ^8.8.0
-    acorn-jsx: ^5.3.2
-    eslint-visitor-keys: ^3.4.0
-  checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88
-  languageName: node
-  linkType: hard
-
-"espree@npm:^9.5.2":
-  version: 9.5.2
-  resolution: "espree@npm:9.5.2"
-  dependencies:
-    acorn: ^8.8.0
+    acorn: ^8.9.0
     acorn-jsx: ^5.3.2
     eslint-visitor-keys: ^3.4.1
-  checksum: 6506289d6eb26471c0b383ee24fee5c8ae9d61ad540be956b3127be5ce3bf687d2ba6538ee5a86769812c7c552a9d8239e8c4d150f9ea056c6d5cbe8399c03c1
+  checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9
   languageName: node
   linkType: hard
 
 "esprima-next@npm:^5.7.0":
-  version: 5.7.0
-  resolution: "esprima-next@npm:5.7.0"
+  version: 5.8.4
+  resolution: "esprima-next@npm:5.8.4"
   bin:
     esparse: bin/esparse.js
     esvalidate: bin/esvalidate.js
-  checksum: 39b47ec6e883cbb5913384014bc2901172d96122033f58382572ba9e5ab86b8c4b856baebf9c8bcb96b74fa33f11c9388b623f8112d219a80001c04eef70c9c4
+  checksum: 3c2e7ddd91faac777e506360eb989a1a4d3c02c8a5abe5ca1e4aa2249e300f7a8cd05b3bc0aa3901e63082090abd4a3ba00d5357a630d03d0e0a3830dd078bc5
   languageName: node
   linkType: hard
 
@@ -9799,7 +9104,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"esquery@npm:^1.4.0, esquery@npm:^1.4.2":
+"esquery@npm:^1.4.2, esquery@npm:^1.5.0":
   version: 1.5.0
   resolution: "esquery@npm:1.5.0"
   dependencies:
@@ -9860,10 +9165,34 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 543d6c858ab699303c3c32e0f0f47fc64d360bf73c3daf0ac0b5079710e340d6fe9f15487f94e66c629f5f82cd1a8678d692f3dbb6f6fcd1190e1b97fcad36f8
+  languageName: node
+  linkType: hard
+
 "events@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "events@npm:3.2.0"
-  checksum: 974178db37de546d2d8eff37ac662c2a9e046fc4f509ae0894cfaaf437381bc030081057d19b45a1bc32f1445d5a85221053fc1fb6858d08deeb01b1a6e259c3
+  version: 3.3.0
+  resolution: "events@npm:3.3.0"
+  checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
+  languageName: node
+  linkType: hard
+
+"execa@npm:8.0.1":
+  version: 8.0.1
+  resolution: "execa@npm:8.0.1"
+  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
+  checksum: cac1bf86589d1d9b73bdc5dda65c52012d1a9619c44c526891956745f7b366ca2603d29fe3f7460bacc2b48c6eab5d6a4f7afe0534b31473d3708d1265545e1f
   languageName: node
   linkType: hard
 
@@ -9884,9 +9213,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"execa@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "execa@npm:7.1.0"
+"execa@npm:^7.1.1":
+  version: 7.2.0
+  resolution: "execa@npm:7.2.0"
   dependencies:
     cross-spawn: ^7.0.3
     get-stream: ^6.0.1
@@ -9897,7 +9226,7 @@ dexie@latest:
     onetime: ^6.0.0
     signal-exit: ^3.0.7
     strip-final-newline: ^3.0.0
-  checksum: feb446802885a0bace8400efdd7320f811203a53af29e8a65a6ff18e58582909eefeec31e163fbee9debcfeb7d464be2887beeb85c817ca873ac720064404247
+  checksum: 14fd17ba0ca8c87b277584d93b1d9fc24f2a65e5152b31d5eb159a3b814854283eaae5f51efa9525e304447e2f757c691877f7adff8fde5746aae67eb1edd1cc
   languageName: node
   linkType: hard
 
@@ -9924,16 +9253,23 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"expect@npm:^29.0.0, expect@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "expect@npm:29.5.0"
+"expect@npm:^29.0.0, expect@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "expect@npm:29.7.0"
   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
-  checksum: 58f70b38693df6e5c6892db1bcd050f0e518d6f785175dc53917d4fa6a7359a048e5690e19ddcb96b65c4493881dd89a3dabdab1a84dfa55c10cdbdabf37b2d7
+    "@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
+  checksum: 9257f10288e149b81254a0fda8ffe8d54a7061cd61d7515779998b012579d2b8c22354b0eb901daf0145f347403da582f75f359f4810c007182ad3fb318b5c0c
+  languageName: node
+  linkType: hard
+
+"exponential-backoff@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "exponential-backoff@npm:3.1.1"
+  checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48
   languageName: node
   linkType: hard
 
@@ -9946,19 +9282,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
-"fake-indexeddb@npm:4.0.1":
-  version: 4.0.1
-  resolution: "fake-indexeddb@npm:4.0.1"
+"fake-indexeddb@npm:4.0.2":
+  version: 4.0.2
+  resolution: "fake-indexeddb@npm:4.0.2"
   dependencies:
     realistic-structured-clone: ^3.0.0
-  checksum: dd1c82111e3b97c262a647a29dc012209f8c3bed0fbe7ae9630927772842fe8d3276794ff196d0021a5e60563a25a4323eca622a6a7bc6575b62e074328a0c90
+  checksum: ad257e5cc6273d9ea667b4129d8b0798830d56a68c7c77ddba752b3fd0088cb33e34b9569b218d16dfc8a78733d360d325f89c2ce352b70a0587c1f46f6f881d
   languageName: node
   linkType: hard
 
@@ -9970,9 +9299,9 @@ dexie@latest:
   linkType: hard
 
 "fast-diff@npm:^1.1.2":
-  version: 1.2.0
-  resolution: "fast-diff@npm:1.2.0"
-  checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae
+  version: 1.3.0
+  resolution: "fast-diff@npm:1.3.0"
+  checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3
   languageName: node
   linkType: hard
 
@@ -9983,16 +9312,30 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.9":
-  version: 3.2.12
-  resolution: "fast-glob@npm:3.2.12"
+"fast-equals@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "fast-equals@npm:5.0.1"
+  checksum: fbb3b6a74f3a0fa930afac151ff7d01639159b4fddd2678b5d50708e0ba38e9ec14602222d10dadb8398187342692c04fbef5a62b1cfcc7942fe03e754e064bc
+  languageName: node
+  linkType: hard
+
+"fast-fifo@npm:^1.1.0, fast-fifo@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "fast-fifo@npm:1.3.2"
+  checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "fast-glob@npm:3.3.1"
   dependencies:
     "@nodelib/fs.stat": ^2.0.2
     "@nodelib/fs.walk": ^1.2.3
     glob-parent: ^5.1.2
     merge2: ^1.3.0
     micromatch: ^4.0.4
-  checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2
+  checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5
   languageName: node
   linkType: hard
 
@@ -10017,21 +9360,21 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fastq@npm:^1.6.0":
-  version: 1.10.0
-  resolution: "fastq@npm:1.10.0"
+"fastq@npm:^1.13.0, fastq@npm:^1.6.0":
+  version: 1.15.0
+  resolution: "fastq@npm:1.15.0"
   dependencies:
     reusify: ^1.0.4
-  checksum: 67fe7c7c96c5a714d39664c318bca84862b0e5658b5fcd67c3eaeda0bb2eb6895ce39d16944e2f523ce2737fa918113969ad7e1f204200d61cc29f2950f441c4
+  checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a
   languageName: node
   linkType: hard
 
 "fb-watchman@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "fb-watchman@npm:2.0.1"
+  version: 2.0.2
+  resolution: "fb-watchman@npm:2.0.2"
   dependencies:
     bser: 2.1.1
-  checksum: 8510230778ab3a51c27dffb1b76ef2c24fab672a42742d3c0a45c2e9d1e5f20210b1fbca33486088da4a9a3958bde96b5aec0a63aac9894b4e9df65c88b2cbd6
+  checksum: b15a124cef28916fe07b400eb87cbc73ca082c142abf7ca8e8de6af43eca79ca7bd13eb4d4d48240b3bd3136eaac40d16e42d6edf87a8e5d1dd8070626860c78
   languageName: node
   linkType: hard
 
@@ -10079,6 +9422,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"file-entry-cache@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "file-entry-cache@npm:7.0.1"
+  dependencies:
+    flat-cache: ^3.1.1
+  checksum: 3b5affa175cc246147ca394fa2ed719d306126a9259bef7b29c4024451d6671c82bf505600c37ec1398f80427c1fa91edb973b5d5228fd40590f797ce7a2401c
+  languageName: node
+  linkType: hard
+
 "file-stat@npm:^0.1.0":
   version: 0.1.3
   resolution: "file-stat@npm:0.1.3"
@@ -10113,12 +9465,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"filelist@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "filelist@npm:1.0.3"
+"filelist@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "filelist@npm:1.0.4"
   dependencies:
     minimatch: ^5.0.1
-  checksum: c78048691a31b91d54908ce2eac4731bf108613c7b2e4d1a05a6cbe6739bd067e4c1a3baa4f7d07b7143b8c374c0c0d59864b5c8d9168ec8e2a85f84fb7170ad
+  checksum: a303573b0821e17f2d5e9783688ab6fbfce5d52aaac842790ae85e704a6f5e4e3538660a63183d6453834dedf1e0f19a9dadcebfa3e926c72397694ea11f5160
   languageName: node
   linkType: hard
 
@@ -10131,14 +9483,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"find-cache-dir@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "find-cache-dir@npm:3.3.2"
+"find-cache-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "find-cache-dir@npm:4.0.0"
   dependencies:
-    commondir: ^1.0.1
-    make-dir: ^3.0.2
-    pkg-dir: ^4.1.0
-  checksum: 1e61c2e64f5c0b1c535bd85939ae73b0e5773142713273818cc0b393ee3555fb0fd44e1a5b161b8b6c3e03e98c2fcc9c227d784850a13a90a8ab576869576817
+    common-path-prefix: ^3.0.0
+    pkg-dir: ^7.0.0
+  checksum: 52a456a80deeb27daa3af6e06059b63bdb9cc4af4d845fc6d6229887e505ba913cd56000349caa60bc3aa59dacdb5b4c37903d4ba34c75102d83cab330b70d2f
   languageName: node
   linkType: hard
 
@@ -10179,40 +9530,50 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"flat-cache@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "flat-cache@npm:3.0.4"
+"find-up@npm:^6.3.0":
+  version: 6.3.0
+  resolution: "find-up@npm:6.3.0"
+  dependencies:
+    locate-path: ^7.1.0
+    path-exists: ^5.0.0
+  checksum: 9a21b7f9244a420e54c6df95b4f6fc3941efd3c3e5476f8274eb452f6a85706e7a6a90de71353ee4f091fcb4593271a6f92810a324ec542650398f928783c280
+  languageName: node
+  linkType: hard
+
+"flat-cache@npm:^3.0.4, flat-cache@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "flat-cache@npm:3.1.1"
   dependencies:
-    flatted: ^3.1.0
+    flatted: ^3.2.9
+    keyv: ^4.5.3
     rimraf: ^3.0.2
-  checksum: 4fdd10ecbcbf7d520f9040dd1340eb5dfe951e6f0ecf2252edeec03ee68d989ec8b9a20f4434270e71bcfd57800dc09b3344fca3966b2eb8f613072c7d9a2365
+  checksum: 4958cfe0f46acf84953d4e16676ef5f0d38eab3a92d532a1e8d5f88f11eea8b36d5d598070ff2aeae15f1fde18f8d7d089eefaf9db10b5a587cc1c9072325c7a
   languageName: node
   linkType: hard
 
-"flatted@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "flatted@npm:3.1.0"
-  checksum: 3e4699377ef18194e39777fc39e472e8939e65c38fe1445a26072242498ea4a7f701bbd6515aa332e5ea11dd9d3488f775f6dfe8b605756fbc0807dc329fe118
+"flat@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "flat@npm:5.0.2"
+  bin:
+    flat: cli.js
+  checksum: 12a1536ac746db74881316a181499a78ef953632ddd28050b7a3a43c62ef5462e3357c8c29d76072bb635f147f7a9a1f0c02efef6b4be28f8db62ceb3d5c7f5d
   languageName: node
   linkType: hard
 
-"flush-write-stream@npm:^1.0.2":
-  version: 1.1.1
-  resolution: "flush-write-stream@npm:1.1.1"
-  dependencies:
-    inherits: ^2.0.3
-    readable-stream: ^2.3.6
-  checksum: 42e07747f83bcd4e799da802e621d6039787749ffd41f5517f8c4f786ee967e31ba32b09f8b28a9c6f67bd4f5346772e604202df350e8d99f4141771bae31279
+"flatted@npm:^3.2.9":
+  version: 3.2.9
+  resolution: "flatted@npm:3.2.9"
+  checksum: f14167fbe26a9d20f6fca8d998e8f1f41df72c8e81f9f2c9d61ed2bea058248f5e1cbd05e7f88c0e5087a6a0b822a1e5e2b446e879f3cfbe0b07ba2d7f80b026
   languageName: node
   linkType: hard
 
 "follow-redirects@npm:^1.15.0":
-  version: 1.15.2
-  resolution: "follow-redirects@npm:1.15.2"
+  version: 1.15.3
+  resolution: "follow-redirects@npm:1.15.3"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190
+  checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
   languageName: node
   linkType: hard
 
@@ -10225,6 +9586,16 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"foreground-child@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "foreground-child@npm:3.1.1"
+  dependencies:
+    cross-spawn: ^7.0.0
+    signal-exit: ^4.0.1
+  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
+  languageName: node
+  linkType: hard
+
 "form-data@npm:^4.0.0":
   version: 4.0.0
   resolution: "form-data@npm:4.0.0"
@@ -10236,10 +9607,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fraction.js@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "fraction.js@npm:4.2.0"
-  checksum: 8c76a6e21dedea87109d6171a0ac77afa14205794a565d71cb10d2925f629a3922da61bf45ea52dbc30bce4d8636dc0a27213a88cbd600eab047d82f9a3a94c5
+"fraction.js@npm:^4.3.6":
+  version: 4.3.7
+  resolution: "fraction.js@npm:4.3.7"
+  checksum: e1553ae3f08e3ba0e8c06e43a3ab20b319966dfb7ddb96fd9b5d0ee11a66571af7f993229c88ebbb0d4a816eb813a24ed48207b140d442a8f76f33763b8d1f3f
   languageName: node
   linkType: hard
 
@@ -10250,13 +9621,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fs-constants@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs-constants@npm:1.0.0"
-  checksum: 18f5b718371816155849475ac36c7d0b24d39a11d91348cfcb308b4494824413e03572c403c86d3a260e049465518c4f0d5bd00f0371cdfcad6d4f30a85b350d
-  languageName: node
-  linkType: hard
-
 "fs-exists-sync@npm:^0.1.0":
   version: 0.1.0
   resolution: "fs-exists-sync@npm:0.1.0"
@@ -10298,7 +9662,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0":
+"fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
   dependencies:
@@ -10307,20 +9671,29 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fs-mkdirp-stream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "fs-mkdirp-stream@npm:1.0.0"
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
   dependencies:
-    graceful-fs: ^4.1.11
-    through2: ^2.0.3
-  checksum: 397c6a699a951bbbb9af1b0e173c9e9c0497501650dd55cb54dd6cad81e80601b6dea86c872600b25295a1502df9e240c86457a0af8c9fea46d2a4d772f73110
+    minipass: ^7.0.3
+  checksum: 8722a41109130851d979222d3ec88aabaceeaaf8f57b2a8f744ef8bd2d1ce95453b04a61daa0078822bc5cd21e008814f06fe6586f56fef511e71b8d2394d802
   languageName: node
   linkType: hard
 
-"fs-monkey@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "fs-monkey@npm:1.0.3"
-  checksum: cf50804833f9b88a476911ae911fe50f61a98d986df52f890bd97e7262796d023698cb2309fa9b74fdd8974f04315b648748a0a8ee059e7d5257b293bfc409c0
+"fs-mkdirp-stream@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "fs-mkdirp-stream@npm:2.0.1"
+  dependencies:
+    graceful-fs: ^4.2.8
+    streamx: ^2.12.0
+  checksum: 9fefd9fa3d6985aea0935944288bd20215779f683ec3af3c157cf4d4d4b0c546caae8219219f47a05a1df3b23f6a605fe64bee6ee14e550f1a670db67359ff27
+  languageName: node
+  linkType: hard
+
+"fs-monkey@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "fs-monkey@npm:1.0.5"
+  checksum: 424b67f65b37fe66117ae2bb061f790fe6d4b609e1d160487c74b3d69fbf42f262c665ccfba32e8b5f113f96f92e9a58fcdebe42d5f6649bdfc72918093a3119
   languageName: node
   linkType: hard
 
@@ -10331,19 +9704,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.1":
-  version: 2.3.2
-  resolution: "fsevents@npm:2.3.2"
+"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
   dependencies:
     node-gyp: latest
-  checksum: 97ade64e75091afee5265e6956cb72ba34db7819b4c3e94c431d4be2b19b8bb7a2d4116da417950c3425f17c8fe693d25e20212cac583ac1521ad066b77ae31f
+  checksum: 11e6ea6fea15e42461fc55b4b0e4a0a3c654faa567f1877dbd353f39156f69def97a69936d1746619d656c4b93de2238bf731f6085a03a50cabf287c9d024317
   conditions: os=darwin
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.1#~builtin<compat/fsevents>":
-  version: 2.3.2
-  resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
+"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=18f3a7"
   dependencies:
     node-gyp: latest
   conditions: os=darwin
@@ -10351,28 +9724,28 @@ dexie@latest:
   linkType: hard
 
 "function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "function.prototype.name@npm:1.1.5"
+"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    es-abstract: ^1.19.0
-    functions-have-names: ^1.2.2
-  checksum: acd21d733a9b649c2c442f067567743214af5fa248dbeee69d8278ce7df3329ea5abac572be9f7470b4ec1cd4d8f1040e3c5caccf98ebf2bf861a0deab735c27
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    functions-have-names: ^1.2.3
+  checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479
   languageName: node
   linkType: hard
 
-"functions-have-names@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "functions-have-names@npm:1.2.2"
-  checksum: 25f44b6d1c41ac86ffdf41f25d1de81c0a5b4a3fcf4307a33cdfb23b9d4bd5d0d8bf312eaef5ad368c6500c8a9e19f692b8ce9f96aaab99db9dd936554165558
+"functions-have-names@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "functions-have-names@npm:1.2.3"
+  checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5
   languageName: node
   linkType: hard
 
@@ -10423,10 +9796,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"gensequence@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "gensequence@npm:5.0.2"
-  checksum: b94af8d6591bbf5bc568813f31efbc5bfca010d83bce2a6c82dcf4211f56be8e13df956b239fecb1d7492bf02218e3d36dbc47e6f872df256312a507ae9ccd25
+"gensequence@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "gensequence@npm:6.0.0"
+  checksum: 7c23404b227647cb033a2c6cf5a5266442409e9dcc6bc140565d28de64adfa03dc474119ae14d776dc177fe63d605d2f4b228fa3bf926145dddd68c8df95d029
   languageName: node
   linkType: hard
 
@@ -10451,14 +9824,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "get-intrinsic@npm:1.1.3"
+"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "get-intrinsic@npm:1.2.1"
   dependencies:
     function-bind: ^1.1.1
     has: ^1.0.3
+    has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 152d79e87251d536cf880ba75cfc3d6c6c50e12b3a64e1ea960e73a3752b47c69f46034456eae1b0894359ce3bc64c55c186f2811f8a788b75b638b06fab228a
+  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
   languageName: node
   linkType: hard
 
@@ -10476,10 +9850,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"get-stdin@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "get-stdin@npm:8.0.0"
-  checksum: 40128b6cd25781ddbd233344f1a1e4006d4284906191ed0a7d55ec2c1a3e44d650f280b2c9eeab79c03ac3037da80257476c0e4e5af38ddfb902d6ff06282d77
+"get-stdin@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "get-stdin@npm:9.0.0"
+  checksum: 5972bc34d05932b45512c8e2d67b040f1c1ca8afb95c56cbc480985f2d761b7e37fe90dc8abd22527f062cc5639a6930ff346e9952ae4c11a2d4275869459594
   languageName: node
   linkType: hard
 
@@ -10490,6 +9864,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"get-stream@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "get-stream@npm:8.0.1"
+  checksum: 01e3d3cf29e1393f05f44d2f00445c5f9ec3d1c49e8179b31795484b9c117f4c695e5e07b88b50785d5c8248a788c85d9913a79266fc77e3ef11f78f10f1b974
+  languageName: node
+  linkType: hard
+
 "get-symbol-description@npm:^1.0.0":
   version: 1.0.0
   resolution: "get-symbol-description@npm:1.0.0"
@@ -10501,19 +9882,21 @@ dexie@latest:
   linkType: hard
 
 "get-tsconfig@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "get-tsconfig@npm:4.5.0"
-  checksum: 687ee2bd69a5a07db2e2edeb4d6c41c3debb38f6281a66beb643e3f5b520252e27fcbbb5702bdd9a5f05dcf8c1d2e0150a4d8a960ad75cbdea74e06a51e91b02
+  version: 4.7.2
+  resolution: "get-tsconfig@npm:4.7.2"
+  dependencies:
+    resolve-pkg-maps: ^1.0.0
+  checksum: 172358903250eff0103943f816e8a4e51d29b8e5449058bdf7266714a908a48239f6884308bd3a6ff28b09f692b9533dbebfd183ab63e4e14f073cda91f1bca9
   languageName: node
   linkType: hard
 
-"gifwrap@npm:^0.9.2":
-  version: 0.9.4
-  resolution: "gifwrap@npm:0.9.4"
+"gifwrap@npm:^0.10.1":
+  version: 0.10.1
+  resolution: "gifwrap@npm:0.10.1"
   dependencies:
     image-q: ^4.0.0
     omggif: ^1.0.10
-  checksum: f06d74d72d5fd5cfef78935471da06334c23305328fcaa5b1740c6c93b7ce7f775c28e75e166ecb4d7bc9848f767d4d191c8e18a74187543076a44123002f918
+  checksum: eac8cb4b9657b284ebce935ab541c5a2acbb0bdd062ca6ae900169ff2d48d0dec0f903940eafa639a849c9d4f43c0317422b57a1b50dc3a86aab4e634c6b4258
   languageName: node
   linkType: hard
 
@@ -10533,16 +9916,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"glob-parent@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "glob-parent@npm:3.1.0"
-  dependencies:
-    is-glob: ^3.1.0
-    path-dirname: ^1.0.0
-  checksum: 653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855
-  languageName: node
-  linkType: hard
-
 "glob-parent@npm:^5.1.2":
   version: 5.1.2
   resolution: "glob-parent@npm:5.1.2"
@@ -10561,21 +9934,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"glob-stream@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "glob-stream@npm:6.1.0"
+"glob-stream@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "glob-stream@npm:8.0.0"
   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
-  checksum: 7c9ec7be266974186b762ad686813025868067f2ea64a0428c0365b4046cb955d328b1e7498124392ec0026c5826ce2cfa4b41614584fb63edd02421e61db556
+    normalize-path: ^3.0.0
+    streamx: ^2.12.5
+  checksum: 5cd976d0964143f4ca65db5ae0e63865b3fd0c6bf2015c14f4cf08f56b8c9730c5437c35f02b41bb57560d9d1aee52168597a7a8b018a85dec99d59a073339e2
   languageName: node
   linkType: hard
 
@@ -10586,21 +9957,36 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"glob@npm:^7.0.5, glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
-  version: 7.2.0
-  resolution: "glob@npm:7.2.0"
+"glob@npm:^10.2.2, glob@npm:^10.3.4":
+  version: 10.3.10
+  resolution: "glob@npm:10.3.10"
+  dependencies:
+    foreground-child: ^3.1.0
+    jackspeak: ^2.3.5
+    minimatch: ^9.0.1
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+    path-scurry: ^1.10.1
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
+  languageName: node
+  linkType: hard
+
+"glob@npm:^7.0.5, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
   dependencies:
     fs.realpath: ^1.0.0
     inflight: ^1.0.4
     inherits: 2
-    minimatch: ^3.0.4
+    minimatch: ^3.1.1
     once: ^1.3.0
     path-is-absolute: ^1.0.0
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
   languageName: node
   linkType: hard
 
-"glob@npm:^8.0.0, glob@npm:^8.0.1":
+"glob@npm:^8.0.0":
   version: 8.1.0
   resolution: "glob@npm:8.1.0"
   dependencies:
@@ -10613,24 +9999,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"glob@npm:^9.3.1":
-  version: 9.3.2
-  resolution: "glob@npm:9.3.2"
-  dependencies:
-    fs.realpath: ^1.0.0
-    minimatch: ^7.4.1
-    minipass: ^4.2.4
-    path-scurry: ^1.6.1
-  checksum: f3d188e9f70e24fa729a63ca197bcdb36d838677abec1fb9bbfe4b7620063bf90dc0f8d195203d632abfdfa049fad0edf22f93c60076de67cef20c23bcbfaee8
-  languageName: node
-  linkType: hard
-
-"global-dirs@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "global-dirs@npm:0.1.1"
+"global-dirs@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "global-dirs@npm:3.0.1"
   dependencies:
-    ini: ^1.3.4
-  checksum: 10624f5a8ddb8634c22804c6b24f93fb591c3639a6bc78e3584e01a238fc6f7b7965824184e57d63f6df36980b6c191484ad7bc6c35a1599b8f1d64be64c2a4a
+    ini: 2.0.0
+  checksum: 70147b80261601fd40ac02a104581432325c1c47329706acd773f3a6ce99bb36d1d996038c85ccacd482ad22258ec233c586b6a91535b1a116b89663d49d6438
   languageName: node
   linkType: hard
 
@@ -10694,22 +10068,24 @@ dexie@latest:
   linkType: hard
 
 "globals@npm:^13.19.0":
-  version: 13.19.0
-  resolution: "globals@npm:13.19.0"
+  version: 13.23.0
+  resolution: "globals@npm:13.23.0"
   dependencies:
     type-fest: ^0.20.2
-  checksum: a000dbd00bcf28f0941d8a29c3522b1c3b8e4bfe4e60e262c477a550c3cbbe8dbe2925a6905f037acd40f9a93c039242e1f7079c76b0fd184bc41dcc3b5c8e2e
+  checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3
   languageName: node
   linkType: hard
 
-"globalyzer@npm:0.1.0":
-  version: 0.1.0
-  resolution: "globalyzer@npm:0.1.0"
-  checksum: 419a0f95ba542534fac0842964d31b3dc2936a479b2b1a8a62bad7e8b61054faa9b0a06ad9f2e12593396b9b2621cac93358d9b3071d33723fb1778608d358a1
+"globalthis@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "globalthis@npm:1.0.3"
+  dependencies:
+    define-properties: ^1.1.3
+  checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.4, globby@npm:^11.1.0":
+"globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -10723,16 +10099,16 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"globby@npm:^13.1.1, globby@npm:^13.1.3":
-  version: 13.1.3
-  resolution: "globby@npm:13.1.3"
+"globby@npm:^13.1.1":
+  version: 13.2.2
+  resolution: "globby@npm:13.2.2"
   dependencies:
     dir-glob: ^3.0.1
-    fast-glob: ^3.2.11
-    ignore: ^5.2.0
+    fast-glob: ^3.3.0
+    ignore: ^5.2.4
     merge2: ^1.4.1
     slash: ^4.0.0
-  checksum: 93f06e02002cdf368f7e3d55bd59e7b00784c7cc8fe92c7ee5082cc7171ff6109fda45e1c97a80bb48bc811dedaf7843c7c9186f5f84bde4883ab630e13c43df
+  checksum: f3d84ced58a901b4fcc29c846983108c426631fe47e94872868b65565495f7bee7b3defd68923bd480582771fd4bbe819217803a164a618ad76f1d22f666f41e
   languageName: node
   linkType: hard
 
@@ -10743,13 +10119,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"globrex@npm:^0.1.2":
-  version: 0.1.2
-  resolution: "globrex@npm:0.1.2"
-  checksum: adca162494a176ce9ecf4dd232f7b802956bb1966b37f60c15e49d2e7d961b66c60826366dc2649093cad5a0d69970cfa8875bd1695b5a1a2f33dcd2aa88da3c
-  languageName: node
-  linkType: hard
-
 "gopd@npm:^1.0.1":
   version: 1.0.1
   resolution: "gopd@npm:1.0.1"
@@ -10759,17 +10128,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
-  languageName: node
-  linkType: hard
-
-"grapheme-splitter@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "grapheme-splitter@npm:1.0.4"
-  checksum: 0c22ec54dee1b05cd480f78cf14f732cb5b108edc073572c4ec205df4cd63f30f8db8025afc5debc8835a8ddeacf648a1c7992fe3dcd6ad38f9a476d84906620
+"graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.4, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.8, graceful-fs@npm:^4.2.9":
+  version: 4.2.11
+  resolution: "graceful-fs@npm:4.2.11"
+  checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
   languageName: node
   linkType: hard
 
@@ -10796,7 +10158,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"has-bigints@npm:^1.0.2":
+"has-bigints@npm:^1.0.1, has-bigints@npm:^1.0.2":
   version: 1.0.2
   resolution: "has-bigints@npm:1.0.2"
   checksum: 390e31e7be7e5c6fe68b81babb73dfc35d413604d7ee5f56da101417027a4b4ce6a27e46eff97ad040c835b5d228676eae99a9b5c3bc0e23c8e81a49241ff45b
@@ -10842,7 +10204,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
+"has-proto@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "has-proto@npm:1.0.1"
+  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  languageName: node
+  linkType: hard
+
+"has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3":
   version: 1.0.3
   resolution: "has-symbols@npm:1.0.3"
   checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410
@@ -10866,11 +10235,9 @@ dexie@latest:
   linkType: hard
 
 "has@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "has@npm:1.0.3"
-  dependencies:
-    function-bind: ^1.1.1
-  checksum: b9ad53d53be4af90ce5d1c38331e712522417d017d5ef1ebd0507e07c2fbad8686fffb8e12ddecd4c39ca9b9b47431afbb975b8abf7f3c3b82c98e9aad052792
+  version: 1.0.4
+  resolution: "has@npm:1.0.4"
+  checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550
   languageName: node
   linkType: hard
 
@@ -10893,17 +10260,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"highlight.js@npm:*":
-  version: 11.7.0
-  resolution: "highlight.js@npm:11.7.0"
-  checksum: 19e3fb8b56f4b361b057a8523b989dfeb6479bbd1e29cec3fac6fa5c78d09927d5fa61b7dba6631fdb57cfdca9b3084aa4da49405ceaf4a67f67beae2ed5b77d
-  languageName: node
-  linkType: hard
-
-"highlight.js@npm:11.8.0":
-  version: 11.8.0
-  resolution: "highlight.js@npm:11.8.0"
-  checksum: d2578a57aee7315946ff19379053fd0a28b127baabf7617ab1d28d62cdc4eaf3d75053569cb8479a5afdc7a68f1ba9a6c1d612d8ae399b4b9aa43093b4fb6831
+"highlight.js@npm:11.9.0":
+  version: 11.9.0
+  resolution: "highlight.js@npm:11.9.0"
+  checksum: 4043d31c5de9d27d13387d9a9e5e1939557254b7b85f0fab85d9cae0e420e131a3456ebf6148552020a1d8a216d671d583f2433d6c4de6179b8a66487a8325cb
   languageName: node
   linkType: hard
 
@@ -10932,12 +10292,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^3.0.6":
-  version: 3.0.8
-  resolution: "hosted-git-info@npm:3.0.8"
+"hosted-git-info@npm:^4.0.1":
+  version: 4.1.0
+  resolution: "hosted-git-info@npm:4.1.0"
   dependencies:
     lru-cache: ^6.0.0
-  checksum: 5af7a69581acb84206a7b8e009f4680c36396814e92c8a83973dfb3b87e44e44d1f7b8eaf3e4a953686482770ecb78406a4ce4666bfdfe447762434127871d8d
+  checksum: c3f87b3c2f7eb8c2748c8f49c0c2517c9a95f35d26f4bf54b2a8cba05d2e668f3753548b6ea366b18ec8dadb4e12066e19fa382a01496b0ffa0497eb23cbe461
   languageName: node
   linkType: hard
 
@@ -10951,9 +10311,9 @@ dexie@latest:
   linkType: hard
 
 "html-entities@npm:^2.1.0":
-  version: 2.3.2
-  resolution: "html-entities@npm:2.3.2"
-  checksum: 522d8d202df301ff51b517a379e642023ed5c81ea9fb5674ffad88cff386165733d00b6089d5c2fcc644e44777d6072017b6216d8fa40f271d3610420d00a886
+  version: 2.4.0
+  resolution: "html-entities@npm:2.4.0"
+  checksum: 25bea32642ce9ebd0eedc4d24381883ecb0335ccb8ac26379a0958b9b16652fdbaa725d70207ce54a51db24103436a698a8e454397d3ba8ad81460224751f1dc
   languageName: node
   linkType: hard
 
@@ -10981,10 +10341,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"html-tags@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "html-tags@npm:3.2.0"
-  checksum: a0c9e96ac26c84adad9cc66d15d6711a17f60acda8d987218f1d4cbaacd52864939b230e635cce5a1179f3ddab2a12b9231355617dfbae7945fcfec5e96d2041
+"html-tags@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "html-tags@npm:3.3.1"
+  checksum: b4ef1d5a76b678e43cce46e3783d563607b1d550cab30b4f511211564574770aa8c658a400b100e588bc60b8234e59b35ff72c7851cc28f3b5403b13a2c6cbce
   languageName: node
   linkType: hard
 
@@ -11015,7 +10375,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"http-cache-semantics@npm:^4.1.0":
+"http-cache-semantics@npm:^4.1.1":
   version: 4.1.1
   resolution: "http-cache-semantics@npm:4.1.1"
   checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236
@@ -11033,10 +10393,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"http-status-codes@npm:2.2.0":
-  version: 2.2.0
-  resolution: "http-status-codes@npm:2.2.0"
-  checksum: 31e1d730856210445da0907d9b484629e69e4fe92ac032478a7aa4d89e5b215e2b4e75d7ebce40d0537b6850bd281b2f65c7cc36cc2677e5de056d6cea1045ce
+"http-status-codes@npm:2.3.0":
+  version: 2.3.0
+  resolution: "http-status-codes@npm:2.3.0"
+  checksum: dae3b99e0155441b6df28e8265ff27c56a45f82c6092f736414233e9ccf063d5ea93c1e1279e8b499c4642e2538b37995c76b1640ed3f615d0e2883d3a1dcfd5
   languageName: node
   linkType: hard
 
@@ -11058,9 +10418,16 @@ dexie@latest:
   linkType: hard
 
 "human-signals@npm:^4.3.0":
-  version: 4.3.0
-  resolution: "human-signals@npm:4.3.0"
-  checksum: 662b976b1063a8afb8fd7fa50bde6975997e17ea6ceba2aad54aacf1dc239a2cd7d14d27b3ceca0c6288627f4b45c56c2c89618455ff52cd9377c02d6328cd7c
+  version: 4.3.1
+  resolution: "human-signals@npm:4.3.1"
+  checksum: 6f12958df3f21b6fdaf02d90896c271df00636a31e2bbea05bddf817a35c66b38a6fdac5863e2df85bd52f34958997f1f50350ff97249e1dff8452865d5235d1
+  languageName: node
+  linkType: hard
+
+"human-signals@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "human-signals@npm:5.0.0"
+  checksum: 6504560d5ed91444f16bea3bd9dfc66110a339442084e56c3e7fa7bbdf3f406426d6563d662bdce67064b165eac31eeabfc0857ed170aaa612cf14ec9f9a464c
   languageName: node
   linkType: hard
 
@@ -11073,21 +10440,20 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"husky@npm:7.0.4":
-  version: 7.0.4
-  resolution: "husky@npm:7.0.4"
+"husky@npm:8.0.3":
+  version: 8.0.3
+  resolution: "husky@npm:8.0.3"
   bin:
     husky: lib/bin.js
-  checksum: c6ec4af63da2c9522da8674a20ad9b48362cc92704896cc8a58c6a2a39d797feb2b806f93fbd83a6d653fbdceb2c3b6e0b602c6b2e8565206ffc2882ef7db9e9
+  checksum: 837bc7e4413e58c1f2946d38fb050f5d7324c6f16b0fd66411ffce5703b294bd21429e8ba58711cd331951ee86ed529c5be4f76805959ff668a337dbfa82a1b0
   languageName: node
   linkType: hard
 
-"i18next-scanner@npm:4.2.0":
-  version: 4.2.0
-  resolution: "i18next-scanner@npm:4.2.0"
+"i18next-scanner@npm:4.4.0":
+  version: 4.4.0
+  resolution: "i18next-scanner@npm:4.4.0"
   dependencies:
     acorn: ^8.0.4
-    acorn-dynamic-import: ^4.0.0
     acorn-jsx: ^5.3.1
     acorn-stage3: ^4.0.0
     acorn-walk: ^8.0.0
@@ -11104,24 +10470,24 @@ dexie@latest:
     parse5: ^6.0.0
     sortobject: ^4.0.0
     through2: ^4.0.0
-    vinyl: ^2.2.0
-    vinyl-fs: ^3.0.1
+    vinyl: ^3.0.0
+    vinyl-fs: ^4.0.0
   bin:
     i18next-scanner: bin/cli.js
-  checksum: 8c199fe7529171a03f1b71d0e964c65f9d6baf0c971a4f11f4545fa13fd09f5ef4788131afe1ed166a90c8771e75ea6a9b1966b3bdaa87f7d5800dbfe5c9e34c
+  checksum: bebbfa7aa4a60144425926304279ec3f0a714a74f50b30283badf1798177d6e6215aec4ef29bd351b47b291541981b7d2605b6b2e043284d3254ae517cb95241
   languageName: node
   linkType: hard
 
 "i18next@npm:*":
-  version: 19.8.4
-  resolution: "i18next@npm:19.8.4"
+  version: 23.5.1
+  resolution: "i18next@npm:23.5.1"
   dependencies:
-    "@babel/runtime": ^7.12.0
-  checksum: 49707e82681984ccc96eb29e0b85e29609a434f04d51e730f649448036b613994b3f4a14b113a20e128a4441bce2b4be683529a400bce8124f8c50b5557a49e6
+    "@babel/runtime": ^7.22.5
+  checksum: 4be043bd72287bfae9777a3252b9458d2e3f5e9a97ea62cf434e6e3767b45df4365d8780d0dd14efd4e9da5eb0f90534510b138f1372d1cb9012000a69bbedaf
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2":
+"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -11153,10 +10519,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"ignore@npm:^5.2.0, ignore@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "ignore@npm:5.2.1"
-  checksum: 7251d00cba49fe88c4f3565fadeb4aa726ba38294a9a79ffed542edc47bafd989d4b2ccf65700c5b1b26a1e91dfc7218fb23017937c79216025d5caeec0ee9d5
+"ignore@npm:^5.2.0, ignore@npm:^5.2.4":
+  version: 5.2.4
+  resolution: "ignore@npm:5.2.4"
+  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
   languageName: node
   linkType: hard
 
@@ -11185,7 +10551,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"import-fresh@npm:^3.0.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
+"import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
   dependencies:
@@ -11203,21 +10569,21 @@ dexie@latest:
   linkType: hard
 
 "import-local@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "import-local@npm:3.0.2"
+  version: 3.1.0
+  resolution: "import-local@npm:3.1.0"
   dependencies:
     pkg-dir: ^4.2.0
     resolve-cwd: ^3.0.0
   bin:
     import-local-fixture: fixtures/cli.js
-  checksum: c74d9f9484c878cda1de3434613c7ff72d5dadcf20e5482542232d7c2575b713ff88701d6675fcf09a3684cb23fb407c8b333b9cbc59438712723d058d8e976c
+  checksum: bfcdb63b5e3c0e245e347f3107564035b128a414c4da1172a20dc67db2504e05ede4ac2eee1252359f78b0bfd7b19ef180aec427c2fce6493ae782d73a04cddd
   languageName: node
   linkType: hard
 
-"import-meta-resolve@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "import-meta-resolve@npm:2.2.2"
-  checksum: 3a5910a6f914b5f06b307d7d1c25710bc56f12e21e923d5b2180dd0d53c6c2d51e7b55df26f168b63f5670babcaca9422b7a9429e877bbb8c1997d79bd65882b
+"import-meta-resolve@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "import-meta-resolve@npm:3.0.0"
+  checksum: d0428cd14915ee0093b995dc5bbc70bd01cc668822f52b62af98f728e5d6a08724f07e6aa9f5fae002d5eecbf6ec2cdcd379bf4869dd1b353bd080693f91e394
   languageName: node
   linkType: hard
 
@@ -11235,10 +10601,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"infer-owner@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "infer-owner@npm:1.0.4"
-  checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89
+"indent-string@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "indent-string@npm:5.0.0"
+  checksum: e466c27b6373440e6d84fbc19e750219ce25865cb82d578e41a6053d727e5520dc5725217d6eb1cc76005a1bb1696a0f106d84ce7ebda3033b963a38583fb3b3
   languageName: node
   linkType: hard
 
@@ -11252,13 +10618,20 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3":
+"inherits@npm:2, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
   languageName: node
   linkType: hard
 
+"ini@npm:2.0.0":
+  version: 2.0.0
+  resolution: "ini@npm:2.0.0"
+  checksum: e7aadc5fb2e4aefc666d74ee2160c073995a4061556b1b5b4241ecb19ad609243b9cceafe91bae49c219519394bbd31512516cb22a3b1ca6e66d869e0447e84e
+  languageName: node
+  linkType: hard
+
 "ini@npm:^1.3.4, ini@npm:^1.3.5":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
@@ -11266,14 +10639,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "internal-slot@npm:1.0.4"
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "internal-slot@npm:1.0.5"
   dependencies:
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.0
     has: ^1.0.3
     side-channel: ^1.0.4
-  checksum: 8974588d06bab4f675573a3b52975370facf6486df51bc0567a982c7024fa29495f10b76c0d4dc742dd951d1b72024fdc1e31bb0bedf1678dc7aacacaf5a4f73
+  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
   languageName: node
   linkType: hard
 
@@ -11291,15 +10664,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"intl-messageformat@npm:10.5.0":
-  version: 10.5.0
-  resolution: "intl-messageformat@npm:10.5.0"
+"intl-messageformat@npm:10.5.4":
+  version: 10.5.4
+  resolution: "intl-messageformat@npm:10.5.4"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
+    "@formatjs/ecma402-abstract": 1.17.2
     "@formatjs/fast-memoize": 2.2.0
-    "@formatjs/icu-messageformat-parser": 2.6.0
+    "@formatjs/icu-messageformat-parser": 2.7.0
     tslib: ^2.4.0
-  checksum: 164c49028b8bf2685f57f8f018d9a2c1d827e94b1c300ebf9df50b6aef25adedb3bf511b3cf603364d67257634b57926935066b2f3715ccb6c2af683cc0815a6
+  checksum: 1ac36b37134c435956762b5e9078314bb1d999992253c7ec884d135bf94eea160a3feede9d3c61c3b8a3016ca1553ba3fa3132bf95be4400c59ea95cb85a5ad6
   languageName: node
   linkType: hard
 
@@ -11317,6 +10690,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"ipaddr.js@npm:^2.0.1":
+  version: 2.1.0
+  resolution: "ipaddr.js@npm:2.1.0"
+  checksum: 807a054f2bd720c4d97ee479d6c9e865c233bea21f139fb8dabd5a35c4226d2621c42e07b4ad94ff3f82add926a607d8d9d37c625ad0319f0e08f9f2bd1968e2
+  languageName: node
+  linkType: hard
+
 "is-absolute@npm:^0.2.5":
   version: 0.2.6
   resolution: "is-absolute@npm:0.2.6"
@@ -11327,16 +10707,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-absolute@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-absolute@npm:1.0.0"
-  dependencies:
-    is-relative: ^1.0.0
-    is-windows: ^1.0.1
-  checksum: 9d16b2605eda3f3ce755410f1d423e327ad3a898bcb86c9354cf63970ed3f91ba85e9828aa56f5d6a952b9fae43d0477770f78d37409ae8ecc31e59ebc279b27
-  languageName: node
-  linkType: hard
-
 "is-accessor-descriptor@npm:^0.1.6":
   version: 0.1.6
   resolution: "is-accessor-descriptor@npm:0.1.6"
@@ -11356,14 +10726,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "is-array-buffer@npm:3.0.1"
+"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "is-array-buffer@npm:3.0.2"
   dependencies:
     call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
+    get-intrinsic: ^1.2.0
     is-typed-array: ^1.1.10
-  checksum: f26ab87448e698285daf707e52a533920449f7abf63714140ffab9d5571aa5a71ac2fa2677e8b793ad0d5d3e40078d4d2c8a0ab39c957e3cfc6513bb6c9dfdc9
+  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
   languageName: node
   linkType: hard
 
@@ -11381,19 +10751,31 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-bigint@npm:1.0.1"
-  checksum: 04aa6fde59d2b7929df865acb89c8d7f89f919cc149b8be11e3560b1aab8667e5d939cc8954097c496f7dda80fd5bb67f829ca80ab66cc68918e41e2c1b9c5d7
+  version: 1.0.4
+  resolution: "is-bigint@npm:1.0.4"
+  dependencies:
+    has-bigints: ^1.0.1
+  checksum: c56edfe09b1154f8668e53ebe8252b6f185ee852a50f9b41e8d921cb2bed425652049fbe438723f6cb48a63ca1aa051e948e7e401e093477c99c84eba244f666
   languageName: node
   linkType: hard
 
 "is-boolean-object@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "is-boolean-object@npm:1.1.0"
+  version: 1.1.2
+  resolution: "is-boolean-object@npm:1.1.2"
   dependencies:
-    call-bind: ^1.0.0
-  checksum: 3ead0446176ee42a69f87658bf12d53c135095336d34765fa65f137f378ea125429bf777f91f6dd3407db80829d742bc4fb2fdaf8d2cf6ba82a2de2a07fbbac7
+    call-bind: ^1.0.2
+    has-tostringtag: ^1.0.0
+  checksum: c03b23dbaacadc18940defb12c1c0e3aaece7553ef58b162a0f6bba0c2a7e1551b59f365b91e00d2dbac0522392d576ef322628cb1d036a0fe51eb466db67222
   languageName: node
   linkType: hard
 
@@ -11404,6 +10786,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"is-builtin-module@npm:^3.2.1":
+  version: 3.2.1
+  resolution: "is-builtin-module@npm:3.2.1"
+  dependencies:
+    builtin-modules: ^3.3.0
+  checksum: e8f0ffc19a98240bda9c7ada84d846486365af88d14616e737d280d378695c8c448a621dcafc8332dbf0fcd0a17b0763b845400709963fa9151ddffece90ae88
+  languageName: node
+  linkType: hard
+
 "is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7":
   version: 1.2.7
   resolution: "is-callable@npm:1.2.7"
@@ -11411,12 +10802,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.9.0":
-  version: 2.11.0
-  resolution: "is-core-module@npm:2.11.0"
+"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0":
+  version: 2.13.0
+  resolution: "is-core-module@npm:2.13.0"
   dependencies:
     has: ^1.0.3
-  checksum: f96fd490c6b48eb4f6d10ba815c6ef13f410b0ba6f7eb8577af51697de523e5f2cd9de1c441b51d27251bf0e4aebc936545e33a5d26d5d51f28d25698d4a8bab
+  checksum: 053ab101fb390bfeb2333360fd131387bed54e476b26860dc7f5a700bbf34a0ec4454f7c8c4d43e8a0030957e4b3db6e16d35e1890ea6fb654c833095e040355
   languageName: node
   linkType: hard
 
@@ -11449,7 +10840,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-docker@npm:^2.0.0, is-docker@npm:^2.1.1":
+"is-docker@npm:^2.0.0":
   version: 2.2.1
   resolution: "is-docker@npm:2.2.1"
   bin:
@@ -11458,6 +10849,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"is-docker@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-docker@npm:3.0.0"
+  bin:
+    is-docker: cli.js
+  checksum: b698118f04feb7eaf3338922bd79cba064ea54a1c3db6ec8c0c8d8ee7613e7e5854d802d3ef646812a8a3ace81182a085dfa0a71cc68b06f3fa794b9783b3c90
+  languageName: node
+  linkType: hard
+
 "is-extendable@npm:^0.1.0":
   version: 0.1.1
   resolution: "is-extendable@npm:0.1.1"
@@ -11472,13 +10872,22 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
+"is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
   checksum: df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+  languageName: node
+  linkType: hard
+
 "is-fullwidth-code-point@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-fullwidth-code-point@npm:1.0.0"
@@ -11516,6 +10925,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"is-generator-function@npm:^1.0.10":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
+  languageName: node
+  linkType: hard
+
 "is-glob@npm:^2.0.0, is-glob@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-glob@npm:2.0.1"
@@ -11525,15 +10943,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-glob@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "is-glob@npm:3.1.0"
-  dependencies:
-    is-extglob: ^2.1.0
-  checksum: 9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc
-  languageName: node
-  linkType: hard
-
 "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
@@ -11543,6 +10952,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"is-inside-container@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-inside-container@npm:1.0.0"
+  dependencies:
+    is-docker: ^3.0.0
+  bin:
+    is-inside-container: cli.js
+  checksum: c50b75a2ab66ab3e8b92b3bc534e1ea72ca25766832c0623ac22d134116a98bcf012197d1caabe1d1c4bd5f84363d4aa5c36bb4b585fbcaf57be172cd10a1a03
+  languageName: node
+  linkType: hard
+
 "is-interactive@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-interactive@npm:1.0.0"
@@ -11586,9 +11006,11 @@ dexie@latest:
   linkType: hard
 
 "is-number-object@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "is-number-object@npm:1.0.4"
-  checksum: d8e4525b5c151f1830872bf217901b58b3a9f66d93fe2f71c2087418e03d7f5c19a3ad64afa0feb70dafd93f7b97e205e3520a8ff007be665e54b377f5b736a8
+  version: 1.0.7
+  resolution: "is-number-object@npm:1.0.7"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d1e8d01bb0a7134c74649c4e62da0c6118a0bfc6771ea3c560914d52a627873e6920dd0fd0ebc0e12ad2ff4687eac4c308f7e80320b973b2c8a2c8f97a7524f7
   languageName: node
   linkType: hard
 
@@ -11676,15 +11098,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-relative@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-relative@npm:1.0.0"
-  dependencies:
-    is-unc-path: ^1.0.0
-  checksum: 3271a0df109302ef5e14a29dcd5d23d9788e15ade91a40b942b035827ffbb59f7ce9ff82d036ea798541a52913cbf9d2d0b66456340887b51f3542d57b5a4c05
-  languageName: node
-  linkType: hard
-
 "is-retry-allowed@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-retry-allowed@npm:2.2.0"
@@ -11709,9 +11122,9 @@ dexie@latest:
   linkType: hard
 
 "is-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-stream@npm:2.0.0"
-  checksum: 4dc47738e26bc4f1b3be9070b6b9e39631144f204fc6f87db56961220add87c10a999ba26cf81699f9ef9610426f69cb08a4713feff8deb7d8cadac907826935
+  version: 2.0.1
+  resolution: "is-stream@npm:2.0.1"
+  checksum: b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
   languageName: node
   linkType: hard
 
@@ -11732,24 +11145,20 @@ dexie@latest:
   linkType: hard
 
 "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "is-symbol@npm:1.0.3"
+  version: 1.0.4
+  resolution: "is-symbol@npm:1.0.4"
   dependencies:
-    has-symbols: ^1.0.1
-  checksum: c6d54bd01218fa202da8ce91525ca41a907819be5f000df9ab9621467e087eb36f34b2dbfa51a2a699a282e860681ffa6a787d69e944ba99a46d3df553ff2798
+    has-symbols: ^1.0.2
+  checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10":
-  version: 1.1.10
-  resolution: "is-typed-array@npm:1.1.10"
+"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9":
+  version: 1.1.12
+  resolution: "is-typed-array@npm:1.1.12"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    for-each: ^0.3.3
-    gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: aac6ecb59d4c56a1cdeb69b1f129154ef462bbffe434cb8a8235ca89b42f258b7ae94073c41b3cb7bce37f6a1733ad4499f07882d5d5093a7ba84dfc4ebb8017
+    which-typed-array: ^1.1.11
+  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
   languageName: node
   linkType: hard
 
@@ -11769,15 +11178,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-unc-path@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-unc-path@npm:1.0.0"
-  dependencies:
-    unc-path-regex: ^0.1.2
-  checksum: e8abfde203f7409f5b03a5f1f8636e3a41e78b983702ef49d9343eb608cdfe691429398e8815157519b987b739bcfbc73ae7cf4c8582b0ab66add5171088eab6
-  languageName: node
-  linkType: hard
-
 "is-unicode-supported@npm:^0.1.0":
   version: 0.1.0
   resolution: "is-unicode-supported@npm:0.1.0"
@@ -11785,7 +11185,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-utf8@npm:^0.2.0, is-utf8@npm:^0.2.1":
+"is-utf8@npm:^0.2.0":
   version: 0.2.1
   resolution: "is-utf8@npm:0.2.1"
   checksum: 167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3
@@ -11832,10 +11232,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-what@npm:^3.7.1":
-  version: 3.12.0
-  resolution: "is-what@npm:3.12.0"
-  checksum: 912444cd0806f6c0bc215a2c1ecbff34b4b59fd582ed553f1000da587689a29d20644361053d4dd608a9a149b34a04238274e1b60d81f6e5106d7d42b7f54908
+"is-what@npm:^3.14.1":
+  version: 3.14.1
+  resolution: "is-what@npm:3.14.1"
+  checksum: a9a6ce92d33799f1ae0916c7afb6f8128a23ce9d28bd69d9ec3ec88910e7a1f68432e6236c3c8a4d544cf0b864675e5d828437efde60ee0cf8102061d395c1df
   languageName: node
   linkType: hard
 
@@ -11846,13 +11246,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"is-windows@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "is-windows@npm:1.0.2"
-  checksum: 438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7
-  languageName: node
-  linkType: hard
-
 "is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -11923,128 +11316,167 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"istanbul-lib-instrument@npm:^5.0.4, istanbul-lib-instrument@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "istanbul-lib-instrument@npm:5.1.0"
+"istanbul-lib-instrument@npm:^5.0.4":
+  version: 5.2.1
+  resolution: "istanbul-lib-instrument@npm:5.2.1"
   dependencies:
     "@babel/core": ^7.12.3
     "@babel/parser": ^7.14.7
     "@istanbuljs/schema": ^0.1.2
     istanbul-lib-coverage: ^3.2.0
     semver: ^6.3.0
-  checksum: 8b82e733c69fe9f94d2e21f3e5760c9bedb110329aa75df4bd40df95f1cac3bf38767e43f35b125cc547ceca7376b72ce7d95cc5238b7e9088345c7b589233d3
+  checksum: bf16f1803ba5e51b28bbd49ed955a736488381e09375d830e42ddeb403855b2006f850711d95ad726f2ba3f1ae8e7366de7e51d2b9ac67dc4d80191ef7ddf272
+  languageName: node
+  linkType: hard
+
+"istanbul-lib-instrument@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "istanbul-lib-instrument@npm:6.0.1"
+  dependencies:
+    "@babel/core": ^7.12.3
+    "@babel/parser": ^7.14.7
+    "@istanbuljs/schema": ^0.1.2
+    istanbul-lib-coverage: ^3.2.0
+    semver: ^7.5.4
+  checksum: fb23472e739cfc9b027cefcd7d551d5e7ca7ff2817ae5150fab99fe42786a7f7b56a29a2aa8309c37092e18297b8003f9c274f50ca4360949094d17fbac81472
   languageName: node
   linkType: hard
 
 "istanbul-lib-report@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "istanbul-lib-report@npm:3.0.0"
+  version: 3.0.1
+  resolution: "istanbul-lib-report@npm:3.0.1"
   dependencies:
     istanbul-lib-coverage: ^3.0.0
-    make-dir: ^3.0.0
+    make-dir: ^4.0.0
     supports-color: ^7.1.0
-  checksum: 3f29eb3f53c59b987386e07fe772d24c7f58c6897f34c9d7a296f4000de7ae3de9eb95c3de3df91dc65b134c84dee35c54eee572a56243e8907c48064e34ff1b
+  checksum: fd17a1b879e7faf9bb1dc8f80b2a16e9f5b7b8498fe6ed580a618c34df0bfe53d2abd35bf8a0a00e628fb7405462576427c7df20bbe4148d19c14b431c974b21
   languageName: node
   linkType: hard
 
 "istanbul-lib-source-maps@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "istanbul-lib-source-maps@npm:4.0.0"
+  version: 4.0.1
+  resolution: "istanbul-lib-source-maps@npm:4.0.1"
   dependencies:
     debug: ^4.1.1
     istanbul-lib-coverage: ^3.0.0
     source-map: ^0.6.1
-  checksum: 292bfb4083e5f8783cdf829a7686b1a377d0c6c2119d4343c8478e948b38146c4827cddc7eee9f57605acd63c291376d67e4a84163d37c5fc78ad0f27f7e2621
+  checksum: 21ad3df45db4b81852b662b8d4161f6446cd250c1ddc70ef96a585e2e85c26ed7cd9c2a396a71533cfb981d1a645508bc9618cae431e55d01a0628e7dec62ef2
   languageName: node
   linkType: hard
 
 "istanbul-reports@npm:^3.1.3":
-  version: 3.1.3
-  resolution: "istanbul-reports@npm:3.1.3"
+  version: 3.1.6
+  resolution: "istanbul-reports@npm:3.1.6"
   dependencies:
     html-escaper: ^2.0.0
     istanbul-lib-report: ^3.0.0
-  checksum: ef6e0d9ed05ecab1974c6eb46cc2a12d8570911934192db4ed40cf1978449240ea80aae32c4dd5555b67407cdf860212d1a9e415443af69641aa57ed1da5ebbb
+  checksum: 44c4c0582f287f02341e9720997f9e82c071627e1e862895745d5f52ec72c9b9f38e1d12370015d2a71dcead794f34c7732aaef3fab80a24bc617a21c3d911d6
+  languageName: node
+  linkType: hard
+
+"iterator.prototype@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "iterator.prototype@npm:1.1.2"
+  dependencies:
+    define-properties: ^1.2.1
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    reflect.getprototypeof: ^1.0.4
+    set-function-name: ^2.0.1
+  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^2.3.5":
+  version: 2.3.6
+  resolution: "jackspeak@npm:2.3.6"
+  dependencies:
+    "@isaacs/cliui": ^8.0.2
+    "@pkgjs/parseargs": ^0.11.0
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
   languageName: node
   linkType: hard
 
 "jake@npm:^10.8.5":
-  version: 10.8.5
-  resolution: "jake@npm:10.8.5"
+  version: 10.8.7
+  resolution: "jake@npm:10.8.7"
   dependencies:
     async: ^3.2.3
     chalk: ^4.0.2
-    filelist: ^1.0.1
-    minimatch: ^3.0.4
+    filelist: ^1.0.4
+    minimatch: ^3.1.2
   bin:
-    jake: ./bin/cli.js
-  checksum: 56c913ecf5a8d74325d0af9bc17a233bad50977438d44864d925bb6c45c946e0fee8c4c1f5fe2225471ef40df5222e943047982717ebff0d624770564d3c46ba
+    jake: bin/cli.js
+  checksum: a23fd2273fb13f0d0d845502d02c791fd55ef5c6a2d207df72f72d8e1eac6d2b8ffa6caf660bc8006b3242e0daaa88a3ecc600194d72b5c6016ad56e9cd43553
   languageName: node
   linkType: hard
 
-"jest-canvas-mock@npm:2.5.1":
-  version: 2.5.1
-  resolution: "jest-canvas-mock@npm:2.5.1"
+"jest-canvas-mock@npm:2.5.2":
+  version: 2.5.2
+  resolution: "jest-canvas-mock@npm:2.5.2"
   dependencies:
     cssfontparser: ^1.2.1
     moo-color: ^1.0.2
-  checksum: b8ff56c1b7b7feb6d33b7914dbfac21f19a5a33db0bc092f0426e500e80e67df1286bf817eb780e378b648c9130d7b8ca20cd46e45520657996273a948a7c198
+  checksum: a3004d2e96473049045e49dcf98e5ea6011494048ab42b5422b3089d9ff406aaca8353e79587055d840fa145541668eb8f78613765f252ad5901a8217e91ea5d
   languageName: node
   linkType: hard
 
-"jest-changed-files@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-changed-files@npm:29.5.0"
+"jest-changed-files@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-changed-files@npm:29.7.0"
   dependencies:
     execa: ^5.0.0
+    jest-util: ^29.7.0
     p-limit: ^3.1.0
-  checksum: a67a7cb3c11f8f92bd1b7c79e84f724cbd11a9ad51f3cdadafe3ce7ee3c79ee50dbea128f920f5fddc807e9e4e83f5462143094391feedd959a77dd20ab96cf3
+  checksum: 963e203893c396c5dfc75e00a49426688efea7361b0f0e040035809cecd2d46b3c01c02be2d9e8d38b1138357d2de7719ea5b5be21f66c10f2e9685a5a73bb99
   languageName: node
   linkType: hard
 
-"jest-circus@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-circus@npm:29.5.0"
+"jest-circus@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-circus@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/expect": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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: ^0.7.0
+    dedent: ^1.0.0
     is-generator-fn: ^2.0.0
-    jest-each: ^29.5.0
-    jest-matcher-utils: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.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.5.0
+    pretty-format: ^29.7.0
     pure-rand: ^6.0.0
     slash: ^3.0.0
     stack-utils: ^2.0.3
-  checksum: 44ff5d06acedae6de6c866e20e3b61f83e29ab94cf9f960826e7e667de49c12dd9ab9dffd7fa3b7d1f9688a8b5bfb1ebebadbea69d9ed0d3f66af4a0ff8c2b27
+  checksum: 349437148924a5a109c9b8aad6d393a9591b4dac1918fc97d81b7fc515bc905af9918495055071404af1fab4e48e4b04ac3593477b1d5dcf48c4e71b527c70a7
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-cli@npm:29.5.0"
+"jest-cli@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-cli@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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
-    graceful-fs: ^4.2.9
     import-local: ^3.0.2
-    jest-config: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
-    prompts: ^2.0.1
+    jest-config: ^29.7.0
+    jest-util: ^29.7.0
+    jest-validate: ^29.7.0
     yargs: ^17.3.1
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -12053,34 +11485,34 @@ dexie@latest:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: 39897bbbc0f0d8a6b975ab12fd13887eaa28d92e3dee9e0173a5cb913ae8cc2ae46e090d38c6d723e84d9d6724429cd08685b4e505fa447d31ca615630c7dbba
+  checksum: 664901277a3f5007ea4870632ed6e7889db9da35b2434e7cb488443e6bf5513889b344b7fddf15112135495b9875892b156faeb2d7391ddb9e2a849dcb7b6c36
   languageName: node
   linkType: hard
 
-"jest-config@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-config@npm:29.5.0"
+"jest-config@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-config@npm:29.7.0"
   dependencies:
     "@babel/core": ^7.11.6
-    "@jest/test-sequencer": ^29.5.0
-    "@jest/types": ^29.5.0
-    babel-jest: ^29.5.0
+    "@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.5.0
-    jest-environment-node: ^29.5.0
-    jest-get-type: ^29.4.3
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-runner: ^29.5.0
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
+    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.5.0
+    pretty-format: ^29.7.0
     slash: ^3.0.0
     strip-json-comments: ^3.1.1
   peerDependencies:
@@ -12091,361 +11523,358 @@ dexie@latest:
       optional: true
     ts-node:
       optional: true
-  checksum: c37c4dab964c54ab293d4e302d40b09687037ac9d00b88348ec42366970747feeaf265e12e3750cd3660b40c518d4031335eda11ac10b70b10e60797ebbd4b9c
+  checksum: 4cabf8f894c180cac80b7df1038912a3fc88f96f2622de33832f4b3314f83e22b08fb751da570c0ab2b7988f21604bdabade95e3c0c041068ac578c085cf7dff
   languageName: node
   linkType: hard
 
-"jest-diff@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-diff@npm:29.5.0"
+"jest-diff@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-diff@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
-    diff-sequences: ^29.4.3
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: dfd0f4a299b5d127779c76b40106c37854c89c3e0785098c717d52822d6620d227f6234c3a9291df204d619e799e3654159213bf93220f79c8e92a55475a3d39
+    diff-sequences: ^29.6.3
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: 08e24a9dd43bfba1ef07a6374e5af138f53137b79ec3d5cc71a2303515335898888fa5409959172e1e05de966c9e714368d15e8994b0af7441f0721ee8e1bb77
   languageName: node
   linkType: hard
 
-"jest-docblock@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-docblock@npm:29.4.3"
+"jest-docblock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-docblock@npm:29.7.0"
   dependencies:
     detect-newline: ^3.0.0
-  checksum: e0e9df1485bb8926e5b33478cdf84b3387d9caf3658e7dc1eaa6dc34cb93dea0d2d74797f6e940f0233a88f3dadd60957f2288eb8f95506361f85b84bf8661df
+  checksum: 66390c3e9451f8d96c5da62f577a1dad701180cfa9b071c5025acab2f94d7a3efc2515cfa1654ebe707213241541ce9c5530232cdc8017c91ed64eea1bd3b192
   languageName: node
   linkType: hard
 
-"jest-each@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-each@npm:29.5.0"
+"jest-each@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-each@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
-    jest-util: ^29.5.0
-    pretty-format: ^29.5.0
-  checksum: b8b297534d25834c5d4e31e4c687359787b1e402519e42664eb704cc3a12a7a91a017565a75acb02e8cf9afd3f4eef3350bd785276bec0900184641b765ff7a5
+    jest-get-type: ^29.6.3
+    jest-util: ^29.7.0
+    pretty-format: ^29.7.0
+  checksum: e88f99f0184000fc8813f2a0aa79e29deeb63700a3b9b7928b8a418d7d93cd24933608591dbbdea732b473eb2021c72991b5cc51a17966842841c6e28e6f691c
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:29.5.0":
-  version: 29.5.0
-  resolution: "jest-environment-jsdom@npm:29.5.0"
+"jest-environment-jsdom@npm:29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-jsdom@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/fake-timers": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/environment": ^29.7.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/jsdom": ^20.0.0
     "@types/node": "*"
-    jest-mock: ^29.5.0
-    jest-util: ^29.5.0
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
     jsdom: ^20.0.0
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 3df7fc85275711f20b483ac8cd8c04500704ed0f69791eb55c574b38f5a39470f03d775cf20c1025bc1884916ac0573aa2fa4db1bb74225bc7fdd95ba97ad0da
+  checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8
   languageName: node
   linkType: hard
 
-"jest-environment-node@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-environment-node@npm:29.5.0"
+"jest-environment-node@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-node@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/fake-timers": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/environment": ^29.7.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-mock: ^29.5.0
-    jest-util: ^29.5.0
-  checksum: 57981911cc20a4219b0da9e22b2e3c9f31b505e43f78e61c899e3227ded455ce1a3a9483842c69cfa4532f02cfb536ae0995bf245f9211608edacfc1e478d411
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
+  checksum: 501a9966292cbe0ca3f40057a37587cb6def25e1e0c5e39ac6c650fe78d3c70a2428304341d084ac0cced5041483acef41c477abac47e9a290d5545fd2f15646
   languageName: node
   linkType: hard
 
-"jest-get-type@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-get-type@npm:29.4.3"
-  checksum: 6ac7f2dde1c65e292e4355b6c63b3a4897d7e92cb4c8afcf6d397f2682f8080e094c8b0b68205a74d269882ec06bf696a9de6cd3e1b7333531e5ed7b112605ce
+"jest-get-type@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-get-type@npm:29.6.3"
+  checksum: 88ac9102d4679d768accae29f1e75f592b760b44277df288ad76ce5bf038c3f5ce3719dea8aa0f035dac30e9eb034b848ce716b9183ad7cc222d029f03e92205
   languageName: node
   linkType: hard
 
-"jest-haste-map@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-haste-map@npm:29.5.0"
+"jest-haste-map@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-haste-map@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/graceful-fs": ^4.1.3
     "@types/node": "*"
     anymatch: ^3.0.3
     fb-watchman: ^2.0.0
     fsevents: ^2.3.2
     graceful-fs: ^4.2.9
-    jest-regex-util: ^29.4.3
-    jest-util: ^29.5.0
-    jest-worker: ^29.5.0
+    jest-regex-util: ^29.6.3
+    jest-util: ^29.7.0
+    jest-worker: ^29.7.0
     micromatch: ^4.0.4
     walker: ^1.0.8
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: 3828ff7783f168e34be2c63887f82a01634261f605dcae062d83f979a61c37739e21b9607ecb962256aea3fbe5a530a1acee062d0026fcb47c607c12796cf3b7
+  checksum: c2c8f2d3e792a963940fbdfa563ce14ef9e14d4d86da645b96d3cd346b8d35c5ce0b992ee08593939b5f718cf0a1f5a90011a056548a1dbf58397d4356786f01
   languageName: node
   linkType: hard
 
-"jest-jasmine2@npm:29.5.0":
-  version: 29.5.0
-  resolution: "jest-jasmine2@npm:29.5.0"
+"jest-jasmine2@npm:29.7.0":
+  version: 29.7.0
+  resolution: "jest-jasmine2@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/expect": ^29.5.0
-    "@jest/source-map": ^29.4.3
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/environment": ^29.7.0
+    "@jest/expect": ^29.7.0
+    "@jest/source-map": ^29.6.3
+    "@jest/test-result": ^29.7.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
     chalk: ^4.0.0
     co: ^4.6.0
     is-generator-fn: ^2.0.0
-    jest-each: ^29.5.0
-    jest-matcher-utils: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.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.5.0
-  checksum: d76d845e495c72451ab50719fd13960b54064d92d53303a98435a6be0397ed12ff7e9336f34f50de58b2efdc3acf3784fa9f3554f4981596ada5a9a4a91c9585
+    pretty-format: ^29.7.0
+  checksum: 41070ff8c02bfc6abb2acfad543f80e8501a5a613214715e4d3df10a2c30cf03c3db7d62f13979acf9b8f2d756e7ed0e604275ddbfe276a499da9edfc831b96b
   languageName: node
   linkType: hard
 
-"jest-leak-detector@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-leak-detector@npm:29.5.0"
+"jest-leak-detector@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-leak-detector@npm:29.7.0"
   dependencies:
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: 0fb845da7ac9cdfc9b3b2e35f6f623a41c547d7dc0103ceb0349013459d00de5870b5689a625e7e37f9644934b40e8f1dcdd5422d14d57470600350364676313
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: e3950e3ddd71e1d0c22924c51a300a1c2db6cf69ec1e51f95ccf424bcc070f78664813bef7aed4b16b96dfbdeea53fe358f8aeaaea84346ae15c3735758f1605
   languageName: node
   linkType: hard
 
-"jest-matcher-utils@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-matcher-utils@npm:29.5.0"
+"jest-matcher-utils@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-matcher-utils@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
-    jest-diff: ^29.5.0
-    jest-get-type: ^29.4.3
-    pretty-format: ^29.5.0
-  checksum: 1d3e8c746e484a58ce194e3aad152eff21fd0896e8b8bf3d4ab1a4e2cbfed95fb143646f4ad9fdf6e42212b9e8fc033268b58e011b044a9929df45485deb5ac9
+    jest-diff: ^29.7.0
+    jest-get-type: ^29.6.3
+    pretty-format: ^29.7.0
+  checksum: d7259e5f995d915e8a37a8fd494cb7d6af24cd2a287b200f831717ba0d015190375f9f5dc35393b8ba2aae9b2ebd60984635269c7f8cff7d85b077543b7744cd
   languageName: node
   linkType: hard
 
-"jest-message-util@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-message-util@npm:29.5.0"
+"jest-message-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-message-util@npm:29.7.0"
   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
-  checksum: daddece6bbf846eb6a2ab9be9f2446e54085bef4e5cecd13d2a538fa9c01cb89d38e564c6b74fd8e12d37ed9eface8a362240ae9f21d68b214590631e7a0d8bf
+  checksum: a9d025b1c6726a2ff17d54cc694de088b0489456c69106be6b615db7a51b7beb66788bea7a59991a019d924fbf20f67d085a445aedb9a4d6760363f4d7d09930
   languageName: node
   linkType: hard
 
-"jest-mock@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-mock@npm:29.5.0"
+"jest-mock@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-mock@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     "@types/node": "*"
-    jest-util: ^29.5.0
-  checksum: 2a9cf07509948fa8608898c445f04fe4dd6e2049ff431e5531eee028c808d3ba3c67f226ac87b0cf383feaa1055776900d197c895e89783016886ac17a4ff10c
+    jest-util: ^29.7.0
+  checksum: 81ba9b68689a60be1482212878973700347cb72833c5e5af09895882b9eb5c4e02843a1bbdf23f94c52d42708bab53a30c45a3482952c9eec173d1eaac5b86c5
   languageName: node
   linkType: hard
 
 "jest-pnp-resolver@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "jest-pnp-resolver@npm:1.2.2"
+  version: 1.2.3
+  resolution: "jest-pnp-resolver@npm:1.2.3"
   peerDependencies:
     jest-resolve: "*"
   peerDependenciesMeta:
     jest-resolve:
       optional: true
-  checksum: bd85dcc0e76e0eb0c3d56382ec140f08d25ff4068cda9d0e360bb78fb176cb726d0beab82dc0e8694cafd09f55fee7622b8bcb240afa5fad301f4ed3eebb4f47
+  checksum: db1a8ab2cb97ca19c01b1cfa9a9c8c69a143fde833c14df1fab0766f411b1148ff0df878adea09007ac6a2085ec116ba9a996a6ad104b1e58c20adbf88eed9b2
   languageName: node
   linkType: hard
 
-"jest-regex-util@npm:^29.4.3":
-  version: 29.4.3
-  resolution: "jest-regex-util@npm:29.4.3"
-  checksum: 96fc7fc28cd4dd73a63c13a526202c4bd8b351d4e5b68b1a2a2c88da3308c2a16e26feaa593083eb0bac38cca1aa9dd05025412e7de013ba963fb8e66af22b8a
+"jest-regex-util@npm:^29.6.3":
+  version: 29.6.3
+  resolution: "jest-regex-util@npm:29.6.3"
+  checksum: 0518beeb9bf1228261695e54f0feaad3606df26a19764bc19541e0fc6e2a3737191904607fb72f3f2ce85d9c16b28df79b7b1ec9443aa08c3ef0e9efda6f8f2a
   languageName: node
   linkType: hard
 
-"jest-resolve-dependencies@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-resolve-dependencies@npm:29.5.0"
+"jest-resolve-dependencies@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve-dependencies@npm:29.7.0"
   dependencies:
-    jest-regex-util: ^29.4.3
-    jest-snapshot: ^29.5.0
-  checksum: 479d2e5365d58fe23f2b87001e2e0adcbffe0147700e85abdec8f14b9703b0a55758c1929a9989e3f5d5e954fb88870ea4bfa04783523b664562fcf5f10b0edf
+    jest-regex-util: ^29.6.3
+    jest-snapshot: ^29.7.0
+  checksum: aeb75d8150aaae60ca2bb345a0d198f23496494677cd6aefa26fc005faf354061f073982175daaf32b4b9d86b26ca928586344516e3e6969aa614cb13b883984
   languageName: node
   linkType: hard
 
-"jest-resolve@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-resolve@npm:29.5.0"
+"jest-resolve@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-resolve@npm:29.7.0"
   dependencies:
     chalk: ^4.0.0
     graceful-fs: ^4.2.9
-    jest-haste-map: ^29.5.0
+    jest-haste-map: ^29.7.0
     jest-pnp-resolver: ^1.2.2
-    jest-util: ^29.5.0
-    jest-validate: ^29.5.0
+    jest-util: ^29.7.0
+    jest-validate: ^29.7.0
     resolve: ^1.20.0
     resolve.exports: ^2.0.0
     slash: ^3.0.0
-  checksum: 9a125f3cf323ceef512089339d35f3ee37f79fe16a831fb6a26773ea6a229b9e490d108fec7af334142e91845b5996de8e7cdd85a4d8d617078737d804e29c8f
+  checksum: 0ca218e10731aa17920526ec39deaec59ab9b966237905ffc4545444481112cd422f01581230eceb7e82d86f44a543d520a71391ec66e1b4ef1a578bd5c73487
   languageName: node
   linkType: hard
 
-"jest-runner@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-runner@npm:29.5.0"
+"jest-runner@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runner@npm:29.7.0"
   dependencies:
-    "@jest/console": ^29.5.0
-    "@jest/environment": ^29.5.0
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.4.3
-    jest-environment-node: ^29.5.0
-    jest-haste-map: ^29.5.0
-    jest-leak-detector: ^29.5.0
-    jest-message-util: ^29.5.0
-    jest-resolve: ^29.5.0
-    jest-runtime: ^29.5.0
-    jest-util: ^29.5.0
-    jest-watcher: ^29.5.0
-    jest-worker: ^29.5.0
+    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
-  checksum: 437dea69c5dddca22032259787bac74790d5a171c9d804711415f31e5d1abfb64fa52f54a9015bb17a12b858fd0cf3f75ef6f3c9e94255a8596e179f707229c4
+  checksum: f0405778ea64812bf9b5c50b598850d94ccf95d7ba21f090c64827b41decd680ee19fcbb494007cdd7f5d0d8906bfc9eceddd8fa583e753e736ecd462d4682fb
   languageName: node
   linkType: hard
 
-"jest-runtime@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-runtime@npm:29.5.0"
+"jest-runtime@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-runtime@npm:29.7.0"
   dependencies:
-    "@jest/environment": ^29.5.0
-    "@jest/fake-timers": ^29.5.0
-    "@jest/globals": ^29.5.0
-    "@jest/source-map": ^29.4.3
-    "@jest/test-result": ^29.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
-    jest-message-util: ^29.5.0
-    jest-mock: ^29.5.0
-    jest-regex-util: ^29.4.3
-    jest-resolve: ^29.5.0
-    jest-snapshot: ^29.5.0
-    jest-util: ^29.5.0
+    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
-  checksum: 7af27bd9d54cf1c5735404cf8d76c6509d5610b1ec0106a21baa815c1aff15d774ce534ac2834bc440dccfe6348bae1885fd9a806f23a94ddafdc0f5bae4b09d
+  checksum: d19f113d013e80691e07047f68e1e3448ef024ff2c6b586ce4f90cd7d4c62a2cd1d460110491019719f3c59bfebe16f0e201ed005ef9f80e2cf798c374eed54e
   languageName: node
   linkType: hard
 
-"jest-snapshot@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-snapshot@npm:29.5.0"
+"jest-snapshot@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-snapshot@npm:29.7.0"
   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.5.0
-    "@jest/transform": ^29.5.0
-    "@jest/types": ^29.5.0
-    "@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.5.0
+    expect: ^29.7.0
     graceful-fs: ^4.2.9
-    jest-diff: ^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-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.5.0
-    semver: ^7.3.5
-  checksum: fe5df54122ed10eed625de6416a45bc4958d5062b018f05b152bf9785ab7f355dcd55e40cf5da63895bf8278f8d7b2bb4059b2cfbfdee18f509d455d37d8aa2b
+    pretty-format: ^29.7.0
+    semver: ^7.5.3
+  checksum: 86821c3ad0b6899521ce75ee1ae7b01b17e6dfeff9166f2cf17f012e0c5d8c798f30f9e4f8f7f5bed01ea7b55a6bc159f5eda778311162cbfa48785447c237ad
   languageName: node
   linkType: hard
 
-"jest-util@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-util@npm:29.5.0"
+"jest-util@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-util@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@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
-  checksum: fd9212950d34d2ecad8c990dda0d8ea59a8a554b0c188b53ea5d6c4a0829a64f2e1d49e6e85e812014933d17426d7136da4785f9cf76fff1799de51b88bc85d3
+  checksum: 042ab4980f4ccd4d50226e01e5c7376a8556b472442ca6091a8f102488c0f22e6e8b89ea874111d2328a2080083bf3225c86f3788c52af0bd0345a00eb57a3ca
   languageName: node
   linkType: hard
 
-"jest-validate@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-validate@npm:29.5.0"
+"jest-validate@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-validate@npm:29.7.0"
   dependencies:
-    "@jest/types": ^29.5.0
+    "@jest/types": ^29.6.3
     camelcase: ^6.2.0
     chalk: ^4.0.0
-    jest-get-type: ^29.4.3
+    jest-get-type: ^29.6.3
     leven: ^3.1.0
-    pretty-format: ^29.5.0
-  checksum: 43ca5df7cb75572a254ac3e92fbbe7be6b6a1be898cc1e887a45d55ea003f7a112717d814a674d37f9f18f52d8de40873c8f084f17664ae562736c78dd44c6a1
+    pretty-format: ^29.7.0
+  checksum: 191fcdc980f8a0de4dbdd879fa276435d00eb157a48683af7b3b1b98b0f7d9de7ffe12689b617779097ff1ed77601b9f7126b0871bba4f776e222c40f62e9dae
   languageName: node
   linkType: hard
 
-"jest-watcher@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-watcher@npm:29.5.0"
+"jest-watcher@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-watcher@npm:29.7.0"
   dependencies:
-    "@jest/test-result": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@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.5.0
+    jest-util: ^29.7.0
     string-length: ^4.0.1
-  checksum: 62303ac7bdc7e61a8b4239a239d018f7527739da2b2be6a81a7be25b74ca769f1c43ee8558ce8e72bb857245c46d6e03af331227ffb00a57280abb2a928aa776
+  checksum: 67e6e7fe695416deff96b93a14a561a6db69389a0667e9489f24485bb85e5b54e12f3b2ba511ec0b777eca1e727235b073e3ebcdd473d68888650489f88df92f
   languageName: node
   linkType: hard
 
@@ -12471,26 +11900,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"jest-worker@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "jest-worker@npm:29.5.0"
+"jest-worker@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-worker@npm:29.7.0"
   dependencies:
     "@types/node": "*"
-    jest-util: ^29.5.0
+    jest-util: ^29.7.0
     merge-stream: ^2.0.0
     supports-color: ^8.0.0
-  checksum: 1151a1ae3602b1ea7c42a8f1efe2b5a7bf927039deaa0827bf978880169899b705744e288f80a63603fb3fc2985e0071234986af7dc2c21c7a64333d8777c7c9
+  checksum: 30fff60af49675273644d408b650fc2eb4b5dcafc5a0a455f238322a8f9d8a98d847baca9d51ff197b6747f54c7901daa2287799230b856a0f48287d131f8c13
   languageName: node
   linkType: hard
 
-"jest@npm:29.5.0":
-  version: 29.5.0
-  resolution: "jest@npm:29.5.0"
+"jest@npm:29.7.0":
+  version: 29.7.0
+  resolution: "jest@npm:29.7.0"
   dependencies:
-    "@jest/core": ^29.5.0
-    "@jest/types": ^29.5.0
+    "@jest/core": ^29.7.0
+    "@jest/types": ^29.6.3
     import-local: ^3.0.2
-    jest-cli: ^29.5.0
+    jest-cli: ^29.7.0
   peerDependencies:
     node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
   peerDependenciesMeta:
@@ -12498,28 +11927,28 @@ dexie@latest:
       optional: true
   bin:
     jest: bin/jest.js
-  checksum: a8ff2eb0f421623412236e23cbe67c638127fffde466cba9606bc0c0553b4c1e5cb116d7e0ef990b5d1712851652c8ee461373b578df50857fe635b94ff455d5
+  checksum: 17ca8d67504a7dbb1998cf3c3077ec9031ba3eb512da8d71cb91bcabb2b8995c4e4b292b740cb9bf1cbff5ce3e110b3f7c777b0cefb6f41ab05445f248d0ee0b
   languageName: node
   linkType: hard
 
-"jimp@npm:0.22.8":
-  version: 0.22.8
-  resolution: "jimp@npm:0.22.8"
+"jimp@npm:0.22.10":
+  version: 0.22.10
+  resolution: "jimp@npm:0.22.10"
   dependencies:
-    "@jimp/custom": ^0.22.8
-    "@jimp/plugins": ^0.22.8
-    "@jimp/types": ^0.22.8
+    "@jimp/custom": ^0.22.10
+    "@jimp/plugins": ^0.22.10
+    "@jimp/types": ^0.22.10
     regenerator-runtime: ^0.13.3
-  checksum: aa220516216efece65d0258df0ef08da8fa52cb8d18477699513f2e41b94cd3e063ca908189c2cf8dcec9e7c66a27d8854fdb820835c6553afcadb381789f301
+  checksum: 1001ec8ed939ba25f24f15e1b3acd794f184ec4511a9808e8de8422eb7e0fd4032788f101c3b2cff71afd2dea27a904ca012f2ebbb1b87d6154b99e39af6b4c3
   languageName: node
   linkType: hard
 
 "jiti@npm:^1.18.2":
-  version: 1.18.2
-  resolution: "jiti@npm:1.18.2"
+  version: 1.20.0
+  resolution: "jiti@npm:1.20.0"
   bin:
     jiti: bin/jiti.js
-  checksum: 46c41cd82d01c6efdee3fc0ae9b3e86ed37457192d6366f19157d863d64961b07982ab04e9d5879576a1af99cc4d132b0b73b336094f86a5ce9fb1029ec2d29f
+  checksum: 7924062b5675142e3e272a27735be84b7bfc0a0eb73217fc2dcafa034f37c4f7b4b9ffc07dd98bcff0f739a8811ce1544db205ae7e97b1c86f0df92c65ce3c72
   languageName: node
   linkType: hard
 
@@ -12530,17 +11959,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"jquery@npm:3.7.0":
-  version: 3.7.0
-  resolution: "jquery@npm:3.7.0"
-  checksum: 907785e133afc427650a131af5fccef66a404885037513b3d4d7d63aee6409bcc32a39836868c60e59b05aa0fb8ace8961c18b2ee3ffdf6ffdb571d6d7cd88ff
+"jquery@npm:3.7.1":
+  version: 3.7.1
+  resolution: "jquery@npm:3.7.1"
+  checksum: 4370b8139d6ae82867eb6f7f21d1edccf1d1bdf41c0840920ea80d366c2cd5dbe1ceebb110ee9772aa839b04400faa1572c5c560b507c688ed7b61cea26c0e27
   languageName: node
   linkType: hard
 
-"js-cookie@npm:3.0.1":
-  version: 3.0.1
-  resolution: "js-cookie@npm:3.0.1"
-  checksum: bb48de67e2a6bd1ae3dfd6b2d5a167c33dd0c5a37e909206161eb0358c98f17cb55acd55827a58e9eea3630d89444e7479f7938ef4420dda443218b8c434a4c3
+"js-cookie@npm:3.0.5":
+  version: 3.0.5
+  resolution: "js-cookie@npm:3.0.5"
+  checksum: 2dbd2809c6180fbcf060c6957cb82dbb47edae0ead6bd71cbeedf448aa6b6923115003b995f7d3e3077bfe2cb76295ea6b584eb7196cca8ba0a09f389f64967a
   languageName: node
   linkType: hard
 
@@ -12583,10 +12012,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"jsdoc-type-pratt-parser@npm:~3.1.0":
-  version: 3.1.0
-  resolution: "jsdoc-type-pratt-parser@npm:3.1.0"
-  checksum: 2f437b57621f1e481918165f6cf0e48256628a9e510d8b3f88a2ab667bf2128bf8b94c628b57c43e78f555ca61983e9c282814703840dc091d2623992214a061
+"jsdoc-type-pratt-parser@npm:~4.0.0":
+  version: 4.0.0
+  resolution: "jsdoc-type-pratt-parser@npm:4.0.0"
+  checksum: af0629c9517e484be778d8564440fec8de5b7610e0c9c88a3ba4554321364faf72b46689c8d8845faa12c0718437a9ed97e231977efc0f2d50e8a2dbad807eb3
   languageName: node
   linkType: hard
 
@@ -12628,16 +12057,16 @@ dexie@latest:
   linkType: hard
 
 "jsdom@npm:^20.0.0":
-  version: 20.0.0
-  resolution: "jsdom@npm:20.0.0"
+  version: 20.0.3
+  resolution: "jsdom@npm:20.0.3"
   dependencies:
     abab: ^2.0.6
-    acorn: ^8.7.1
-    acorn-globals: ^6.0.0
+    acorn: ^8.8.1
+    acorn-globals: ^7.0.0
     cssom: ^0.5.0
     cssstyle: ^2.3.0
     data-urls: ^3.0.2
-    decimal.js: ^10.3.1
+    decimal.js: ^10.4.2
     domexception: ^4.0.0
     escodegen: ^2.0.0
     form-data: ^4.0.0
@@ -12645,25 +12074,24 @@ dexie@latest:
     http-proxy-agent: ^5.0.0
     https-proxy-agent: ^5.0.1
     is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.0
-    parse5: ^7.0.0
+    nwsapi: ^2.2.2
+    parse5: ^7.1.1
     saxes: ^6.0.0
     symbol-tree: ^3.2.4
-    tough-cookie: ^4.0.0
-    w3c-hr-time: ^1.0.2
-    w3c-xmlserializer: ^3.0.0
+    tough-cookie: ^4.1.2
+    w3c-xmlserializer: ^4.0.0
     webidl-conversions: ^7.0.0
     whatwg-encoding: ^2.0.0
     whatwg-mimetype: ^3.0.0
     whatwg-url: ^11.0.0
-    ws: ^8.8.0
+    ws: ^8.11.0
     xml-name-validator: ^4.0.0
   peerDependencies:
     canvas: ^2.5.0
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: f69b40679d8cfaee2353615445aaff08b823c53dc7778ede6592d02ed12b3e9fb4e8db2b6d033551b67e08424a3adb2b79d231caa7dcda2d16019c20c705c11f
+  checksum: 6e2ae21db397133a061b270c26d2dbc0b9051733ea3b896a7ece78d79f475ff0974f766a413c1198a79c793159119169f2335ddb23150348fbfdcfa6f3105536
   languageName: node
   linkType: hard
 
@@ -12685,6 +12113,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"json-buffer@npm:3.0.1":
+  version: 3.0.1
+  resolution: "json-buffer@npm:3.0.1"
+  checksum: 9026b03edc2847eefa2e37646c579300a1f3a4586cfb62bf857832b60c852042d0d6ae55d1afb8926163fa54c2b01d83ae24705f34990348bdac6273a29d4581
+  languageName: node
+  linkType: hard
+
 "json-parse-even-better-errors@npm:^2.3.0, json-parse-even-better-errors@npm:^2.3.1":
   version: 2.3.1
   resolution: "json-parse-even-better-errors@npm:2.3.1"
@@ -12720,7 +12155,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"json5@npm:^1.0.1":
+"json5@npm:^1.0.1, json5@npm:^1.0.2":
   version: 1.0.2
   resolution: "json5@npm:1.0.2"
   dependencies:
@@ -12731,7 +12166,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"json5@npm:^2.2.0, json5@npm:^2.2.2":
+"json5@npm:^2.2.0, json5@npm:^2.2.3":
   version: 2.2.3
   resolution: "json5@npm:2.2.3"
   bin:
@@ -12754,19 +12189,21 @@ dexie@latest:
   linkType: hard
 
 "jsonpointer@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "jsonpointer@npm:5.0.0"
-  checksum: c7ec0b6bb596b81de687bc12945586bbcdc80dfb54919656d2690d76334f796a936270067ee9f1b5bbc2d9ecc551afb366ac35e6685aa61f07b5b68d1e5e857d
+  version: 5.0.1
+  resolution: "jsonpointer@npm:5.0.1"
+  checksum: 0b40f712900ad0c846681ea2db23b6684b9d5eedf55807b4708c656f5894b63507d0e28ae10aa1bddbea551241035afe62b6df0800fc94c2e2806a7f3adecd7c
   languageName: node
   linkType: hard
 
 "jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.3.3":
-  version: 3.3.3
-  resolution: "jsx-ast-utils@npm:3.3.3"
+  version: 3.3.5
+  resolution: "jsx-ast-utils@npm:3.3.5"
   dependencies:
-    array-includes: ^3.1.5
-    object.assign: ^4.1.3
-  checksum: a2ed78cac49a0f0c4be8b1eafe3c5257a1411341d8e7f1ac740debae003de04e5f6372bfcfbd9d082e954ffd99aac85bcda85b7c6bc11609992483f4cdc0f745
+    array-includes: ^3.1.6
+    array.prototype.flat: ^1.3.1
+    object.assign: ^4.1.4
+    object.values: ^1.1.6
+  checksum: f4b05fa4d7b5234230c905cfa88d36dc8a58a6666975a3891429b1a8cdc8a140bca76c297225cb7a499fad25a2c052ac93934449a2c31a44fc9edd06c773780a
   languageName: node
   linkType: hard
 
@@ -12783,9 +12220,16 @@ dexie@latest:
   linkType: hard
 
 "just-extend@npm:^4.0.2":
-  version: 4.1.1
-  resolution: "just-extend@npm:4.1.1"
-  checksum: 066808f9a4b8b87d4966d42eca4ed7ee3602791ac70bf4d55bc2f44b0a2214a9dd05976d9581877731f8536f6eae11fee28968a5fabea5e43df7c965966126f4
+  version: 4.2.1
+  resolution: "just-extend@npm:4.2.1"
+  checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
+  languageName: node
+  linkType: hard
+
+"jwt-decode@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "jwt-decode@npm:3.1.2"
+  checksum: 20a4b072d44ce3479f42d0d2c8d3dabeb353081ba4982e40b83a779f2459a70be26441be6c160bfc8c3c6eadf9f6380a036fbb06ac5406b5674e35d8c4205eeb
   languageName: node
   linkType: hard
 
@@ -12796,6 +12240,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"keyv@npm:^4.5.3":
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
+  dependencies:
+    json-buffer: 3.0.1
+  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
+  languageName: node
+  linkType: hard
+
 "kind-of@npm:^3.0.2":
   version: 3.2.2
   resolution: "kind-of@npm:3.2.2"
@@ -12842,17 +12295,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.26.0":
-  version: 0.26.0
-  resolution: "known-css-properties@npm:0.26.0"
-  checksum: e706f4af9d2683202df9f717e7d713f0f8c3330f155842c40d8f3b2a5837956c34aeb7ba08760977ccde1afce8b5377e29b40eb3e5c0b42bef28ddd108543cfb
+"known-css-properties@npm:^0.28.0":
+  version: 0.28.0
+  resolution: "known-css-properties@npm:0.28.0"
+  checksum: c9e0d6948e31386e872d348eb955e9db80edd58f9d7f7fc9b072180bfb26708a629d5942d4478f66fc766fb913c4552a220950730cef85f8c3bc9830e33b00c8
   languageName: node
   linkType: hard
 
 "language-subtag-registry@npm:~0.3.2":
-  version: 0.3.21
-  resolution: "language-subtag-registry@npm:0.3.21"
-  checksum: 5f794525a5bfcefeea155a681af1c03365b60e115b688952a53c6e0b9532b09163f57f1fcb69d6150e0e805ec0350644a4cb35da98f4902562915be9f89572a1
+  version: 0.3.22
+  resolution: "language-subtag-registry@npm:0.3.22"
+  checksum: 8ab70a7e0e055fe977ac16ea4c261faec7205ac43db5e806f72e5b59606939a3b972c4bd1e10e323b35d6ffa97c3e1c4c99f6553069dad2dfdd22020fa3eb56a
   languageName: node
   linkType: hard
 
@@ -12882,11 +12335,11 @@ dexie@latest:
   linkType: hard
 
 "lazystream@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "lazystream@npm:1.0.0"
+  version: 1.0.1
+  resolution: "lazystream@npm:1.0.1"
   dependencies:
     readable-stream: ^2.0.5
-  checksum: 6cb9352a697bad74471671b299997edc736b400bb405dc409acfc9ffe584bb6f86898c4ace86b2f145ae32fe42ef60bd68749acb62c2ff3fa6bded721193f79c
+  checksum: 822c54c6b87701a6491c70d4fabc4cafcf0f87d6b656af168ee7bb3c45de9128a801cb612e6eeeefc64d298a7524a698dd49b13b0121ae50c2ae305f0dcc5310
   languageName: node
   linkType: hard
 
@@ -12899,12 +12352,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lead@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "lead@npm:1.0.0"
-  dependencies:
-    flush-write-stream: ^1.0.2
-  checksum: f08a9f45ac39b8d1fecf31de4d97a8fa2aa7e233e99bb61fd443414fc8055331224490698e186cb614aa3ea2f2695d71c42afc85415fa680b078d640efadab50
+"lead@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "lead@npm:4.0.0"
+  checksum: 7117297c29b94e4846822e5ae0a25780af834586c0862b89ff899e44547f4f742d67801f19838b34611d36eec44868604c55525e12d2a1fb0c9496a9792ca396
   languageName: node
   linkType: hard
 
@@ -12918,9 +12369,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"less@npm:3.13.1":
-  version: 3.13.1
-  resolution: "less@npm:3.13.1"
+"less@npm:4.2.0":
+  version: 4.2.0
+  resolution: "less@npm:4.2.0"
   dependencies:
     copy-anything: ^2.0.1
     errno: ^0.1.1
@@ -12928,9 +12379,10 @@ dexie@latest:
     image-size: ~0.5.0
     make-dir: ^2.1.0
     mime: ^1.4.1
-    native-request: ^1.0.5
+    needle: ^3.1.0
+    parse-node-version: ^1.0.1
     source-map: ~0.6.0
-    tslib: ^1.10.0
+    tslib: ^2.3.0
   dependenciesMeta:
     errno:
       optional: true
@@ -12942,13 +12394,13 @@ dexie@latest:
       optional: true
     mime:
       optional: true
-    native-request:
+    needle:
       optional: true
     source-map:
       optional: true
   bin:
-    lessc: ./bin/lessc
-  checksum: cfc2c56f135bbf47d8e53a6d083640e98ed8e92ae8ef36a7103aee571949779af5ee299342a5be83eca8932625adf9ff97017a3c82018e63e8fb9f5e5ab948a5
+    lessc: bin/lessc
+  checksum: 2ec4fa41e35e5c0331c1ee64419aa5c2cbb9a17b9e9d1deb524ec45843f59d9c4612dffc164ca16126911fbe9913e4ff811a13f33805f71e546f6d022ece93b6
   languageName: node
   linkType: hard
 
@@ -12979,10 +12431,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"lexical@npm:0.12.2":
+  version: 0.12.2
+  resolution: "lexical@npm:0.12.2"
+  checksum: f02cd11aa015f1babb960d39a31ada30060c3af5446dcc4a6d26e300af8b889bc307633cf77604cf7538e776efdf6ca19d919b82ad24e29c451f58939e91621f
+  languageName: node
+  linkType: hard
+
 "libsodium-sumo@npm:^0.7.0":
-  version: 0.7.10
-  resolution: "libsodium-sumo@npm:0.7.10"
-  checksum: 67ed75fa15559bad7cca5cdc2d5eb20725281be38a08814f7e39af8ea0c0d83ed2211e534f7b47460b6a48a1f7bb5c31759e4bc5cc79fb74292ffea8f90ee741
+  version: 0.7.13
+  resolution: "libsodium-sumo@npm:0.7.13"
+  checksum: d0905530c53c27a0c01348eed8abc2ecf3725c0647545cc528ea4bbd0ee63b7a471b56abefec5b293086ee64b5ba7cf911a655cd2c36f400a4bfec6e2d152ebd
   languageName: node
   linkType: hard
 
@@ -12995,12 +12454,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"libsodium-wrappers@npm:0.7.11":
-  version: 0.7.11
-  resolution: "libsodium-wrappers@npm:0.7.11"
+"libsodium-wrappers@npm:0.7.13":
+  version: 0.7.13
+  resolution: "libsodium-wrappers@npm:0.7.13"
   dependencies:
-    libsodium: ^0.7.11
-  checksum: 6a6ef47b2213e3fb4687196c28fee4c9885f70d89547d845e62d96014d3d5ad9f59cb05fadc601debc0031a3cfd0b9b416d7efbeb5bf66db6aa0ed69f55a6293
+    libsodium: ^0.7.13
+  checksum: d184395f7c33023414b191ef9ea2171eb1a5cb061503e886ea877590cb7adc3a4feaf794b9b08731a20515518fa23dbf1c1bfcd376e5ab01728e95cf1cb7525a
   languageName: node
   linkType: hard
 
@@ -13020,7 +12479,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:2.1.0, lilconfig@npm:^2.0.3":
+"lilconfig@npm:2.1.0, lilconfig@npm:^2.1.0":
   version: 2.1.0
   resolution: "lilconfig@npm:2.1.0"
   checksum: 8549bb352b8192375fed4a74694cd61ad293904eee33f9d4866c2192865c44c4eb35d10782966242634e0cbc1e91fe62b1247f148dc5514918e3a966da7ea117
@@ -13028,9 +12487,9 @@ dexie@latest:
   linkType: hard
 
 "lines-and-columns@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "lines-and-columns@npm:1.1.6"
-  checksum: 198a5436b1fa5cf703bae719c01c686b076f0ad7e1aafd95a58d626cabff302dc0414822126f2f80b58a8c3d66cda8a7b6da064f27130f87e1d3506d6dfd0d68
+  version: 1.2.4
+  resolution: "lines-and-columns@npm:1.2.4"
+  checksum: 0c37f9f7fa212b38912b7145e1cd16a5f3cd34d782441c3e6ca653485d326f58b3caccda66efce1c5812bde4961bbde3374fae4b0d11bf1226152337f3894aa5
   languageName: node
   linkType: hard
 
@@ -13052,47 +12511,37 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lint-staged@npm:13.2.2":
-  version: 13.2.2
-  resolution: "lint-staged@npm:13.2.2"
+"lint-staged@npm:15.0.1":
+  version: 15.0.1
+  resolution: "lint-staged@npm:15.0.1"
   dependencies:
-    chalk: 5.2.0
-    cli-truncate: ^3.1.0
-    commander: ^10.0.0
-    debug: ^4.3.4
-    execa: ^7.0.0
+    chalk: 5.3.0
+    commander: 11.1.0
+    debug: 4.3.4
+    execa: 8.0.1
     lilconfig: 2.1.0
-    listr2: ^5.0.7
-    micromatch: ^4.0.5
-    normalize-path: ^3.0.0
-    object-inspect: ^1.12.3
-    pidtree: ^0.6.0
-    string-argv: ^0.3.1
-    yaml: ^2.2.2
+    listr2: 7.0.1
+    micromatch: 4.0.5
+    pidtree: 0.6.0
+    string-argv: 0.3.2
+    yaml: 2.3.2
   bin:
     lint-staged: bin/lint-staged.js
-  checksum: f34f6e2e85e827364658ab8717bf8b35239473c2d4959d746b053a4cf158ac657348444c755820a8ef3eac2d4753a37c52e9db3e201ee20b085f26d2f2fbc9ed
+  checksum: 4ef972b8fb246fa047e2f819833e675a816bfe1dd1fa4130d1b75cb6af2a51abc54eb7047a7b82403d9d4f8aefe1e71532a999161d180fb5ec019d360988b7bf
   languageName: node
   linkType: hard
 
-"listr2@npm:^5.0.7":
-  version: 5.0.8
-  resolution: "listr2@npm:5.0.8"
+"listr2@npm:7.0.1":
+  version: 7.0.1
+  resolution: "listr2@npm:7.0.1"
   dependencies:
-    cli-truncate: ^2.1.0
-    colorette: ^2.0.19
-    log-update: ^4.0.0
-    p-map: ^4.0.0
+    cli-truncate: ^3.1.0
+    colorette: ^2.0.20
+    eventemitter3: ^5.0.1
+    log-update: ^5.0.1
     rfdc: ^1.3.0
-    rxjs: ^7.8.0
-    through: ^2.3.8
-    wrap-ansi: ^7.0.0
-  peerDependencies:
-    enquirer: ">= 2.3.0 < 3"
-  peerDependenciesMeta:
-    enquirer:
-      optional: true
-  checksum: 8be9f5632627c4df0dc33f452c98d415a49e5f1614650d3cab1b103c33e95f2a7a0e9f3e1e5de00d51bf0b4179acd8ff11b25be77dbe097cf3773c05e728d46c
+    wrap-ansi: ^8.1.0
+  checksum: ad6a64b952505c54f18f2c18d7bc4cf92a236b2742bf5bc514994dfadd48d9dacc5abd4f599ba7cd5bd0343da1ad0a0c3f3faa034597e8905b751b75c2a6b2e8
   languageName: node
   linkType: hard
 
@@ -13126,9 +12575,9 @@ dexie@latest:
   linkType: hard
 
 "loader-runner@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "loader-runner@npm:4.2.0"
-  checksum: e61aea8b6904b8af53d9de6f0484da86c462c0001f4511bedc837cec63deb9475cea813db62f702cd7930420ccb0e75c78112270ca5c8b61b374294f53c0cb3a
+  version: 4.3.0
+  resolution: "loader-runner@npm:4.3.0"
+  checksum: a90e00dee9a16be118ea43fec3192d0b491fe03a32ed48a4132eb61d498f5536a03a1315531c19d284392a8726a4ecad71d82044c28d7f22ef62e029bf761569
   languageName: node
   linkType: hard
 
@@ -13161,6 +12610,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"locate-path@npm:^7.1.0":
+  version: 7.2.0
+  resolution: "locate-path@npm:7.2.0"
+  dependencies:
+    p-locate: ^6.0.0
+  checksum: c1b653bdf29beaecb3d307dfb7c44d98a2a98a02ebe353c9ad055d1ac45d6ed4e1142563d222df9b9efebc2bcb7d4c792b507fad9e7150a04c29530b7db570f8
+  languageName: node
+  linkType: hard
+
 "lodash.debounce@npm:^4.0.8":
   version: 4.0.8
   resolution: "lodash.debounce@npm:4.0.8"
@@ -13168,27 +12626,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lodash.defaults@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.defaults@npm:4.2.0"
-  checksum: 84923258235592c8886e29de5491946ff8c2ae5c82a7ac5cddd2e3cb697e6fbdfbbb6efcca015795c86eec2bb953a5a2ee4016e3735a3f02720428a40efbb8f1
-  languageName: node
-  linkType: hard
-
-"lodash.difference@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.difference@npm:4.5.0"
-  checksum: ecee276aa578f300e79350805a14a51be8d1f12b3c1389a19996d8ab516f814211a5f65c68331571ecdad96522b863ccc484b55504ce8c9947212a29f8857d5a
-  languageName: node
-  linkType: hard
-
-"lodash.flatten@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.flatten@npm:4.4.0"
-  checksum: 0ac34a393d4b795d4b7421153d27c13ae67e08786c9cbb60ff5b732210d46f833598eee3fb3844bb10070e8488efe390ea53bb567377e0cb47e9e630bf0811cb
-  languageName: node
-  linkType: hard
-
 "lodash.get@npm:^4.4.2":
   version: 4.4.2
   resolution: "lodash.get@npm:4.4.2"
@@ -13238,13 +12675,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lodash.union@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.union@npm:4.6.0"
-  checksum: 1514dc6508b2614ec071a6470f36eb7a70f69bf1abb6d55bdfdc21069635a4517783654b28504c0f025059a7598d37529766888e6d5902b8ab28b712228f7b2a
-  languageName: node
-  linkType: hard
-
 "lodash.uniq@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.uniq@npm:4.5.0"
@@ -13279,15 +12709,16 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"log-update@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "log-update@npm:4.0.0"
+"log-update@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "log-update@npm:5.0.1"
   dependencies:
-    ansi-escapes: ^4.3.0
-    cli-cursor: ^3.1.0
-    slice-ansi: ^4.0.0
-    wrap-ansi: ^6.2.0
-  checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2
+    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
+  checksum: 2c6b47dcce6f9233df6d232a37d9834cb3657a0749ef6398f1706118de74c55f158587d4128c225297ea66803f35c5ac3db4f3f617046d817233c45eedc32ef1
   languageName: node
   linkType: hard
 
@@ -13361,28 +12792,35 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.14.1, lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.7.1":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
   languageName: node
   linkType: hard
 
-"lz-string@npm:^1.4.4":
-  version: 1.4.4
-  resolution: "lz-string@npm:1.4.4"
+"lru-cache@npm:^9.1.1 || ^10.0.0":
+  version: 10.0.1
+  resolution: "lru-cache@npm:10.0.1"
+  checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181
+  languageName: node
+  linkType: hard
+
+"lz-string@npm:^1.5.0":
+  version: 1.5.0
+  resolution: "lz-string@npm:1.5.0"
   bin:
     lz-string: bin/bin.js
-  checksum: 54e31238a61a84d8f664d9860a9fba7310c5b97a52c444f80543069bc084815eff40b8d4474ae1d93992fdf6c252dca37cf27f6adbeb4dbc3df2f3ac773d0e61
+  checksum: 1ee98b4580246fd90dd54da6e346fb1caefcf05f677c686d9af237a157fdea3fd7c83a4bc58f858cd5b10a34d27afe0fdcbd0505a47e0590726a873dc8b8f65d
   languageName: node
   linkType: hard
 
 "magic-string@npm:^0.25.0, magic-string@npm:^0.25.7":
-  version: 0.25.7
-  resolution: "magic-string@npm:0.25.7"
+  version: 0.25.9
+  resolution: "magic-string@npm:0.25.9"
   dependencies:
-    sourcemap-codec: ^1.4.4
-  checksum: 727a1fb70f9610304fe384f1df0251eb7d1d9dd779c07ef1225690361b71b216f26f5d934bfb11c919b5b0e7ba50f6240c823a6f2e44cfd33d4a07d7747ca829
+    sourcemap-codec: ^1.4.8
+  checksum: 9a0e55a15c7303fc360f9572a71cffba1f61451bc92c5602b1206c9d17f492403bf96f946dfce7483e66822d6b74607262e24392e87b0ac27b786e69a40e9b1a
   languageName: node
   linkType: hard
 
@@ -13396,7 +12834,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"make-dir@npm:^3.0.0, make-dir@npm:^3.0.2, make-dir@npm:^3.1.0":
+"make-dir@npm:^3.1.0":
   version: 3.1.0
   resolution: "make-dir@npm:3.1.0"
   dependencies:
@@ -13405,6 +12843,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"make-dir@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "make-dir@npm:4.0.0"
+  dependencies:
+    semver: ^7.5.3
+  checksum: bf0731a2dd3aab4db6f3de1585cea0b746bb73eb5a02e3d8d72757e376e64e6ada190b1eddcde5b2f24a81b688a9897efd5018737d05e02e2a671dda9cff8a8a
+  languageName: node
+  linkType: hard
+
 "make-error@npm:^1.1.1":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
@@ -13412,27 +12859,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3":
-  version: 10.2.1
-  resolution: "make-fetch-happen@npm:10.2.1"
+"make-fetch-happen@npm:^11.0.3":
+  version: 11.1.1
+  resolution: "make-fetch-happen@npm:11.1.1"
   dependencies:
     agentkeepalive: ^4.2.1
-    cacache: ^16.1.0
-    http-cache-semantics: ^4.1.0
+    cacache: ^17.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: ^3.1.6
-    minipass-collect: ^1.0.2
-    minipass-fetch: ^2.0.3
+    minipass: ^5.0.0
+    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: ^9.0.0
-  checksum: 2332eb9a8ec96f1ffeeea56ccefabcb4193693597b132cd110734d50f2928842e22b84cfa1508e921b8385cdfd06dda9ad68645fed62b50fff629a580f5fb72c
+    ssri: ^10.0.0
+  checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540
   languageName: node
   linkType: hard
 
@@ -13452,10 +12898,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"map-obj@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "map-obj@npm:4.1.0"
-  checksum: c62b22f23e58d742a093a0935fa904c92cc788d56132b75666160ac0c5704d3c677d28794594c7adf7ed0c177a96579e781dbf06e0a1b5d574c992a5c13877a3
+"map-obj@npm:^4.1.0":
+  version: 4.3.0
+  resolution: "map-obj@npm:4.3.0"
+  checksum: fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
   languageName: node
   linkType: hard
 
@@ -13467,18 +12913,18 @@ dexie@latest:
   linkType: hard
 
 "markdown-it-anchor@npm:^8.4.1":
-  version: 8.6.6
-  resolution: "markdown-it-anchor@npm:8.6.6"
+  version: 8.6.7
+  resolution: "markdown-it-anchor@npm:8.6.7"
   peerDependencies:
     "@types/markdown-it": "*"
     markdown-it: "*"
-  checksum: d67044f132cd94728227e065b2a82063a05ac5fb82a991c190fe48ac5ab308ed85f49a28e859bcf203e882af814902e67dd69724f6761c61709834b075cc6f95
+  checksum: 828236768ac7f61ed5591393c1b1bfc5dbf2b6d0c58a3deec606c61dddaa12658a34450cbef37ab50a04453e618ce1efd47d86e4e52595024334898fd306225b
   languageName: node
   linkType: hard
 
-"markdown-it@npm:13.0.1":
-  version: 13.0.1
-  resolution: "markdown-it@npm:13.0.1"
+"markdown-it@npm:13.0.2":
+  version: 13.0.2
+  resolution: "markdown-it@npm:13.0.2"
   dependencies:
     argparse: ^2.0.1
     entities: ~3.0.1
@@ -13487,7 +12933,7 @@ dexie@latest:
     uc.micro: ^1.0.5
   bin:
     markdown-it: bin/markdown-it.js
-  checksum: faf5891d389dc433bcf21d3fbff2009beb044b42b117c92f4848899780ca1a2282a209e3ff4672db4afed726a7248304ec473e6e242a7d6498af7113d31974e7
+  checksum: bb4bf2cb3e5d77a7f3dc9cf48e17d050fbcd26d37992204eaa5812220752858fe9debe439b2ae1de06e749a3bba537c0baf6ce7510307cf7163a70f04fafe672
   languageName: node
   linkType: hard
 
@@ -13507,11 +12953,11 @@ dexie@latest:
   linkType: hard
 
 "marked@npm:^4.0.10":
-  version: 4.2.5
-  resolution: "marked@npm:4.2.5"
+  version: 4.3.0
+  resolution: "marked@npm:4.3.0"
   bin:
     marked: bin/marked.js
-  checksum: dd7da20a3983c66b516463fad5dc8d15dc70e137d20b6dc491e134f671e84bd2ed5f859e2c35f21e56830a122e4356b9e574bcde49b72b7ad6bc121a215a1a98
+  checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260
   languageName: node
   linkType: hard
 
@@ -13539,10 +12985,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"mdn-data@npm:2.0.14":
-  version: 2.0.14
-  resolution: "mdn-data@npm:2.0.14"
-  checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16
+"mdn-data@npm:2.0.28":
+  version: 2.0.28
+  resolution: "mdn-data@npm:2.0.28"
+  checksum: f51d587a6ebe8e426c3376c74ea6df3e19ec8241ed8e2466c9c8a3904d5d04397199ea4f15b8d34d14524b5de926d8724ae85207984be47e165817c26e49e0aa
+  languageName: node
+  linkType: hard
+
+"mdn-data@npm:2.0.30":
+  version: 2.0.30
+  resolution: "mdn-data@npm:2.0.30"
+  checksum: d6ac5ac7439a1607df44b22738ecf83f48e66a0874e4482d6424a61c52da5cde5750f1d1229b6f5fa1b80a492be89465390da685b11f97d62b8adcc6e88189aa
   languageName: node
   linkType: hard
 
@@ -13554,11 +13007,11 @@ dexie@latest:
   linkType: hard
 
 "memfs@npm:^3.4.12":
-  version: 3.4.12
-  resolution: "memfs@npm:3.4.12"
+  version: 3.5.3
+  resolution: "memfs@npm:3.5.3"
   dependencies:
-    fs-monkey: ^1.0.3
-  checksum: dab8dec1ae0b2a92e4d563ac86846047cd7aeb17cde4ad51da85cff6e580c32d12b886354527788e36eb75f733dd8edbaf174476b7cea73fed9c5a0e45a6b428
+    fs-monkey: ^1.0.4
+  checksum: 18dfdeacad7c8047b976a6ccd58bc98ba76e122ad3ca0e50a21837fe2075fc0d9aafc58ab9cf2576c2b6889da1dd2503083f2364191b695273f40969db2ecc44
   languageName: node
   linkType: hard
 
@@ -13569,23 +13022,23 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"meow@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "meow@npm:9.0.0"
+"meow@npm:^10.1.5":
+  version: 10.1.5
+  resolution: "meow@npm:10.1.5"
   dependencies:
-    "@types/minimist": ^1.2.0
-    camelcase-keys: ^6.2.2
-    decamelize: ^1.2.0
+    "@types/minimist": ^1.2.2
+    camelcase-keys: ^7.0.0
+    decamelize: ^5.0.0
     decamelize-keys: ^1.1.0
     hard-rejection: ^2.1.0
     minimist-options: 4.1.0
-    normalize-package-data: ^3.0.0
-    read-pkg-up: ^7.0.1
-    redent: ^3.0.0
-    trim-newlines: ^3.0.0
-    type-fest: ^0.18.0
-    yargs-parser: ^20.2.3
-  checksum: 99799c47247f4daeee178e3124f6ef6f84bde2ba3f37652865d5d8f8b8adcf9eedfc551dd043e2455cd8206545fd848e269c0c5ab6b594680a0ad4d3617c9639
+    normalize-package-data: ^3.0.2
+    read-pkg-up: ^8.0.0
+    redent: ^4.0.0
+    trim-newlines: ^4.0.2
+    type-fest: ^1.2.2
+    yargs-parser: ^20.2.9
+  checksum: dd5f0caa4af18517813547dc66741dcbf52c4c23def5062578d39b11189fd9457aee5c1f2263a5cd6592a465023df8357e8ac876b685b64dbcf545e3f66c23a7
   languageName: node
   linkType: hard
 
@@ -13603,7 +13056,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:4.0.5, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
@@ -13661,7 +13114,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"min-indent@npm:^1.0.0":
+"min-indent@npm:^1.0.1":
   version: 1.0.1
   resolution: "min-indent@npm:1.0.1"
   checksum: bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1
@@ -13675,7 +13128,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.2":
+"minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
   version: 3.1.2
   resolution: "minimatch@npm:3.1.2"
   dependencies:
@@ -13685,20 +13138,20 @@ dexie@latest:
   linkType: hard
 
 "minimatch@npm:^5.0.1, minimatch@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "minimatch@npm:5.1.0"
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 15ce53d31a06361e8b7a629501b5c75491bc2b59712d53e802b1987121d91b433d73fcc5be92974fde66b2b51d8fb28d75a9ae900d249feb792bb1ba2a4f0a90
+  checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77
   languageName: node
   linkType: hard
 
-"minimatch@npm:^7.4.1":
-  version: 7.4.3
-  resolution: "minimatch@npm:7.4.3"
+"minimatch@npm:^9.0.1":
+  version: 9.0.3
+  resolution: "minimatch@npm:9.0.3"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: daa954231b6859e3ba0e5fbd2486986d3cae283bb69acb7ed3833c84a293f8d7edb8514360ea62c01426ba791446b2a1e1cc0d718bed15c0212cef35c59a6b95
+  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
   languageName: node
   linkType: hard
 
@@ -13713,10 +13166,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6":
-  version: 1.2.6
-  resolution: "minimist@npm:1.2.6"
-  checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb
+"minimist@npm:^1.2.0, minimist@npm:^1.2.6":
+  version: 1.2.8
+  resolution: "minimist@npm:1.2.8"
+  checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0
   languageName: node
   linkType: hard
 
@@ -13729,18 +13182,18 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"minipass-fetch@npm:^2.0.3":
-  version: 2.1.2
-  resolution: "minipass-fetch@npm:2.1.2"
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.4
+  resolution: "minipass-fetch@npm:3.0.4"
   dependencies:
     encoding: ^0.1.13
-    minipass: ^3.1.6
+    minipass: ^7.0.3
     minipass-sized: ^1.0.3
     minizlib: ^2.1.2
   dependenciesMeta:
     encoding:
       optional: true
-  checksum: 3f216be79164e915fc91210cea1850e488793c740534985da017a4cbc7a5ff50506956d0f73bb0cb60e4fe91be08b6b61ef35101706d3ef5da2c8709b5f08f91
+  checksum: af7aad15d5c128ab1ebe52e043bdf7d62c3c6f0cecb9285b40d7b395e1375b45dcdfd40e63e93d26a0e8249c9efd5c325c65575aceee192883970ff8cb11364a
   languageName: node
   linkType: hard
 
@@ -13771,19 +13224,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6":
-  version: 3.3.5
-  resolution: "minipass@npm:3.3.5"
+"minipass@npm:^3.0.0":
+  version: 3.3.6
+  resolution: "minipass@npm:3.3.6"
   dependencies:
     yallist: ^4.0.0
-  checksum: f89f02bcaa0e0e4bb4c44ec796008e69fbca62db0aba6ead1bc57d25bdaefdf42102130f4f9ecb7d9c6b6cd35ff7b0c7b97d001d3435da8e629fb68af3aea57e
+  checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.0.2, minipass@npm:^4.2.4":
-  version: 4.2.5
-  resolution: "minipass@npm:4.2.5"
-  checksum: 4f9c19af23a5d4a9e7156feefc9110634b178a8cff8f8271af16ec5ebf7e221725a97429952c856f5b17b30c2065ebd24c81722d90c93d2122611d75b952b48f
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3":
+  version: 7.0.4
+  resolution: "minipass@npm:7.0.4"
+  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
   languageName: node
   linkType: hard
 
@@ -13798,20 +13258,20 @@ dexie@latest:
   linkType: hard
 
 "mitt@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "mitt@npm:3.0.0"
-  checksum: f7be5049d27d18b1dbe9408452d66376fa60ae4a79fe9319869d1b90ae8cbaedadc7e9dab30b32d781411256d468be5538996bb7368941c09009ef6bbfa6bfc7
+  version: 3.0.1
+  resolution: "mitt@npm:3.0.1"
+  checksum: b55a489ac9c2949ab166b7f060601d3b6d893a852515ae9eca4e11df01c013876df777ea109317622b5c1c60e8aae252558e33c8c94e14124db38f64a39614b1
   languageName: node
   linkType: hard
 
 "mkdirp@npm:^0.5.1, mkdirp@npm:~0.5.1":
-  version: 0.5.5
-  resolution: "mkdirp@npm:0.5.5"
+  version: 0.5.6
+  resolution: "mkdirp@npm:0.5.6"
   dependencies:
-    minimist: ^1.2.5
+    minimist: ^1.2.6
   bin:
     mkdirp: bin/cmd.js
-  checksum: 3bce20ea525f9477befe458ab85284b0b66c8dc3812f94155af07c827175948cdd8114852ac6c6d82009b13c1048c37f6d98743eb019651ee25c39acc8aabe7d
+  checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
   languageName: node
   linkType: hard
 
@@ -13824,21 +13284,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"mkdirp@npm:^2.1.3":
-  version: 2.1.6
-  resolution: "mkdirp@npm:2.1.6"
-  bin:
-    mkdirp: dist/cjs/src/bin.js
-  checksum: 8a1d09ffac585e55f41c54f445051f5bc33a7de99b952bb04c576cafdf1a67bb4bae8cb93736f7da6838771fbf75bc630430a3a59e1252047d2278690bd150ee
-  languageName: node
-  linkType: hard
-
 "moo-color@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "moo-color@npm:1.0.2"
+  version: 1.0.3
+  resolution: "moo-color@npm:1.0.3"
   dependencies:
     color-name: ^1.1.4
-  checksum: 9425438cf14314ff8847fa911b3c6936cbe8550644c380733c4803719c3980a0de9324c70c3bc21c36b4aab3c181745774cc0efc4d3f5bfce009382eeeb89572
+  checksum: 02bf59b6bbd5e86641bc062e2dc0843e6e579e18ef67e1c8e93bfc01945df578f20e66ce16aa9632db2aa0e16806e0914a26eb345a804f45fff1ae12a8906a29
   languageName: node
   linkType: hard
 
@@ -13864,11 +13315,11 @@ dexie@latest:
   linkType: hard
 
 "nan@npm:*, nan@npm:^2.3.2":
-  version: 2.15.0
-  resolution: "nan@npm:2.15.0"
+  version: 2.18.0
+  resolution: "nan@npm:2.18.0"
   dependencies:
     node-gyp: latest
-  checksum: 33e1bb4dfca447fe37d4bb5889be55de154828632c8d38646db67293a21afd61ed9909cdf1b886214a64707d935926c4e60e2b09de9edfc2ad58de31d6ce8f39
+  checksum: 4fe42f58456504eab3105c04a5cffb72066b5f22bd45decf33523cb17e7d6abc33cca2a19829407b9000539c5cb25f410312d4dc5b30220167a3594896ea6a0a
   languageName: node
   linkType: hard
 
@@ -13881,20 +13332,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"native-request@npm:^1.0.5":
-  version: 1.0.8
-  resolution: "native-request@npm:1.0.8"
-  checksum: 7187fbe54d9874afcf19c14dbcbbf8aa04c1d5d6c3ae5c323f157373be80bf8aa84c4c69c58fa6d5005fd344eac9bf27fbda578e044da5e7059d27c0a36f1ddf
-  languageName: node
-  linkType: hard
-
-"natural-compare-lite@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "natural-compare-lite@npm:1.4.0"
-  checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225
-  languageName: node
-  linkType: hard
-
 "natural-compare@npm:^1.4.0":
   version: 1.4.0
   resolution: "natural-compare@npm:1.4.0"
@@ -13902,6 +13339,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"needle@npm:^3.1.0":
+  version: 3.2.0
+  resolution: "needle@npm:3.2.0"
+  dependencies:
+    debug: ^3.2.6
+    iconv-lite: ^0.6.3
+    sax: ^1.2.4
+  bin:
+    needle: bin/needle
+  checksum: d6f3e8668bbaf943d28ced0ad843eff793b56025e80152e511fd02313b8974e4dd9674bcbe3d8f9aa31882adb190dafe29ea5fce03a92b4724adf4850070bcfc
+  languageName: node
+  linkType: hard
+
 "negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
@@ -13961,30 +13411,16 @@ dexie@latest:
   dependencies:
     nan: "*"
     which: ^1.2.14
-    yargs: ^7.0.2
-  bin:
-    ncmake: lib/ncmake.js
-  checksum: 66404dc785c79cb7bea83f10036f71312da02e73a68b144f49fd1cfedfcbb52ab034dd8e82070ea6c7483b357bd7438f369438d8a633395f3debf1226fc9e4b4
-  languageName: node
-  linkType: hard
-
-"node-fetch@npm:2.6.11":
-  version: 2.6.11
-  resolution: "node-fetch@npm:2.6.11"
-  dependencies:
-    whatwg-url: ^5.0.0
-  peerDependencies:
-    encoding: ^0.1.0
-  peerDependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 249d0666a9497553384d46b5ab296ba223521ac88fed4d8a17d6ee6c2efb0fc890f3e8091cafe7f9fba8151a5b8d925db2671543b3409a56c3cd522b468b47b3
+    yargs: ^7.0.2
+  bin:
+    ncmake: lib/ncmake.js
+  checksum: 66404dc785c79cb7bea83f10036f71312da02e73a68b144f49fd1cfedfcbb52ab034dd8e82070ea6c7483b357bd7438f369438d8a633395f3debf1226fc9e4b4
   languageName: node
   linkType: hard
 
-"node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7, node-fetch@npm:^2.6.9":
-  version: 2.6.9
-  resolution: "node-fetch@npm:2.6.9"
+"node-fetch@npm:2.7.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
+  version: 2.7.0
+  resolution: "node-fetch@npm:2.7.0"
   dependencies:
     whatwg-url: ^5.0.0
   peerDependencies:
@@ -13992,18 +13428,19 @@ dexie@latest:
   peerDependenciesMeta:
     encoding:
       optional: true
-  checksum: acb04f9ce7224965b2b59e71b33c639794d8991efd73855b0b250921382b38331ffc9d61bce502571f6cc6e11a8905ca9b1b6d4aeb586ab093e2756a1fd190d0
+  checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
   languageName: node
   linkType: hard
 
 "node-gyp@npm:latest":
-  version: 9.2.0
-  resolution: "node-gyp@npm:9.2.0"
+  version: 9.4.0
+  resolution: "node-gyp@npm:9.4.0"
   dependencies:
     env-paths: ^2.2.0
+    exponential-backoff: ^3.1.1
     glob: ^7.1.4
     graceful-fs: ^4.2.6
-    make-fetch-happen: ^10.0.3
+    make-fetch-happen: ^11.0.3
     nopt: ^6.0.0
     npmlog: ^6.0.0
     rimraf: ^3.0.2
@@ -14012,7 +13449,7 @@ dexie@latest:
     which: ^2.0.2
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 91f0589eabbd37f0d4e3fe9918f1f9e25afc707f6e107f0133be19c5aac62e731d92abdc2b106258665a4487b18cc2878d3fcd3dc2c6cffd68da1cb2a5ccf450
+  checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99
   languageName: node
   linkType: hard
 
@@ -14023,17 +13460,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.12":
-  version: 2.0.12
-  resolution: "node-releases@npm:2.0.12"
-  checksum: b8c56db82c4642a0f443332b331a4396dae452a2ac5a65c8dbd93ef89ecb2fbb0da9d42ac5366d4764973febadca816cf7587dad492dce18d2a6b2af59cda260
-  languageName: node
-  linkType: hard
-
-"node-releases@npm:^2.0.8":
-  version: 2.0.10
-  resolution: "node-releases@npm:2.0.10"
-  checksum: d784ecde25696a15d449c4433077f5cce620ed30a1656c4abf31282bfc691a70d9618bae6868d247a67914d1be5cc4fde22f65a05f4398cdfb92e0fc83cadfbc
+"node-releases@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "node-releases@npm:2.0.13"
+  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
   languageName: node
   linkType: hard
 
@@ -14059,7 +13489,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0":
+"normalize-package-data@npm:^2.3.2":
   version: 2.5.0
   resolution: "normalize-package-data@npm:2.5.0"
   dependencies:
@@ -14071,28 +13501,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "normalize-package-data@npm:3.0.0"
+"normalize-package-data@npm:^3.0.2":
+  version: 3.0.3
+  resolution: "normalize-package-data@npm:3.0.3"
   dependencies:
-    hosted-git-info: ^3.0.6
-    resolve: ^1.17.0
-    semver: ^7.3.2
+    hosted-git-info: ^4.0.1
+    is-core-module: ^2.5.0
+    semver: ^7.3.4
     validate-npm-package-license: ^3.0.1
-  checksum: 665ad6e3d0463f56ee8acc1f8f71c5f62535e4c689ed389521c36e8fd34273306f978c934154de3a43f5b128ed7010872ce3381948f8d4a63d70f50ed01ac2e0
-  languageName: node
-  linkType: hard
-
-"normalize-path@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "normalize-path@npm:2.1.1"
-  dependencies:
-    remove-trailing-separator: ^1.0.1
-  checksum: 7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea
+  checksum: bbcee00339e7c26fdbc760f9b66d429258e2ceca41a5df41f5df06cc7652de8d82e8679ff188ca095cad8eff2b6118d7d866af2b68400f74602fbcbce39c160a
   languageName: node
   linkType: hard
 
-"normalize-path@npm:^3.0.0":
+"normalize-path@npm:3.0.0, normalize-path@npm:^3.0.0":
   version: 3.0.0
   resolution: "normalize-path@npm:3.0.0"
   checksum: 88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20
@@ -14106,19 +13527,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:^6.0.1":
-  version: 6.1.0
-  resolution: "normalize-url@npm:6.1.0"
-  checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50
-  languageName: node
-  linkType: hard
-
-"now-and-later@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "now-and-later@npm:2.0.1"
+"now-and-later@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "now-and-later@npm:3.0.0"
   dependencies:
-    once: ^1.3.2
-  checksum: a6715b9504b96f2603020e048f5ef7adc0693a1be1fbb46589d359d95f16df77207339d7bccf76295675f0f152f4ef145914b8775fa179c294833abef05b475f
+    once: ^1.4.0
+  checksum: 3e7dfdef7d6e0d7a82bf78c98a33b272593e6c8bb0bcfd2c82e0ae58677fe9e95674eb3137fd3835256935adf06f144834524722e24abefcb208d25d4256603c
   languageName: node
   linkType: hard
 
@@ -14180,10 +13594,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.0":
-  version: 2.2.2
-  resolution: "nwsapi@npm:2.2.2"
-  checksum: 43769106292bc95f776756ca2f3513dab7b4d506a97c67baec32406447841a35f65f29c1f95ab5d42785210fd41668beed33ca16fa058780be43b101ad73e205
+"nwsapi@npm:^2.2.2":
+  version: 2.2.7
+  resolution: "nwsapi@npm:2.2.7"
+  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
   languageName: node
   linkType: hard
 
@@ -14194,10 +13608,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.2, object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
-  version: 1.12.3
-  resolution: "object-inspect@npm:1.12.3"
-  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
+"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
+  version: 1.13.0
+  resolution: "object-inspect@npm:1.13.0"
+  checksum: 21353e910a3079466cb44adca71d8bef15bd8b87e518eb68bb33d82c5c70b83193993edce432cc92268f7dd02c4a8ab338663a011844367d0bd0559f6dde1fed
   languageName: node
   linkType: hard
 
@@ -14218,7 +13632,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.0.4, object.assign@npm:^4.1.0, object.assign@npm:^4.1.3, object.assign@npm:^4.1.4":
+"object.assign@npm:^4.1.0, object.assign@npm:^4.1.4":
   version: 4.1.4
   resolution: "object.assign@npm:4.1.4"
   dependencies:
@@ -14231,45 +13645,67 @@ dexie@latest:
   linkType: hard
 
 "object.entries@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "object.entries@npm:1.1.6"
+  version: 1.1.7
+  resolution: "object.entries@npm:1.1.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 0f8c47517e6a9a980241eafe3b73de11e59511883173c2b93d67424a008e47e11b77c80e431ad1d8a806f6108b225a1cab9223e53e555776c612a24297117d28
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: da287d434e7e32989586cd734382364ba826a2527f2bc82e6acbf9f9bfafa35d51018b66ec02543ffdfa2a5ba4af2b6f1ca6e588c65030cb4fd9c67d6ced594c
   languageName: node
   linkType: hard
 
 "object.fromentries@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "object.fromentries@npm:2.0.6"
+  version: 2.0.7
+  resolution: "object.fromentries@npm:2.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: 453c6d694180c0c30df451b60eaf27a5b9bca3fb43c37908fd2b78af895803dc631242bcf05582173afa40d8d0e9c96e16e8874b39471aa53f3ac1f98a085d85
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065
+  languageName: node
+  linkType: hard
+
+"object.groupby@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object.groupby@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+  checksum: d7959d6eaaba358b1608066fc67ac97f23ce6f573dc8fc661f68c52be165266fcb02937076aedb0e42722fdda0bdc0bbf74778196ac04868178888e9fd3b78b5
   languageName: node
   linkType: hard
 
 "object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+  version: 1.1.3
+  resolution: "object.hasown@npm:1.1.3"
   dependencies:
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: b936572536db0cdf38eb30afd2f1026a8b6f2cc5d2c4497c9d9bbb01eaf3e980dead4fd07580cfdd098e6383e5a9db8212d3ea0c6bdd2b5e68c60aa7e3b45566
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 76bc17356f6124542fb47e5d0e78d531eafa4bba3fc2d6fc4b1a8ce8b6878912366c0d99f37ce5c84ada8fd79df7aa6ea1214fddf721f43e093ad2df51f27da1
   languageName: node
   linkType: hard
 
 "object.values@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "object.values@npm:1.1.6"
+  version: 1.1.7
+  resolution: "object.values@npm:1.1.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-  checksum: f6fff9fd817c24cfd8107f50fb33061d81cd11bacc4e3dbb3852e9ff7692fde4dbce823d4333ea27cd9637ef1b6690df5fbb61f1ed314fa2959598dc3ae23d8e
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
+  languageName: node
+  linkType: hard
+
+"oidc-client-ts@npm:^2.2.5":
+  version: 2.3.0
+  resolution: "oidc-client-ts@npm:2.3.0"
+  dependencies:
+    crypto-js: ^4.1.1
+    jwt-decode: ^3.1.2
+  checksum: 74e20b8df748f901d67aba176f5f68bd8aa5ff7eed92dc92f34479dddc49e238dc722c757c5ab0f3365d170e3031343f650c789b51baa01062e8975c7580e15d
   languageName: node
   linkType: hard
 
@@ -14280,7 +13716,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.3.2, once@npm:^1.4.0":
+"once@npm:^1.3.0, once@npm:^1.4.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
@@ -14307,14 +13743,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"open@npm:^8.4.0":
-  version: 8.4.0
-  resolution: "open@npm:8.4.0"
+"open@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "open@npm:9.1.0"
   dependencies:
-    define-lazy-prop: ^2.0.0
-    is-docker: ^2.1.1
+    default-browser: ^4.0.0
+    define-lazy-prop: ^3.0.0
+    is-inside-container: ^1.0.0
     is-wsl: ^2.2.0
-  checksum: e9545bec64cdbf30a0c35c1bdc310344adf8428a117f7d8df3c0af0a0a24c513b304916a6d9b11db0190ff7225c2d578885080b761ed46a3d5f6f1eebb98b63c
+  checksum: 3993c0f61d51fed8ac290e99c9c3cf45d3b6cfb3e2aa2b74cafd312c3486c22fd81df16ac8f3ab91dd8a4e3e729a16fc2480cfc406c4833416cf908acf1ae7c9
   languageName: node
   linkType: hard
 
@@ -14332,17 +13769,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"optionator@npm:^0.9.1":
-  version: 0.9.1
-  resolution: "optionator@npm:0.9.1"
+"optionator@npm:^0.9.3":
+  version: 0.9.3
+  resolution: "optionator@npm:0.9.3"
   dependencies:
+    "@aashutoshrathi/word-wrap": ^1.2.3
     deep-is: ^0.1.3
     fast-levenshtein: ^2.0.6
     levn: ^0.4.1
     prelude-ls: ^1.2.1
     type-check: ^0.4.0
-    word-wrap: ^1.2.3
-  checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0
+  checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a
   languageName: node
   linkType: hard
 
@@ -14363,15 +13800,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"ordered-read-streams@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "ordered-read-streams@npm:1.0.1"
-  dependencies:
-    readable-stream: ^2.0.1
-  checksum: 7558ac1acd649164524be715d25e38a1aba0f34df9dfb8ce281f9d14589ac3506bfe66e6609fa8c9cf0d7835e11da33f3f5445336cf3eb783f81da09a1bc5fe8
-  languageName: node
-  linkType: hard
-
 "os-browserify@npm:0.3.0":
   version: 0.3.0
   resolution: "os-browserify@npm:0.3.0"
@@ -14413,6 +13841,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"p-limit@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "p-limit@npm:4.0.0"
+  dependencies:
+    yocto-queue: ^1.0.0
+  checksum: 01d9d70695187788f984226e16c903475ec6a947ee7b21948d6f597bed788e3112cc7ec2e171c1d37125057a5f45f3da21d8653e04a3a793589e12e9e80e756b
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^4.1.0":
   version: 4.1.0
   resolution: "p-locate@npm:4.1.0"
@@ -14431,6 +13868,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"p-locate@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "p-locate@npm:6.0.0"
+  dependencies:
+    p-limit: ^4.0.0
+  checksum: 2bfe5234efa5e7a4e74b30a5479a193fdd9236f8f6b4d2f3f69e3d286d9a7d7ab0c118a2a50142efcf4e41625def635bd9332d6cbf9cc65d85eb0718c579ab38
+  languageName: node
+  linkType: hard
+
 "p-map@npm:^4.0.0":
   version: 4.0.0
   resolution: "p-map@npm:4.0.0"
@@ -14447,6 +13893,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"pako@npm:2.1.0":
+  version: 2.1.0
+  resolution: "pako@npm:2.1.0"
+  checksum: 71666548644c9a4d056bcaba849ca6fd7242c6cf1af0646d3346f3079a1c7f4a66ffec6f7369ee0dc88f61926c10d6ab05da3e1fca44b83551839e89edd75a3e
+  languageName: node
+  linkType: hard
+
 "pako@npm:^1.0.11, pako@npm:~1.0.2":
   version: 1.0.11
   resolution: "pako@npm:1.0.11"
@@ -14534,6 +13987,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"parse-node-version@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "parse-node-version@npm:1.0.1"
+  checksum: c192393b6a978092c1ef8df2c42c0a02e4534b96543e23d335f1b9b5b913ac75473d18fe6050b58d6995c57fb383ee71a5cb8397e363caaf38a6df8215cc52fd
+  languageName: node
+  linkType: hard
+
 "parse-passwd@npm:^1.0.0":
   version: 1.0.0
   resolution: "parse-passwd@npm:1.0.0"
@@ -14548,12 +14008,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.0.0":
-  version: 7.1.1
-  resolution: "parse5@npm:7.1.1"
+"parse5@npm:^7.0.0, parse5@npm:^7.1.1":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
   dependencies:
     entities: ^4.4.0
-  checksum: 8f72fbfa6df83a3f29f58e1818f7bd46b47ff3e26d79c74e10b8fc7ef7ee76163f205113f1b2f6a5b8dc4e31e726f490444f04890cead6e974dbcbe8172b1321
+  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
   languageName: node
   linkType: hard
 
@@ -14574,13 +14034,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"path-dirname@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "path-dirname@npm:1.0.2"
-  checksum: 0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f
-  languageName: node
-  linkType: hard
-
 "path-exists@npm:^2.0.0":
   version: 2.1.0
   resolution: "path-exists@npm:2.1.0"
@@ -14597,6 +14050,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"path-exists@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "path-exists@npm:5.0.0"
+  checksum: 8ca842868cab09423994596eb2c5ec2a971c17d1a3cb36dbf060592c730c725cd524b9067d7d2a1e031fef9ba7bd2ac6dc5ec9fb92aa693265f7be3987045254
+  languageName: node
+  linkType: hard
+
 "path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
@@ -14625,13 +14085,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.6.1":
-  version: 1.6.3
-  resolution: "path-scurry@npm:1.6.3"
+"path-scurry@npm:^1.10.1":
+  version: 1.10.1
+  resolution: "path-scurry@npm:1.10.1"
   dependencies:
-    lru-cache: ^7.14.1
-    minipass: ^4.0.2
-  checksum: 814ebd7f8df717e2381dc707ba3a3ddf84d0a4f9d653036c7554cb1fea632d4d78eb17dd5f4c85111b78ba8b8c0a5b59c756645c9d343bdacacda4ba8d1626c2
+    lru-cache: ^9.1.1 || ^10.0.0
+    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
+  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
   languageName: node
   linkType: hard
 
@@ -14713,7 +14173,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"pidtree@npm:^0.6.0":
+"pidtree@npm:0.6.0":
   version: 0.6.0
   resolution: "pidtree@npm:0.6.0"
   bin:
@@ -14753,9 +14213,9 @@ dexie@latest:
   linkType: hard
 
 "pirates@npm:^4.0.4":
-  version: 4.0.5
-  resolution: "pirates@npm:4.0.5"
-  checksum: c9994e61b85260bec6c4fc0307016340d9b0c4f4b6550a957afaaff0c9b1ad58fbbea5cfcf083860a25cb27a375442e2b0edf52e2e1e40e69934e08dcc52d227
+  version: 4.0.6
+  resolution: "pirates@npm:4.0.6"
+  checksum: 46a65fefaf19c6f57460388a5af9ab81e3d7fd0e7bc44ca59d753cb5c4d0df97c6c6e583674869762101836d68675f027d60f841c105d72734df9dfca97cbcc6
   languageName: node
   linkType: hard
 
@@ -14770,7 +14230,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^4.1.0, pkg-dir@npm:^4.2.0":
+"pkg-dir@npm:^4.2.0":
   version: 4.2.0
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
@@ -14779,6 +14239,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"pkg-dir@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "pkg-dir@npm:7.0.0"
+  dependencies:
+    find-up: ^6.3.0
+  checksum: 94298b20a446bfbbd66604474de8a0cdd3b8d251225170970f15d9646f633e056c80520dd5b4c1d1050c9fed8f6a9e5054b141c93806439452efe72e57562c03
+  languageName: node
+  linkType: hard
+
 "platform@npm:1.3.6":
   version: 1.3.6
   resolution: "platform@npm:1.3.6"
@@ -14811,15 +14280,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-calc@npm:^8.2.3":
-  version: 8.2.4
-  resolution: "postcss-calc@npm:8.2.4"
+"postcss-calc@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "postcss-calc@npm:9.0.1"
   dependencies:
-    postcss-selector-parser: ^6.0.9
+    postcss-selector-parser: ^6.0.11
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.2
-  checksum: 314b4cebb0c4ed0cf8356b4bce71eca78f5a7842e6a3942a3bba49db168d5296b2bd93c3f735ae1c616f2651d94719ade33becc03c73d2d79c7394fb7f73eabb
+  checksum: 7327ed83bfec544ab8b3e38353baa72ff6d04378b856db4ad82dbd68ce0b73668867ef182b5d4025f9dd9aa9c64aacc50cd1bd9db8d8b51ccc4cb97866b9d72b
   languageName: node
   linkType: hard
 
@@ -14834,15 +14303,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-color-functional-notation@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-color-functional-notation@npm:5.1.0"
+"postcss-color-functional-notation@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "postcss-color-functional-notation@npm:6.0.2"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 336da1de9042764c9a436e030b80b16333fc7dd7dbaeb97d719fb11fe76da13ead50768e07a12a748988037a15562869d7e4be6b70a3556502c4f6bd592544db
+  checksum: 35f81de7107f6680fc11fcb70102f2ade204a6fc4dcf6a379b299b62a52b38f29d940f261c077a027792b33b81c23e71b992b8938ddd7c729a12035ca7fbc0e5
   languageName: node
   linkType: hard
 
@@ -14857,163 +14326,163 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-color-rebeccapurple@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "postcss-color-rebeccapurple@npm:8.0.2"
+"postcss-color-rebeccapurple@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-color-rebeccapurple@npm:9.0.1"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: e0f022fd87c9525822d78e6db9b71f4f7f64c7c87eb28b2c0aab79d5862bfc2d4d56270b8404e67fa20179c14edda163b387d8114778aaf6edeb6dfee6ea0a80
+  checksum: baf61a300dc4922a9bbcb34c3c7b224c53bd2a3f504fae3cd30ad62a8ded0dea61c5c8e2f15a554d810ff1c2c9f2d681d58f816ee1e6c6049152c76d242e1dca
   languageName: node
   linkType: hard
 
-"postcss-colormin@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "postcss-colormin@npm:5.3.0"
+"postcss-colormin@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-colormin@npm:6.0.0"
   dependencies:
-    browserslist: ^4.16.6
+    browserslist: ^4.21.4
     caniuse-api: ^3.0.0
     colord: ^2.9.1
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 3d3e3cc25071407fb73d68541ca1039ebd154fceb649041461a8a3cab0400cc89b42dbb34a4eeaf573be4ba2370ce23af5e01aff5e03a8d72275f40605577212
+  checksum: f7113758df45a198f4cf310b317e5bc49fcbd2648064245a5cddcb46e892593950592d4040136bf3b0c8fd64973b0dda3b4b0865b72b5bd94af244cf52418c67
   languageName: node
   linkType: hard
 
-"postcss-convert-values@npm:^5.1.3":
-  version: 5.1.3
-  resolution: "postcss-convert-values@npm:5.1.3"
+"postcss-convert-values@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-convert-values@npm:6.0.0"
   dependencies:
     browserslist: ^4.21.4
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: df48cdaffabf9737f9cfdc58a3dc2841cf282506a7a944f6c70236cff295d3a69f63de6e0935eeb8a9d3f504324e5b4e240abc29e21df9e35a02585d3060aeb5
+  checksum: 511ca9358148fc336808d0f58f1e6ad330b73c1a87f32581f3d541ffa66cb61f2a36c8e76d1defb7c54c577c83f11d9bf2eb0d27a83c963c315b8eb149935bd7
   languageName: node
   linkType: hard
 
-"postcss-custom-media@npm:^9.1.5":
-  version: 9.1.5
-  resolution: "postcss-custom-media@npm:9.1.5"
+"postcss-custom-media@npm:^10.0.2":
+  version: 10.0.2
+  resolution: "postcss-custom-media@npm:10.0.2"
   dependencies:
-    "@csstools/cascade-layer-name-parser": ^1.0.2
-    "@csstools/css-parser-algorithms": ^2.2.0
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/media-query-list-parser": ^2.1.1
+    "@csstools/cascade-layer-name-parser": ^1.0.5
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/media-query-list-parser": ^2.1.5
   peerDependencies:
     postcss: ^8.4
-  checksum: 1c838c2c0ce0c5511902a4e2391d8db7afc82091d1ba213190a7ea9af341285600dd0ff3ffce549cad73fed5ccebf90ddda8bfe58d191c3c611bcc150da6b49c
+  checksum: fc249688ce87016d55e2cbb32172f11ad58beb3a2786d42e98f956f8805487c997b79f4ca3d0fec559b89e8f353beb387b7d482955789233d0b06242ca4ef80f
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^13.2.0":
-  version: 13.2.0
-  resolution: "postcss-custom-properties@npm:13.2.0"
+"postcss-custom-properties@npm:^13.3.2":
+  version: 13.3.2
+  resolution: "postcss-custom-properties@npm:13.3.2"
   dependencies:
-    "@csstools/cascade-layer-name-parser": ^1.0.2
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
+    "@csstools/cascade-layer-name-parser": ^1.0.5
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: b6a7563354bebb8489c54785fbefb6f1a78cfbfa691017a337ce0d446f5adba2acf30dae5efcc480c419191d165f37b9a1397a1971d77bf84b88939a1c650ff7
+  checksum: d53f6b2514b9d144008e646c16bd000d3536aec5776941bd1452d39fe9b173e131b429672e946fd1811820d2dc2938f7ea20b52f1c7abd2a713644b8d43fdcc4
   languageName: node
   linkType: hard
 
-"postcss-custom-selectors@npm:^7.1.3":
-  version: 7.1.3
-  resolution: "postcss-custom-selectors@npm:7.1.3"
+"postcss-custom-selectors@npm:^7.1.6":
+  version: 7.1.6
+  resolution: "postcss-custom-selectors@npm:7.1.6"
   dependencies:
-    "@csstools/cascade-layer-name-parser": ^1.0.2
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    postcss-selector-parser: ^6.0.4
+    "@csstools/cascade-layer-name-parser": ^1.0.5
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 9c9b665a29b613b4c2ee03d0cb774ff85543c3eb9bb809dc52aefe8e1cea21739e8cc4288a8fe251cca5044ebe0c1133eab97b332551f8b88c7b30b91c343205
+  checksum: b37ff361a2252c1a671c091ae4d7bed4d1c0f956a24c0e71446e35aabe2822a85b11d2bc5b145af263feeecfc7799babeb456672a868fd43fe4f09fcdd1d018d
   languageName: node
   linkType: hard
 
-"postcss-dir-pseudo-class@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-dir-pseudo-class@npm:7.0.2"
+"postcss-dir-pseudo-class@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-dir-pseudo-class@npm:8.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: b543ca864cda559ff05043db1ec569653528c5d7c1cdf3f561f58bc04b7c5350a50941eee67273acbcd19029d6c8be2149a5a2be21d01611690e505c064926dd
+  checksum: 4a951409b3641e2bc8a0319937688cdfaa4a90e60b7ae822f3392d7519cd6728e07193452f59ab48c7cc2acf2c71365661c000151b763e3f8dcc998701e1daca
   languageName: node
   linkType: hard
 
-"postcss-discard-comments@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "postcss-discard-comments@npm:5.1.2"
+"postcss-discard-comments@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-discard-comments@npm:6.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: abfd064ebc27aeaf5037643dd51ffaff74d1fa4db56b0523d073ace4248cbb64ffd9787bd6924b0983a9d0bd0e9bf9f10d73b120e50391dc236e0d26c812fa2a
+  checksum: 9be073707b5ef781c616ddd32ffd98faf14bf8b40027f341d5a4fb7989fa7b017087ad54146a370fe38295b1f2568b9f5522f4e4c1a1d09fe0e01abd9f5ae00d
   languageName: node
   linkType: hard
 
-"postcss-discard-duplicates@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-discard-duplicates@npm:5.1.0"
+"postcss-discard-duplicates@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-discard-duplicates@npm:6.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 88d6964201b1f4ed6bf7a32cefe68e86258bb6e42316ca01d9b32bdb18e7887d02594f89f4a2711d01b51ea6e3fcca8c54be18a59770fe5f4521c61d3eb6ca35
+  checksum: 999dfc652a60c96f782cc37fbe0d04a89bec88b5ed943f06555166eebf03c6ee47cd56947f1373d84c8161687d1ca23ff6badd1278b5482c506614cf617bc21d
   languageName: node
   linkType: hard
 
-"postcss-discard-empty@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-discard-empty@npm:5.1.1"
+"postcss-discard-empty@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-discard-empty@npm:6.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 970adb12fae5c214c0768236ad9a821552626e77dedbf24a8213d19cc2c4a531a757cd3b8cdd3fc22fb1742471b8692a1db5efe436a71236dec12b1318ee8ff4
+  checksum: 0d6cc604719d4a70569db77de75e60b3b7e9b99a4521879f6047d71325556e9f46d6bd13aecbbd857c35f075c503c1f8b1be442329fb8e9653c24cbf2fb42f3e
   languageName: node
   linkType: hard
 
-"postcss-discard-overridden@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-discard-overridden@npm:5.1.0"
+"postcss-discard-overridden@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-discard-overridden@npm:6.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: d64d4a545aa2c81b22542895cfcddc787d24119f294d35d29b0599a1c818b3cc51f4ee80b80f5a0a09db282453dd5ac49f104c2117cc09112d0ac9b40b499a41
+  checksum: f2d244bb574cf2c0974c56a1af7131f3833e14515be99c68e6fa6fe82df47cb2c9befa413b9ec92f5f067567c682dc253980a0dede3cc697f6cc9135dfc17ec7
   languageName: node
   linkType: hard
 
-"postcss-double-position-gradients@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "postcss-double-position-gradients@npm:4.0.4"
+"postcss-double-position-gradients@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "postcss-double-position-gradients@npm:5.0.2"
   dependencies:
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 2880eebd4166edc67e75c031c4fae097f511c45c399e975a39a414dd25618e05cce322ecd3f845f642ab66ab0f84788cc3713902d3e716513b1bd70292ffbc4f
+  checksum: c8bfa195bef375514c47042cd71f557b8f02060e689e496ec28e380d1b835d47edfcc73905bbc0a42a98a0e0c20919e21b51d213a184ca34fcfee911b0e2187c
   languageName: node
   linkType: hard
 
-"postcss-focus-visible@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "postcss-focus-visible@npm:8.0.2"
+"postcss-focus-visible@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-focus-visible@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 4ed4d60b58a4c4a063a0f4c1d182c65174bd2e4a0e03d90a59732020b659a2aa9649439eda7e82ddfd12f91f50681d223715e6a1b13167d01873a780d51c163b
+  checksum: 2a262056453387da4c614d6be4d9dede919202b1746e20d87b4194b169bfa29bb47bbbd37b1689ebe27c8695ed8f622d5893d0cbac0bd59bdeab9540b090ab6c
   languageName: node
   linkType: hard
 
-"postcss-focus-within@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "postcss-focus-within@npm:7.0.2"
+"postcss-focus-within@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-focus-within@npm:8.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 742517d246910790d5d98b6dfe18f86293e2ace1311bea94e19080bb24548ac6ac8329b012756f82ddc29295f7fd6f17f544f98bcfea83bd53b4f8c90b38e82d
+  checksum: cf0d175c5c09c99df5c59d5b0ed16f6071e7d493d3366bcb660c772b7518fbd7da3b97a2228b39ad8edb47cd0331bf37ccaed928b069f39402741aa781a1f999
   languageName: node
   linkType: hard
 
@@ -15026,23 +14495,23 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-gap-properties@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-gap-properties@npm:4.0.1"
+"postcss-gap-properties@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-gap-properties@npm:5.0.0"
   peerDependencies:
     postcss: ^8.4
-  checksum: 21a5d5525d8c7c93a1ddb53755919aef1030187d45a118a7281c20a281305233672364d510bbf6cfbe28d564cb2e4435e2caa8f5075f702ee371de1d35df4720
+  checksum: 42481ce5f272e722ce623c8aa21f2d18b5da250c8fa18ddbb72725c8c158f2894e3f682c7adfb2451ba01bc07fbc5168182e021d779d96e64f7b1604149db6e5
   languageName: node
   linkType: hard
 
-"postcss-image-set-function@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "postcss-image-set-function@npm:5.0.2"
+"postcss-image-set-function@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-image-set-function@npm:6.0.1"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: 95dc50d2cc26ddf467630b80a26508a17af02498e89e06d1fe2a52a896337524ea174f330bc770b876d00dad9ab5e94064f1c16de107fa5cda4fe33417a085e6
+  checksum: 0a4043591af3b92725f439651330cfb0a43f1388772e7aa4441ceee502e347bd131e71b1bcaa3fc50205195f1e00513d3d515108c4de6f57a60b1b06a28ca9a0
   languageName: node
   linkType: hard
 
@@ -15059,26 +14528,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-initial@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-initial@npm:4.0.1"
-  peerDependencies:
-    postcss: ^8.0.0
-  checksum: 6956953853865de79c39d11533a2860e9f38b770bb284d0010d98a00b9469e22de344e4e5fd8208614d797030487e8918dd2f2c37d9e24d4dd59d565d4fc3e12
-  languageName: node
-  linkType: hard
-
-"postcss-lab-function@npm:^5.2.3":
-  version: 5.2.3
-  resolution: "postcss-lab-function@npm:5.2.3"
+"postcss-lab-function@npm:^6.0.7":
+  version: 6.0.7
+  resolution: "postcss-lab-function@npm:6.0.7"
   dependencies:
-    "@csstools/css-color-parser": ^1.2.0
-    "@csstools/css-parser-algorithms": ^2.1.1
-    "@csstools/css-tokenizer": ^2.1.1
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
+    "@csstools/css-color-parser": ^1.4.0
+    "@csstools/css-parser-algorithms": ^2.3.2
+    "@csstools/css-tokenizer": ^2.2.1
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
   peerDependencies:
     postcss: ^8.4
-  checksum: 213b97e20f31398ebd2a61bf24f03cc7bf05d00cc983a50a4016adc48d0268194b3dbc8ca4abada8bd89d6ae34d92303c4b1ff01dfdb7dd3c8cad67b1b0bdeb7
+  checksum: f9c53bf0b7a44b55350b902a98cb744c741ec1aade222fd8078fe556b5af9ac071b695a6d31b595c5a305dccd49612724ad95e32a5f0c63fc718e599d093b089
   languageName: node
   linkType: hard
 
@@ -15105,95 +14565,88 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-logical@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "postcss-logical@npm:6.2.0"
+"postcss-logical@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-logical@npm:7.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: e5dbc9abc88a820714aa89f90865c9f08d8391ab3f96b326f7b4c6923d9c543aee691f3661e7ba873dcbc0f89d495a2da8a9b369ca14c15c2c6bf8c44457f917
-  languageName: node
-  linkType: hard
-
-"postcss-media-query-parser@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "postcss-media-query-parser@npm:0.2.3"
-  checksum: 8000d4d95b912994928ff86137f5ab0ed4c4ee1498af2336e93d708ae8827a690cd7acbaed55d14684cf44d82c8d44b031c1c69ae6bcd2f9620ea67573888090
+  checksum: 1d8c0f97dfc4ab3fed5f9dd6718f52e35ac00f3612ddf477771a4a0e2027f92be69f97d4dcdde275bcef680c2ac9af9dce455b87b82639926ff4a731c31986f8
   languageName: node
   linkType: hard
 
-"postcss-merge-longhand@npm:^5.1.7":
-  version: 5.1.7
-  resolution: "postcss-merge-longhand@npm:5.1.7"
+"postcss-merge-longhand@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-merge-longhand@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
-    stylehacks: ^5.1.1
+    stylehacks: ^6.0.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 81c3fc809f001b9b71a940148e242bdd6e2d77713d1bfffa15eb25c1f06f6648d5e57cb21645746d020a2a55ff31e1740d2b27900442913a9d53d8a01fb37e1b
+  checksum: 86d1eda1b845cc7bc781a18db714d8e3ed639f673a7a9f416ecae8b8822235a87724e32d06477c707b40bc2ef96a16e87d831b89188354921791fce0de50103b
   languageName: node
   linkType: hard
 
-"postcss-merge-rules@npm:^5.1.3":
-  version: 5.1.3
-  resolution: "postcss-merge-rules@npm:5.1.3"
+"postcss-merge-rules@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-merge-rules@npm:6.0.1"
   dependencies:
     browserslist: ^4.21.4
     caniuse-api: ^3.0.0
-    cssnano-utils: ^3.1.0
+    cssnano-utils: ^4.0.0
     postcss-selector-parser: ^6.0.5
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 0ddaddff98cd7f3fac2b0e716c641f529a61a8668be6d5b48d60770d0a1246126088e1d606f309b9748ff598a3794f3fd6dd5b8c3d79112f84744cab5375d4d9
+  checksum: db003c820319181647806f087ead22598faffee745713026b5c8ea637936dc737a55fdc8d7631731879f49ba675a880dda174f21ae62c8f5aa4b0fda1a81f19a
   languageName: node
   linkType: hard
 
-"postcss-minify-font-values@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-minify-font-values@npm:5.1.0"
+"postcss-minify-font-values@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-minify-font-values@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 35e858fa41efa05acdeb28f1c76579c409fdc7eabb1744c3bd76e895bb9fea341a016746362a67609688ab2471f587202b9a3e14ea28ad677754d663a2777ece
+  checksum: 60de1e405a8849387714980d85f30c8e3df4b7b3083850086656ef50cdaf41605426373f28c0c43dcadfd1d78816b8e425571f12a024120dced1c7e8facb5073
   languageName: node
   linkType: hard
 
-"postcss-minify-gradients@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-minify-gradients@npm:5.1.1"
+"postcss-minify-gradients@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-minify-gradients@npm:6.0.0"
   dependencies:
     colord: ^2.9.1
-    cssnano-utils: ^3.1.0
+    cssnano-utils: ^4.0.0
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 27354072a07c5e6dab36731103b94ca2354d4ed3c5bc6aacfdf2ede5a55fa324679d8fee5450800bc50888dbb5e9ed67569c0012040c2be128143d0cebb36d67
+  checksum: f2399211f78b88d122f4c7248cb2cc887b49304eb3315c7332c6216aec361113aca6fe0dac43289f70f0c3f25c97fb10cd74417aab5c2f5f51b64b1ef2c5af13
   languageName: node
   linkType: hard
 
-"postcss-minify-params@npm:^5.1.4":
-  version: 5.1.4
-  resolution: "postcss-minify-params@npm:5.1.4"
+"postcss-minify-params@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-minify-params@npm:6.0.0"
   dependencies:
     browserslist: ^4.21.4
-    cssnano-utils: ^3.1.0
+    cssnano-utils: ^4.0.0
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: bd63e2cc89edcf357bb5c2a16035f6d02ef676b8cede4213b2bddd42626b3d428403849188f95576fc9f03e43ebd73a29bf61d33a581be9a510b13b7f7f100d5
+  checksum: 1cd9e372cfa27a9849f6994b03cc031534b519299bd1e392062b524405ba76906d23261ab5c0bb505289343c8ffb6a44414265f96a3e04a28181493eb032af01
   languageName: node
   linkType: hard
 
-"postcss-minify-selectors@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "postcss-minify-selectors@npm:5.2.1"
+"postcss-minify-selectors@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-minify-selectors@npm:6.0.0"
   dependencies:
     postcss-selector-parser: ^6.0.5
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 6fdbc84f99a60d56b43df8930707da397775e4c36062a106aea2fd2ac81b5e24e584a1892f4baa4469fa495cb87d1422560eaa8f6c9d500f9f0b691a5f95bab5
+  checksum: 13ce0a1055fdc4571df8d289c4e5dac983e22ac9b449af2c1418ea536b9176a5354d1a487cc0047789f0981053263675d50c7db7cba99588ecb7ff0045fba818
   languageName: node
   linkType: hard
 
@@ -15241,114 +14694,113 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-nesting@npm:^11.3.0":
-  version: 11.3.0
-  resolution: "postcss-nesting@npm:11.3.0"
+"postcss-nesting@npm:^12.0.1":
+  version: 12.0.1
+  resolution: "postcss-nesting@npm:12.0.1"
   dependencies:
-    "@csstools/selector-specificity": ^2.0.0
-    postcss-selector-parser: ^6.0.10
+    "@csstools/selector-specificity": ^3.0.0
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: bc8f59e8114f21ec3fcbd0661072f3e706f25dc5300a925863485a0ab82950c48b75c1fed9548acddc924fa479ab7277b55fcdcc33eb0fe1742b389683479384
+  checksum: fa6157fbdc9109b3859cdb925ec8357ea7c9c984110015381a55e63770d1b5aaddaac5f5816a32b9efbb55fbdb87f8187ff7fc2db24331c82b2f74091aa9ba06
   languageName: node
   linkType: hard
 
-"postcss-normalize-charset@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-charset@npm:5.1.0"
+"postcss-normalize-charset@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-charset@npm:6.0.0"
   peerDependencies:
     postcss: ^8.2.15
-  checksum: e79d92971fc05b8b3c9b72f3535a574e077d13c69bef68156a0965f397fdf157de670da72b797f57b0e3bac8f38155b5dd1735ecab143b9cc4032d72138193b4
+  checksum: 186a94083f6d41dbda884bf915ff7fe9d9d19828c50dbf02a7e00c90673bec52e5962afd648220598c40940fb1ed5b93bc25697c395cd38ef30b6fd04e48580e
   languageName: node
   linkType: hard
 
-"postcss-normalize-display-values@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-display-values@npm:5.1.0"
+"postcss-normalize-display-values@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-display-values@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: b6eb7b9b02c3bdd62bbc54e01e2b59733d73a1c156905d238e178762962efe0c6f5104544da39f32cade8a4fb40f10ff54b63a8ebfbdff51e8780afb9fbdcf86
+  checksum: 4f8da7cf817e4c66004d3b2d88603aeadc7f9b55caca1bbba27f45e81ae8c65db8ff252488c8fd9ebb3e5c62f85e475131dcee9754346320453bc2b40865afd9
   languageName: node
   linkType: hard
 
-"postcss-normalize-positions@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-positions@npm:5.1.1"
+"postcss-normalize-positions@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-positions@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: d9afc233729c496463c7b1cdd06732469f401deb387484c3a2422125b46ec10b4af794c101f8c023af56f01970b72b535e88373b9058ecccbbf88db81662b3c4
+  checksum: 34dedb07f906b28eb77c57be34899c5c694b81b91c6bfff1e6e9a251aa8f28fea0fdb35a7cdda0fc83e4248b078343a2d76e4485c3ef87f469b24332fa1788cd
   languageName: node
   linkType: hard
 
-"postcss-normalize-repeat-style@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-repeat-style@npm:5.1.1"
+"postcss-normalize-repeat-style@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-repeat-style@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 2c6ad2b0ae10a1fda156b948c34f78c8f1e185513593de4d7e2480973586675520edfec427645fa168c337b0a6b3ceca26f92b96149741ca98a9806dad30d534
+  checksum: a53b994bb6594f5c48bd7083a46e6a47c1cf02843bcb864d37e7919c08a6f1d7dbbfee8a6abc2afb5d15554b667abc69d696b90d43066ceb97f835e6c8272098
   languageName: node
   linkType: hard
 
-"postcss-normalize-string@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-string@npm:5.1.0"
+"postcss-normalize-string@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-string@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 6e549c6e5b2831e34c7bdd46d8419e2278f6af1d5eef6d26884a37c162844e60339340c57e5e06058cdbe32f27fc6258eef233e811ed2f71168ef2229c236ada
+  checksum: 3d55f31ec0d008e7c8e8db0dc03e6e4f2cf8365f6578a0929b7098753c9db3c7de56a134d011fb3c9d8af8b004f0776169194cdfa25654af4919634cdb6ba7b0
   languageName: node
   linkType: hard
 
-"postcss-normalize-timing-functions@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-timing-functions@npm:5.1.0"
+"postcss-normalize-timing-functions@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-timing-functions@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: da550f50e90b0b23e17b67449a7d1efd1aa68288e66d4aa7614ca6f5cc012896be1972b7168eee673d27da36504faccf7b9f835c0f7e81243f966a42c8c030aa
+  checksum: 67021374f8f18474788d8bc99d31af6a13efc5baf961c1e9f0c6b1e265fb21ac1ad56c489d988fcde9e0d049e9b62c8b0b350cc1e79d7d3bff9f00f7c97d6221
   languageName: node
   linkType: hard
 
-"postcss-normalize-unicode@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-unicode@npm:5.1.1"
+"postcss-normalize-unicode@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-unicode@npm:6.0.0"
   dependencies:
     browserslist: ^4.21.4
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 4c24d26cc9f4b19a9397db4e71dd600dab690f1de8e14a3809e2aa1452dbc3791c208c38a6316bbc142f29e934fdf02858e68c94038c06174d78a4937e0f273c
+  checksum: 0f246bf5511ae2294d8ec0decda6abee58c62e301a3a8f6542fa090bb426359caee156b96cc1e7f4b3a3f2cd9f62b410a446cf101e710d8fa71c704cfb057a5d
   languageName: node
   linkType: hard
 
-"postcss-normalize-url@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-normalize-url@npm:5.1.0"
+"postcss-normalize-url@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-url@npm:6.0.0"
   dependencies:
-    normalize-url: ^6.0.1
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 3bd4b3246d6600230bc827d1760b24cb3101827ec97570e3016cbe04dc0dd28f4dbe763245d1b9d476e182c843008fbea80823061f1d2219b96f0d5c724a24c0
+  checksum: 93160c02e54c45cbe8ade7122bf34e25c41ac39656b2ddb15d342ce557efc17873fc6dd1439dd8d814152ebdfbba3ee2c16601d41b085ecaad73e6f2d037cd43
   languageName: node
   linkType: hard
 
-"postcss-normalize-whitespace@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-normalize-whitespace@npm:5.1.1"
+"postcss-normalize-whitespace@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-normalize-whitespace@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 12d8fb6d1c1cba208cc08c1830959b7d7ad447c3f5581873f7e185f99a9a4230c43d3af21ca12c818e4690a5085a95b01635b762ad4a7bef69d642609b4c0e19
+  checksum: 77940955fb0b47b46468a3e17bb9b86eb2f2c572649271a4db600b981f68c9c1ed71197b58d7a351c1b2d1aee2eb79b1e11b3021eb28604fd1a8d0ded21dfb2a
   languageName: node
   linkType: hard
 
@@ -15361,26 +14813,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-ordered-values@npm:^5.1.3":
-  version: 5.1.3
-  resolution: "postcss-ordered-values@npm:5.1.3"
+"postcss-ordered-values@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-ordered-values@npm:6.0.0"
   dependencies:
-    cssnano-utils: ^3.1.0
+    cssnano-utils: ^4.0.0
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 6f3ca85b6ceffc68aadaf319d9ee4c5ac16d93195bf8cba2d1559b631555ad61941461cda6d3909faab86e52389846b2b36345cff8f0c3f4eb345b1b8efadcf9
+  checksum: 162d60e9fd7d6717457194e943ba63ed6d149ae3b4f150324e65b485312be5d1c99ae140e47698e9f8943967c1575b65c922081263a8fa22a2489ed705eb0202
   languageName: node
   linkType: hard
 
-"postcss-overflow-shorthand@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-overflow-shorthand@npm:4.0.1"
+"postcss-overflow-shorthand@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "postcss-overflow-shorthand@npm:5.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: f0efcea4fb6583e5746c221d75113e8074a1212e385e04892e66715555ed1c784f23ae1ed52374b799461f91b63fdde40318dfc4a69eef002e4778d38445818d
+  checksum: 9f14c56f00736dd19838d6f833e58cb5e87d214c521b8d49d430abb106c9a6e7c7eb6a439b3d6699f1b0667d1a43a5dc60947a267321430d293272509b01fb82
   languageName: node
   linkType: hard
 
@@ -15393,114 +14845,116 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-place@npm:^8.0.1":
-  version: 8.0.1
-  resolution: "postcss-place@npm:8.0.1"
+"postcss-place@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-place@npm:9.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: c812c858aa3337efe55f86c4a3675db499870b9be637dc5338161b89ed95ef3e9d11bd9b37873b8fbb5e5e05d84aecc51e8e357c57e3ef78191219e8b6413ea7
-  languageName: node
-  linkType: hard
-
-"postcss-preset-env@npm:^8.5.1":
-  version: 8.5.1
-  resolution: "postcss-preset-env@npm:8.5.1"
-  dependencies:
-    "@csstools/postcss-cascade-layers": ^3.0.1
-    "@csstools/postcss-color-function": ^2.2.3
-    "@csstools/postcss-color-mix-function": ^1.0.3
-    "@csstools/postcss-font-format-keywords": ^2.0.2
-    "@csstools/postcss-gradients-interpolation-method": ^3.0.6
-    "@csstools/postcss-hwb-function": ^2.2.2
-    "@csstools/postcss-ic-unit": ^2.0.4
-    "@csstools/postcss-is-pseudo-class": ^3.2.1
-    "@csstools/postcss-logical-float-and-clear": ^1.0.1
-    "@csstools/postcss-logical-resize": ^1.0.1
-    "@csstools/postcss-logical-viewport-units": ^1.0.3
-    "@csstools/postcss-media-minmax": ^1.0.4
-    "@csstools/postcss-media-queries-aspect-ratio-number-values": ^1.0.4
-    "@csstools/postcss-nested-calc": ^2.0.2
-    "@csstools/postcss-normalize-display-values": ^2.0.1
-    "@csstools/postcss-oklab-function": ^2.2.3
-    "@csstools/postcss-progressive-custom-properties": ^2.3.0
-    "@csstools/postcss-relative-color-syntax": ^1.0.2
-    "@csstools/postcss-scope-pseudo-class": ^2.0.2
-    "@csstools/postcss-stepped-value-functions": ^2.1.1
-    "@csstools/postcss-text-decoration-shorthand": ^2.2.4
-    "@csstools/postcss-trigonometric-functions": ^2.1.1
-    "@csstools/postcss-unset-value": ^2.0.1
-    autoprefixer: ^10.4.14
-    browserslist: ^4.21.9
-    css-blank-pseudo: ^5.0.2
-    css-has-pseudo: ^5.0.2
-    css-prefers-color-scheme: ^8.0.2
-    cssdb: ^7.6.0
+  checksum: 5ca970f19f5078406d3349cc200057cdee4d7b5fb58b6872aa06a55c4cae5e28c9726bd6cf5ba3fd6a4f85f26cd3db804e4e26da09ff8519b2eb49824097cbd0
+  languageName: node
+  linkType: hard
+
+"postcss-preset-env@npm:^9.2.0":
+  version: 9.2.0
+  resolution: "postcss-preset-env@npm:9.2.0"
+  dependencies:
+    "@csstools/postcss-cascade-layers": ^4.0.0
+    "@csstools/postcss-color-function": ^3.0.7
+    "@csstools/postcss-color-mix-function": ^2.0.7
+    "@csstools/postcss-exponential-functions": ^1.0.1
+    "@csstools/postcss-font-format-keywords": ^3.0.0
+    "@csstools/postcss-gamut-mapping": ^1.0.0
+    "@csstools/postcss-gradients-interpolation-method": ^4.0.7
+    "@csstools/postcss-hwb-function": ^3.0.6
+    "@csstools/postcss-ic-unit": ^3.0.2
+    "@csstools/postcss-initial": ^1.0.0
+    "@csstools/postcss-is-pseudo-class": ^4.0.3
+    "@csstools/postcss-logical-float-and-clear": ^2.0.0
+    "@csstools/postcss-logical-resize": ^2.0.0
+    "@csstools/postcss-logical-viewport-units": ^2.0.3
+    "@csstools/postcss-media-minmax": ^1.1.0
+    "@csstools/postcss-media-queries-aspect-ratio-number-values": ^2.0.3
+    "@csstools/postcss-nested-calc": ^3.0.0
+    "@csstools/postcss-normalize-display-values": ^3.0.1
+    "@csstools/postcss-oklab-function": ^3.0.7
+    "@csstools/postcss-progressive-custom-properties": ^3.0.2
+    "@csstools/postcss-relative-color-syntax": ^2.0.7
+    "@csstools/postcss-scope-pseudo-class": ^3.0.0
+    "@csstools/postcss-stepped-value-functions": ^3.0.2
+    "@csstools/postcss-text-decoration-shorthand": ^3.0.3
+    "@csstools/postcss-trigonometric-functions": ^3.0.2
+    "@csstools/postcss-unset-value": ^3.0.0
+    autoprefixer: ^10.4.16
+    browserslist: ^4.22.1
+    css-blank-pseudo: ^6.0.0
+    css-has-pseudo: ^6.0.0
+    css-prefers-color-scheme: ^9.0.0
+    cssdb: ^7.8.0
     postcss-attribute-case-insensitive: ^6.0.2
     postcss-clamp: ^4.1.0
-    postcss-color-functional-notation: ^5.1.0
+    postcss-color-functional-notation: ^6.0.2
     postcss-color-hex-alpha: ^9.0.2
-    postcss-color-rebeccapurple: ^8.0.2
-    postcss-custom-media: ^9.1.5
-    postcss-custom-properties: ^13.2.0
-    postcss-custom-selectors: ^7.1.3
-    postcss-dir-pseudo-class: ^7.0.2
-    postcss-double-position-gradients: ^4.0.4
-    postcss-focus-visible: ^8.0.2
-    postcss-focus-within: ^7.0.2
+    postcss-color-rebeccapurple: ^9.0.1
+    postcss-custom-media: ^10.0.2
+    postcss-custom-properties: ^13.3.2
+    postcss-custom-selectors: ^7.1.6
+    postcss-dir-pseudo-class: ^8.0.0
+    postcss-double-position-gradients: ^5.0.2
+    postcss-focus-visible: ^9.0.0
+    postcss-focus-within: ^8.0.0
     postcss-font-variant: ^5.0.0
-    postcss-gap-properties: ^4.0.1
-    postcss-image-set-function: ^5.0.2
-    postcss-initial: ^4.0.1
-    postcss-lab-function: ^5.2.3
-    postcss-logical: ^6.2.0
-    postcss-nesting: ^11.3.0
+    postcss-gap-properties: ^5.0.0
+    postcss-image-set-function: ^6.0.1
+    postcss-lab-function: ^6.0.7
+    postcss-logical: ^7.0.0
+    postcss-nesting: ^12.0.1
     postcss-opacity-percentage: ^2.0.0
-    postcss-overflow-shorthand: ^4.0.1
+    postcss-overflow-shorthand: ^5.0.0
     postcss-page-break: ^3.0.4
-    postcss-place: ^8.0.1
-    postcss-pseudo-class-any-link: ^8.0.2
+    postcss-place: ^9.0.0
+    postcss-pseudo-class-any-link: ^9.0.0
     postcss-replace-overflow-wrap: ^4.0.0
     postcss-selector-not: ^7.0.1
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.4
-  checksum: b7c8285149784e8a7a74dc3ca71250bba7cb9a23f46fb9031092cb717d99a61c05b6543fbcc7212e17bf03ce6790b8cce99c7d31f12a5846efa1dbc57add3c90
+  checksum: 1423ec0e081379d612462952d04b7f826eb458702e10289f06a33aec14b47afa66a65562aa2209e5103056e0206782f44c13e23d062a3af4dce93b1e6a945558
   languageName: node
   linkType: hard
 
-"postcss-pseudo-class-any-link@npm:^8.0.2":
-  version: 8.0.2
-  resolution: "postcss-pseudo-class-any-link@npm:8.0.2"
+"postcss-pseudo-class-any-link@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "postcss-pseudo-class-any-link@npm:9.0.0"
   dependencies:
-    postcss-selector-parser: ^6.0.10
+    postcss-selector-parser: ^6.0.13
   peerDependencies:
     postcss: ^8.4
-  checksum: 4864846b0aebe4a9023e12836a8e9c057c398a7528ddb6db728ae842223787cb39e565189373ef6e48797a33e29cc6d5b9dc7d55db8746dddfb0cbd53096ab32
+  checksum: af9c586f33dab93ef9167e53c5696f2f896310809523594c066230fba3611cd5f7c0ef4452153a3d1165cda66e4c3f97b5621b9f23bf815e915997eb99bc2e50
   languageName: node
   linkType: hard
 
-"postcss-reduce-initial@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-reduce-initial@npm:5.1.1"
+"postcss-reduce-initial@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-reduce-initial@npm:6.0.0"
   dependencies:
     browserslist: ^4.21.4
     caniuse-api: ^3.0.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 1b704aba8c38103cbb5a75c6201dbf58ec2f3a978013c7f7e8957fd3bf3282f992050dec5a01bc050d031bad836e187dd6622b922ca78ab92bcd0afd21fb0b98
+  checksum: 988001da75b969733756d9cec9bb37cfae9a667c888c0394d8aa84af7fa6fe134cdd997b63d657900f72541310c5a396db3436367bf91908bc4c7f7ce965c511
   languageName: node
   linkType: hard
 
-"postcss-reduce-transforms@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-reduce-transforms@npm:5.1.0"
+"postcss-reduce-transforms@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-reduce-transforms@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 0c6af2cba20e3ff63eb9ad045e634ddfb9c3e5c0e614c020db2a02f3aa20632318c4ede9e0c995f9225d9a101e673de91c0a6e10bb2fa5da6d6c75d15a55882f
+  checksum: 17c27b1858897ee37a4f80af0d76c5ce895466392acac1ead75cbb71ac290ab57b209f47d5d205f6ea60c1697109f09531de005ef17d8826d545bbc02891351a
   languageName: node
   linkType: hard
 
@@ -15529,12 +14983,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-scss@npm:4.0.6":
-  version: 4.0.6
-  resolution: "postcss-scss@npm:4.0.6"
+"postcss-scss@npm:4.0.9":
+  version: 4.0.9
+  resolution: "postcss-scss@npm:4.0.9"
   peerDependencies:
-    postcss: ^8.4.19
-  checksum: 133a1cba31e2e167f4e841e66ec6a798eaf44c7911f9182ade0b5b1e71a8198814aa390b8c9d5db6b01358115232e5b15b1a4f8c5198acfccfb1f3fdbd328cdf
+    postcss: ^8.4.29
+  checksum: dc358bafc23d52ed3a9a29333808825deba213042be74ece6eae7a61c692f67d0e6691fa7005367b013c01c79562fbb9ef2fe4c0485075233931bd90715f5132
   languageName: node
   linkType: hard
 
@@ -15549,13 +15003,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5, postcss-selector-parser@npm:^6.0.9":
-  version: 6.0.11
-  resolution: "postcss-selector-parser@npm:6.0.11"
+"postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.11, postcss-selector-parser@npm:^6.0.13, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.0.5":
+  version: 6.0.13
+  resolution: "postcss-selector-parser@npm:6.0.13"
   dependencies:
     cssesc: ^3.0.0
     util-deprecate: ^1.0.2
-  checksum: 0b01aa9c2d2c8dbeb51e9b204796b678284be9823abc8d6d40a8b16d4149514e922c264a8ed4deb4d6dbced564b9be390f5942c058582d8656351516d6c49cde
+  checksum: f89163338a1ce3b8ece8e9055cd5a3165e79a15e1c408e18de5ad8f87796b61ec2d48a2902d179ae0c4b5de10fccd3a325a4e660596549b040bc5ad1b465f096
   languageName: node
   linkType: hard
 
@@ -15568,26 +15022,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss-svgo@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "postcss-svgo@npm:5.1.0"
+"postcss-svgo@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-svgo@npm:6.0.0"
   dependencies:
     postcss-value-parser: ^4.2.0
-    svgo: ^2.7.0
+    svgo: ^3.0.2
   peerDependencies:
     postcss: ^8.2.15
-  checksum: d86eb5213d9f700cf5efe3073799b485fb7cacae0c731db3d7749c9c2b1c9bc85e95e0baeca439d699ff32ea24815fc916c4071b08f67ed8219df229ce1129bd
+  checksum: 14c68b7c275dbbbbf1f954e313ff812dacea88970165d7859c1683e2530ea51cd333372b8c0d440d4e9525768f34a8dab5f0846d3445bbb478a87a99f69e9abb
   languageName: node
   linkType: hard
 
-"postcss-unique-selectors@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "postcss-unique-selectors@npm:5.1.1"
+"postcss-unique-selectors@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "postcss-unique-selectors@npm:6.0.0"
   dependencies:
     postcss-selector-parser: ^6.0.5
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 637e7b786e8558265775c30400c54b6b3b24d4748923f4a39f16a65fd0e394f564ccc9f0a1d3c0e770618a7637a7502ea1d0d79f731d429cb202255253c23278
+  checksum: 5fbfeaf796c6442853ce3afd03ae8c306fcb83b0b7ee59cbdc9aad57a1e601e65a2a5efd1e25edaa5c7c62e05d3795f357fe95933de0868a78a5d1d1f541be34
   languageName: node
   linkType: hard
 
@@ -15598,14 +15052,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss@npm:8.4.24":
-  version: 8.4.24
-  resolution: "postcss@npm:8.4.24"
+"postcss@npm:8.4.31, postcss@npm:^8.3.11, postcss@npm:^8.4.21, postcss@npm:^8.4.27":
+  version: 8.4.31
+  resolution: "postcss@npm:8.4.31"
   dependencies:
     nanoid: ^3.3.6
     picocolors: ^1.0.0
     source-map-js: ^1.0.2
-  checksum: 814e2126dacfea313588eda09cc99a9b4c26ec55c059188aa7a916d20d26d483483106dc5ff9e560731b59f45c5bb91b945dfadc670aed875cc90ddbbf4e787d
+  checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea
   languageName: node
   linkType: hard
 
@@ -15619,17 +15073,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.3.11, postcss@npm:^8.4.19, postcss@npm:^8.4.21":
-  version: 8.4.23
-  resolution: "postcss@npm:8.4.23"
-  dependencies:
-    nanoid: ^3.3.6
-    picocolors: ^1.0.0
-    source-map-js: ^1.0.2
-  checksum: 8bb9d1b2ea6e694f8987d4f18c94617971b2b8d141602725fedcc2222fdc413b776a6e1b969a25d627d7b2681ca5aabb56f59e727ef94072e1b6ac8412105a2f
-  languageName: node
-  linkType: hard
-
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
@@ -15653,19 +15096,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.8.8":
-  version: 2.8.8
-  resolution: "prettier@npm:2.8.8"
+"prettier@npm:*, prettier@npm:^3, prettier@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "prettier@npm:3.0.3"
   bin:
-    prettier: bin-prettier.js
-  checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8
+    prettier: bin/prettier.cjs
+  checksum: e10b9af02b281f6c617362ebd2571b1d7fc9fb8a3bd17e371754428cda992e5e8d8b7a046e8f7d3e2da1dcd21aa001e2e3c797402ebb6111b5cd19609dd228e0
   languageName: node
   linkType: hard
 
 "pretty-bytes@npm:^5.3.0, pretty-bytes@npm:^5.4.1":
-  version: 5.5.0
-  resolution: "pretty-bytes@npm:5.5.0"
-  checksum: 69025b26241e4d3c47609250d5786180511001d81f2d34f3a816b501947923e9a3249848dfcac41493f276cbdf7d84d1f4a4f8d69c5714f876b149f975b5f235
+  version: 5.6.0
+  resolution: "pretty-bytes@npm:5.6.0"
+  checksum: 9c082500d1e93434b5b291bd651662936b8bd6204ec9fa17d563116a192d6d86b98f6d328526b4e8d783c07d5499e2614a807520249692da9ec81564b2f439cd
   languageName: node
   linkType: hard
 
@@ -15690,18 +15133,25 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"pretty-format@npm:^29.0.0, pretty-format@npm:^29.5.0":
-  version: 29.5.0
-  resolution: "pretty-format@npm:29.5.0"
+"pretty-format@npm:^29.0.0, pretty-format@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "pretty-format@npm:29.7.0"
   dependencies:
-    "@jest/schemas": ^29.4.3
+    "@jest/schemas": ^29.6.3
     ansi-styles: ^5.0.0
     react-is: ^18.0.0
-  checksum: 4065356b558e6db25b4d41a01efb386935a6c06a0c9c104ef5ce59f2f476b8210edb8b3949b386e60ada0a6dc5ebcb2e6ccddc8c64dfd1a9943c3c3a9e7eaf89
+  checksum: 032c1602383e71e9c0c02a01bbd25d6759d60e9c7cf21937dde8357aa753da348fcec5def5d1002c9678a8524d5fe099ad98861286550ef44de8808cc61e43b6
+  languageName: node
+  linkType: hard
+
+"prismjs@npm:^1.27.0":
+  version: 1.29.0
+  resolution: "prismjs@npm:1.29.0"
+  checksum: 007a8869d4456ff8049dc59404e32d5666a07d99c3b0e30a18bd3b7676dfa07d1daae9d0f407f20983865fd8da56de91d09cb08e6aa61f5bc420a27c0beeaf93
   languageName: node
   linkType: hard
 
-"process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0":
+"process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
   checksum: 1d38588e520dab7cea67cbbe2efdd86a10cc7a074c09657635e34f035277b59fbb57d09d8638346bf7090f8e8ebc070c96fa5fd183b777fff4f5edff5e9466cf
@@ -15715,13 +15165,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"promise-inflight@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "promise-inflight@npm:1.0.1"
-  checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981
-  languageName: node
-  linkType: hard
-
 "promise-retry@npm:^2.0.1":
   version: 2.0.1
   resolution: "promise-retry@npm:2.0.1"
@@ -15733,12 +15176,12 @@ dexie@latest:
   linkType: hard
 
 "prompts@npm:^2.0.1":
-  version: 2.4.0
-  resolution: "prompts@npm:2.4.0"
+  version: 2.4.2
+  resolution: "prompts@npm:2.4.2"
   dependencies:
     kleur: ^3.0.3
     sisteransi: ^1.0.5
-  checksum: 96c7bef8eb3c0bb2076d2bc5ee473f06e6d8ac01ac4d0f378dfeb0ddaf2f31c339360ec8f0f8486f78601d16ebef7c6bd9886d44b937ba01bab568b937190265
+  checksum: d8fd1fe63820be2412c13bfc5d0a01909acc1f0367e32396962e737cb2fc52d004f3302475d5ce7d18a1e8a79985f93ff04ee03007d091029c3f9104bffc007d
   languageName: node
   linkType: hard
 
@@ -15829,44 +15272,39 @@ dexie@latest:
   linkType: hard
 
 "psl@npm:^1.1.33":
-  version: 1.8.0
-  resolution: "psl@npm:1.8.0"
-  checksum: 6150048ed2da3f919478bee8a82f3828303bc0fc730fb015a48f83c9977682c7b28c60ab01425a72d82a2891a1681627aa530a991d50c086b48a3be27744bde7
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
   languageName: node
   linkType: hard
 
-"pump@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "pump@npm:2.0.1"
-  dependencies:
-    end-of-stream: ^1.1.0
-    once: ^1.3.1
-  checksum: e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931
+"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
+  version: 2.3.0
+  resolution: "punycode@npm:2.3.0"
+  checksum: 39f760e09a2a3bbfe8f5287cf733ecdad69d6af2fe6f97ca95f24b8921858b91e9ea3c9eeec6e08cede96181b3bb33f95c6ffd8c77e63986508aa2e8159fa200
   languageName: node
   linkType: hard
 
-"pumpify@npm:^1.3.5":
-  version: 1.5.1
-  resolution: "pumpify@npm:1.5.1"
-  dependencies:
-    duplexify: ^3.6.0
-    inherits: ^2.0.3
-    pump: ^2.0.0
-  checksum: 26ca412ec8d665bd0d5e185c1b8f627728eff603440d75d22a58e421e3c66eaf86ec6fc6a6efc54808ecef65979279fa8e99b109a23ec1fa8d79f37e6978c9bd
+"pure-rand@npm:^6.0.0":
+  version: 6.0.4
+  resolution: "pure-rand@npm:6.0.4"
+  checksum: e1c4e69f8bf7303e5252756d67c3c7551385cd34d94a1f511fe099727ccbab74c898c03a06d4c4a24a89b51858781057b83ebbfe740d984240cdc04fead36068
   languageName: node
   linkType: hard
 
-"punycode@npm:^2.1.0, punycode@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "punycode@npm:2.1.1"
-  checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8
+"pvtsutils@npm:^1.3.2, pvtsutils@npm:^1.3.5":
+  version: 1.3.5
+  resolution: "pvtsutils@npm:1.3.5"
+  dependencies:
+    tslib: ^2.6.1
+  checksum: e734516b3cb26086c18bd9c012fefe818928a5073178842ab7e62885a090f1dd7bda9c7bb8cd317167502cb8ec86c0b1b0ccd71dac7ab469382a4518157b0d12
   languageName: node
   linkType: hard
 
-"pure-rand@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "pure-rand@npm:6.0.0"
-  checksum: ad1378d0a4859482d053a5264b2b485b445ece4bbc56f8959c233ea678b81ac2d613737925d496ded134eff5f29cc5546bf7492b6bce319ee27bebbad8a0c612
+"pvutils@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "pvutils@npm:1.1.3"
+  checksum: 2ee26a9e5176c348977d6ec00d8ee80bff62f51743b1c5fe8abeeb4c5d29d9959cdfe0ce146707a9e6801bce88190fed3002d720b072dc87d031c692820b44c9
   languageName: node
   linkType: hard
 
@@ -15877,10 +15315,24 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"quick-lru@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "quick-lru@npm:4.0.1"
-  checksum: bea46e1abfaa07023e047d3cf1716a06172c4947886c053ede5c50321893711577cb6119360f810cc3ffcd70c4d7db4069c3cee876b358ceff8596e062bd1154
+"queue-microtask@npm:^1.2.2":
+  version: 1.2.3
+  resolution: "queue-microtask@npm:1.2.3"
+  checksum: b676f8c040cdc5b12723ad2f91414d267605b26419d5c821ff03befa817ddd10e238d22b25d604920340fd73efd8ba795465a0377c4adf45a4a41e4234e42dc4
+  languageName: node
+  linkType: hard
+
+"queue-tick@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "queue-tick@npm:1.0.1"
+  checksum: 57c3292814b297f87f792fbeb99ce982813e4e54d7a8bdff65cf53d5c084113913289d4a48ec8bbc964927a74b847554f9f4579df43c969a6c8e0f026457ad01
+  languageName: node
+  linkType: hard
+
+"quick-lru@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "quick-lru@npm:5.1.1"
+  checksum: a516faa25574be7947969883e6068dbe4aa19e8ef8e8e0fd96cddd6d36485e9106d85c0041a27153286b0770b381328f4072aa40d3b18a19f5f7d2b78b94b5ed
   languageName: node
   linkType: hard
 
@@ -15921,38 +15373,49 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"react-error-boundary@npm:4.0.10":
-  version: 4.0.10
-  resolution: "react-error-boundary@npm:4.0.10"
+"react-error-boundary@npm:4.0.11":
+  version: 4.0.11
+  resolution: "react-error-boundary@npm:4.0.11"
+  dependencies:
+    "@babel/runtime": ^7.12.5
+  peerDependencies:
+    react: ">=16.13.1"
+  checksum: b3c157fea4e8f78411e9aa0fbf5241f6907b66ede1cd8b7bb22faaeb0339ebeb3dc8e63bf90ef3f740bfa8fd994ca6edf975089cd371b664ad6c2735e7512d38
+  languageName: node
+  linkType: hard
+
+"react-error-boundary@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "react-error-boundary@npm:3.1.4"
   dependencies:
     "@babel/runtime": ^7.12.5
   peerDependencies:
     react: ">=16.13.1"
-  checksum: 4ad4864d2a5fc2264a24d03e83176e6a70d7adbe3c1edbdc5b0bd452a695104bc59456e23b5aea1b9729220672fe46614221daa8b3bd59327968d4aa7eb8bc71
+  checksum: f36270a5d775a25c8920f854c0d91649ceea417b15b5bc51e270a959b0476647bb79abb4da3be7dd9a4597b029214e8fe43ea914a7f16fa7543c91f784977f1b
   languageName: node
   linkType: hard
 
-"react-intl@npm:6.4.4":
-  version: 6.4.4
-  resolution: "react-intl@npm:6.4.4"
+"react-intl@npm:6.5.1":
+  version: 6.5.1
+  resolution: "react-intl@npm:6.5.1"
   dependencies:
-    "@formatjs/ecma402-abstract": 1.17.0
-    "@formatjs/icu-messageformat-parser": 2.6.0
-    "@formatjs/intl": 2.9.0
-    "@formatjs/intl-displaynames": 6.5.0
-    "@formatjs/intl-listformat": 7.4.0
+    "@formatjs/ecma402-abstract": 1.17.2
+    "@formatjs/icu-messageformat-parser": 2.7.0
+    "@formatjs/intl": 2.9.5
+    "@formatjs/intl-displaynames": 6.6.1
+    "@formatjs/intl-listformat": 7.5.0
     "@types/hoist-non-react-statics": ^3.3.1
     "@types/react": 16 || 17 || 18
     hoist-non-react-statics: ^3.3.2
-    intl-messageformat: 10.5.0
+    intl-messageformat: 10.5.4
     tslib: ^2.4.0
   peerDependencies:
     react: ^16.6.0 || 17 || 18
-    typescript: ^4.7 || 5
+    typescript: 5
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: c7003ff4927d6d6bf43edc04008bca48181bbfc1c669071746cbaa63b35fdd655c3172c653ac711eeb5053859aa0603048791f3ac8ca5726014a6d357682dfe1
+  checksum: 9cdf4549d490f34bc664923b3eaaf42aed8e3a9453ebdeffb96cf7a21f5db251b39ae2a3885cdb365579759f6e46ec2bb8f6717324851768efd77e2ccf7fc820
   languageName: node
   linkType: hard
 
@@ -15971,15 +15434,15 @@ dexie@latest:
   linkType: hard
 
 "react-is@npm:^18.0.0":
-  version: 18.0.0
-  resolution: "react-is@npm:18.0.0"
-  checksum: d38f6afee4d8d791cdd69c715841c01a503c9b06da6158e0893447cea6ba50cd262dca9bde84127720cf44fd05c58185eafc32accace4bb2deb03b3cdbeb6b6b
+  version: 18.2.0
+  resolution: "react-is@npm:18.2.0"
+  checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e
   languageName: node
   linkType: hard
 
-"react-redux@npm:8.1.1":
-  version: 8.1.1
-  resolution: "react-redux@npm:8.1.1"
+"react-redux@npm:8.1.3":
+  version: 8.1.3
+  resolution: "react-redux@npm:8.1.3"
   dependencies:
     "@babel/runtime": ^7.12.1
     "@types/hoist-non-react-statics": ^3.3.1
@@ -16005,37 +15468,37 @@ dexie@latest:
       optional: true
     redux:
       optional: true
-  checksum: 370676330727764d78f35e9c5a0ed0591d79482fe9b70fffcab4aa6bcccc6194e4f1ebd818b4b390351dea5557e70d3bd4d95d7a0ac9baa1f45d6bf2230ee713
+  checksum: 192ea6f6053148ec80a4148ec607bc259403b937e515f616a1104ca5ab357e97e98b8245ed505a17afee67a72341d4a559eaca9607968b4a422aa9b44ba7eb89
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:6.14.0":
-  version: 6.14.0
-  resolution: "react-router-dom@npm:6.14.0"
+"react-router-dom@npm:6.17.0":
+  version: 6.17.0
+  resolution: "react-router-dom@npm:6.17.0"
   dependencies:
-    "@remix-run/router": 1.7.0
-    react-router: 6.14.0
+    "@remix-run/router": 1.10.0
+    react-router: 6.17.0
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 66800b8779f5ae9f8b8e1f41e25599519a40c532e020a8c1450e1645d2c8cc8351e51ed0f2516584681e9a509c6c40f629f2d80663123e132c68022c0edced03
+  checksum: e0ba4f4c507681e2ffdecdf2e67edf7ec0e2bf4be35222e29d013afdb03866a5e6ecacc8b452bd55797b9672785d02f81bd6dbf6b05ac93a59e48e774b0060de
   languageName: node
   linkType: hard
 
-"react-router@npm:6.14.0":
-  version: 6.14.0
-  resolution: "react-router@npm:6.14.0"
+"react-router@npm:6.17.0":
+  version: 6.17.0
+  resolution: "react-router@npm:6.17.0"
   dependencies:
-    "@remix-run/router": 1.7.0
+    "@remix-run/router": 1.10.0
   peerDependencies:
     react: ">=16.8"
-  checksum: 50a941746d12e81cea5495505c1afbcd099cc7d497624b013454cfd5a360d9403578f8fb3df17973bf775fbff91cb76477448023d537215e6aa71a8b85ae95bd
+  checksum: 99c30d94fbb34657e4c8c3ef1aaae33b143167d3869b442e06c83b4006f35200fde810029180e209654bef2f47f0b27a928f77cc2d859a358a2722cc9d494f03
   languageName: node
   linkType: hard
 
-"react-select@npm:5.7.3":
-  version: 5.7.3
-  resolution: "react-select@npm:5.7.3"
+"react-select@npm:5.7.5":
+  version: 5.7.5
+  resolution: "react-select@npm:5.7.5"
   dependencies:
     "@babel/runtime": ^7.12.0
     "@emotion/cache": ^11.4.0
@@ -16049,7 +15512,7 @@ dexie@latest:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 9ffa75afb395e7077076521c529611494164ace0c6b1ceb249406991ac668947cfd0424812c15c2a45c792bb2794b22f2df93c4c2f2515962b7dfc7c91b029ec
+  checksum: 88f2d94c4a6778df525a9fb5d7acac1bf34821f6efcfdc5927ec608f5f933cf3f47e1c4e4fd3b92d7b2ba1d91e44595d45ac4e2fd7528ba420086008ac5a81cf
   languageName: node
   linkType: hard
 
@@ -16096,14 +15559,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "read-pkg-up@npm:7.0.1"
+"read-pkg-up@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "read-pkg-up@npm:8.0.0"
   dependencies:
-    find-up: ^4.1.0
-    read-pkg: ^5.2.0
-    type-fest: ^0.8.1
-  checksum: e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44
+    find-up: ^5.0.0
+    read-pkg: ^6.0.0
+    type-fest: ^1.0.1
+  checksum: fe4c80401656b40b408884457fffb5a8015c03b1018cfd8e48f8d82a5e9023e24963603aeb2755608d964593e046c15b34d29b07d35af9c7aa478be81805209c
   languageName: node
   linkType: hard
 
@@ -16118,32 +15581,32 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "read-pkg@npm:5.2.0"
+"read-pkg@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "read-pkg@npm:6.0.0"
   dependencies:
     "@types/normalize-package-data": ^2.4.0
-    normalize-package-data: ^2.5.0
-    parse-json: ^5.0.0
-    type-fest: ^0.6.0
-  checksum: eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222
+    normalize-package-data: ^3.0.2
+    parse-json: ^5.2.0
+    type-fest: ^1.0.1
+  checksum: 0cebdff381128e923815c643074a87011070e5fc352bee575d327d6485da3317fab6d802a7b03deeb0be7be8d3ad1640397b3d5d2f044452caf4e8d1736bf94f
   languageName: node
   linkType: hard
 
-"readable-stream@npm:3, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "readable-stream@npm:3.6.0"
+"readable-stream@npm:3, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
+  version: 3.6.2
+  resolution: "readable-stream@npm:3.6.2"
   dependencies:
     inherits: ^2.0.3
     string_decoder: ^1.1.1
     util-deprecate: ^1.0.1
-  checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8
+  checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.5, readable-stream@npm:^2.1.5, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
-  version: 2.3.7
-  resolution: "readable-stream@npm:2.3.7"
+"readable-stream@npm:^2.0.5, readable-stream@npm:~2.3.6":
+  version: 2.3.8
+  resolution: "readable-stream@npm:2.3.8"
   dependencies:
     core-util-is: ~1.0.0
     inherits: ~2.0.3
@@ -16152,7 +15615,7 @@ dexie@latest:
     safe-buffer: ~5.1.1
     string_decoder: ~1.1.1
     util-deprecate: ~1.0.1
-  checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755
+  checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42
   languageName: node
   linkType: hard
 
@@ -16165,12 +15628,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"readdir-glob@npm:^1.0.0":
-  version: 1.1.2
-  resolution: "readdir-glob@npm:1.1.2"
+"readdir-glob@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "readdir-glob@npm:1.1.3"
   dependencies:
     minimatch: ^5.1.0
-  checksum: 1e5f701d3c94af5653e1736dfef99e991869c6e1c87bf08835d8c641f767e73ae25b829d3d1f8504fab8cad49b70b718ef960d3afee5be45cd779ccaeb264ed4
+  checksum: 1dc0f7440ff5d9378b593abe9d42f34ebaf387516615e98ab410cf3a68f840abbf9ff1032d15e0a0dbffa78f9e2c46d4fafdbaac1ca435af2efe3264e3f21874
   languageName: node
   linkType: hard
 
@@ -16201,13 +15664,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"redent@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "redent@npm:3.0.0"
+"redent@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "redent@npm:4.0.0"
   dependencies:
-    indent-string: ^4.0.0
-    strip-indent: ^3.0.0
-  checksum: fa1ef20404a2d399235e83cc80bd55a956642e37dd197b4b612ba7327bf87fa32745aeb4a1634b2bab25467164ab4ed9c15be2c307923dd08b0fe7c52431ae6b
+    indent-string: ^5.0.0
+    strip-indent: ^4.0.0
+  checksum: 6944e7b1d8f3fd28c2515f5c605b9f7f0ea0f4edddf41890bbbdd4d9ee35abb7540c3b278f03ff827bd278bb6ff4a5bd8692ca406b748c5c1c3ce7355e9fbf8f
   languageName: node
   linkType: hard
 
@@ -16256,12 +15719,33 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"reflect-metadata@npm:^0.1.13":
+  version: 0.1.13
+  resolution: "reflect-metadata@npm:0.1.13"
+  checksum: 798d379a7b6f6455501145419505c97dd11cbc23857a386add2b9ef15963ccf15a48d9d15507afe01d4cd74116df8a213247200bac00320bd7c11ddeaa5e8fb4
+  languageName: node
+  linkType: hard
+
+"reflect.getprototypeof@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "reflect.getprototypeof@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2
+  languageName: node
+  linkType: hard
+
 "regenerate-unicode-properties@npm:^10.1.0":
-  version: 10.1.0
-  resolution: "regenerate-unicode-properties@npm:10.1.0"
+  version: 10.1.1
+  resolution: "regenerate-unicode-properties@npm:10.1.1"
   dependencies:
     regenerate: ^1.4.2
-  checksum: b1a8929588433ab8b9dc1a34cf3665b3b472f79f2af6ceae00d905fc496b332b9af09c6718fb28c730918f19a00dc1d7310adbaa9b72a2ec7ad2f435da8ace17
+  checksum: b80958ef40f125275824c2c47d5081dfaefebd80bff26c76761e9236767c748a4a95a69c053fe29d2df881177f2ca85df4a71fe70a82360388b31159ef19adcf
   languageName: node
   linkType: hard
 
@@ -16272,30 +15756,37 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"regenerator-runtime@npm:^0.13.11, regenerator-runtime@npm:^0.13.3":
+"regenerator-runtime@npm:^0.13.3":
   version: 0.13.11
   resolution: "regenerator-runtime@npm:0.13.11"
   checksum: 27481628d22a1c4e3ff551096a683b424242a216fee44685467307f14d58020af1e19660bf2e26064de946bad7eff28950eae9f8209d55723e2d9351e632bbb4
   languageName: node
   linkType: hard
 
-"regenerator-transform@npm:^0.15.1":
-  version: 0.15.1
-  resolution: "regenerator-transform@npm:0.15.1"
+"regenerator-runtime@npm:^0.14.0":
+  version: 0.14.0
+  resolution: "regenerator-runtime@npm:0.14.0"
+  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
+  languageName: node
+  linkType: hard
+
+"regenerator-transform@npm:^0.15.2":
+  version: 0.15.2
+  resolution: "regenerator-transform@npm:0.15.2"
   dependencies:
     "@babel/runtime": ^7.8.4
-  checksum: 2d15bdeadbbfb1d12c93f5775493d85874dbe1d405bec323da5c61ec6e701bc9eea36167483e1a5e752de9b2df59ab9a2dfff6bf3784f2b28af2279a673d29a4
+  checksum: 20b6f9377d65954980fe044cfdd160de98df415b4bff38fbade67b3337efaf078308c4fed943067cd759827cc8cfeca9cb28ccda1f08333b85d6a2acbd022c27
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "regexp.prototype.flags@npm:1.4.3"
+"regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "regexp.prototype.flags@npm:1.5.1"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.3
-    functions-have-names: ^1.2.2
-  checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6
+    define-properties: ^1.2.0
+    set-function-name: ^2.0.0
+  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
   languageName: node
   linkType: hard
 
@@ -16331,28 +15822,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"remove-bom-buffer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "remove-bom-buffer@npm:3.0.0"
-  dependencies:
-    is-buffer: ^1.1.5
-    is-utf8: ^0.2.1
-  checksum: e508fd92e5c7b210123485a366b00bb46fe15ef2c23ae90b05cd365bbfeede429ae70f32bce150fc6467e53c921bc0d9a5c7e33d865009c99603f9fbf7c8b7ae
-  languageName: node
-  linkType: hard
-
-"remove-bom-stream@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "remove-bom-stream@npm:1.2.0"
-  dependencies:
-    remove-bom-buffer: ^3.0.0
-    safe-buffer: ^5.1.0
-    through2: ^2.0.3
-  checksum: 32533fa1925a753cfeb352efe7f01c4171de992275e39f66672752669a457d6cdaaa1c9fd41a25b0e54cd6c0db4987a01a2593c01680a6d5e7b5076d27540786
-  languageName: node
-  linkType: hard
-
-"remove-trailing-separator@npm:^1.0.1":
+"remove-trailing-separator@npm:^1.1.0":
   version: 1.1.0
   resolution: "remove-trailing-separator@npm:1.1.0"
   checksum: d3c20b5a2d987db13e1cca9385d56ecfa1641bae143b620835ac02a6b70ab88f68f117a0021838db826c57b31373d609d52e4f31aca75fc490c862732d595419
@@ -16386,10 +15856,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"replace-ext@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "replace-ext@npm:1.0.1"
-  checksum: 4994ea1aaa3d32d152a8d98ff638988812c4fa35ba55485630008fe6f49e3384a8a710878e6fd7304b42b38d1b64c1cd070e78ece411f327735581a79dd88571
+"replace-ext@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "replace-ext@npm:2.0.0"
+  checksum: ed640ac90d24cce4be977642847d138908d430049cc097633be33b072143515cc7d29699675a0c35f6dc3c3c73cb529ed352d59649cf15931740eb31ae083c1e
   languageName: node
   linkType: hard
 
@@ -16414,7 +15884,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"requireindex@npm:^1.2.0, requireindex@npm:~1.2.0":
+"requireindex@npm:^1.2.0":
   version: 1.2.0
   resolution: "requireindex@npm:1.2.0"
   checksum: 50d8b10a1ff1fdf6aea7a1870bc7bd238b0fb1917d8d7ca17fd03afc38a65dcd7a8a4eddd031f89128b5f0065833d5c92c4fef67f2c04e8624057fe626c9cf94
@@ -16477,80 +15947,78 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"resolve-global@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "resolve-global@npm:1.0.0"
+"resolve-options@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "resolve-options@npm:2.0.0"
   dependencies:
-    global-dirs: ^0.1.1
-  checksum: c4e11d33e84bde7516b824503ffbe4b6cce863d5ce485680fd3db997b7c64da1df98321b1fd0703b58be8bc9bc83bc96bd83043f96194386b45eb47229efb6b6
+    value-or-function: ^4.0.0
+  checksum: b28584cc089099af42e36292c32bd9af8bc9e28e3ca73c172c0a172d7ed5afb01c75cc2275268c327dceba77a5555b33fbd55617be138874040279fe6ff02fbf
   languageName: node
   linkType: hard
 
-"resolve-options@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "resolve-options@npm:1.1.0"
-  dependencies:
-    value-or-function: ^3.0.0
-  checksum: 437813d9418b49e52c367b980b6b48b3ea1ea39105aac97c39f104724abb6cda224ed92ebf12499cf00993589d38c8195eb2be730d0ba8b45df9bdf7cec65b33
+"resolve-pkg-maps@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "resolve-pkg-maps@npm:1.0.0"
+  checksum: 1012afc566b3fdb190a6309cc37ef3b2dcc35dff5fa6683a9d00cd25c3247edfbc4691b91078c97adc82a29b77a2660c30d791d65dab4fc78bfc473f60289977
   languageName: node
   linkType: hard
 
 "resolve.exports@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "resolve.exports@npm:2.0.0"
-  checksum: d8bee3b0cc0a0ae6c8323710983505bc6a3a2574f718e96f01e048a0f0af035941434b386cc9efc7eededc5e1199726185c306ec6f6a1aa55d5fbad926fd0634
+  version: 2.0.2
+  resolution: "resolve.exports@npm:2.0.2"
+  checksum: 1c7778ca1b86a94f8ab4055d196c7d87d1874b96df4d7c3e67bbf793140f0717fd506dcafd62785b079cd6086b9264424ad634fb904409764c3509c3df1653f2
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1":
-  version: 1.22.1
-  resolution: "resolve@npm:1.22.1"
+"resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.4":
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
   languageName: node
   linkType: hard
 
 "resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: c438ac9a650f2030fd074219d7f12ceb983b475da2d89ad3d6dd05fbf6b7a0a8cd37d4d10b43cb1f632bc19f22246ab7f36ebda54d84a29bfb2910a0680906d3
+  checksum: a73ac69a1c4bd34c56b213d91f5b17ce390688fdb4a1a96ed3025cc7e08e7bfb90b3a06fcce461780cb0b589c958afcb0080ab802c71c01a7ecc8c64feafc89f
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
-  version: 1.22.1
-  resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
+"resolve@patch:resolve@^1.1.7#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.4#~builtin<compat/resolve>":
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=07638b"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
   languageName: node
   linkType: hard
 
 "resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=07638b"
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin<compat/resolve>::version=2.0.0-next.5&hash=07638b"
   dependencies:
-    is-core-module: ^2.9.0
+    is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 4bf9f4f8a458607af90518ff73c67a4bc1a38b5a23fef2bb0ccbd45e8be89820a1639b637b0ba377eb2be9eedfb1739a84cde24fe4cd670c8207d8fea922b011
+  checksum: 064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c
   languageName: node
   linkType: hard
 
@@ -16564,6 +16032,16 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"restore-cursor@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "restore-cursor@npm:4.0.0"
+  dependencies:
+    onetime: ^5.1.0
+    signal-exit: ^3.0.2
+  checksum: 5b675c5a59763bf26e604289eab35711525f11388d77f409453904e1e69c0d37ae5889295706b2c81d23bd780165084d040f9b68fffc32cc921519031c4fa4af
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -16622,41 +16100,46 @@ dexie@latest:
   linkType: hard
 
 "rollup@npm:^2.43.1":
-  version: 2.45.2
-  resolution: "rollup@npm:2.45.2"
+  version: 2.79.1
+  resolution: "rollup@npm:2.79.1"
   dependencies:
-    fsevents: ~2.3.1
+    fsevents: ~2.3.2
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: c049bedc191199842fab13248fdd74dbb33262b5a42ce35abe268037aa8be0f9a32739f2e28c74e7aaacae514fbb637ef79a20ef784f7a33b33587da479065bb
+  checksum: 6a2bf167b3587d4df709b37d149ad0300692cc5deb510f89ac7bdc77c8738c9546ae3de9322b0968e1ed2b0e984571f5f55aae28fa7de4cfcb1bc5402a4e2be6
   languageName: node
   linkType: hard
 
-"rtcpeerconnection-shim@npm:^1.2.14":
-  version: 1.2.15
-  resolution: "rtcpeerconnection-shim@npm:1.2.15"
+"run-applescript@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "run-applescript@npm:5.0.0"
   dependencies:
-    sdp: ^2.6.0
-  checksum: 42a733d8e3846b7e7e3c33b6d5cddec95659ceb39d3f990f0a4437e6d719ed717237fea02352d4a18d86c825a1493eaeb481cc835267d2288b0ce43582b97f46
+    execa: ^5.0.0
+  checksum: d00c2dbfa5b2d774de7451194b8b125f40f65fc183de7d9dcae97f57f59433586d3c39b9001e111c38bfa24c3436c99df1bb4066a2a0c90d39a8c4cd6889af77
   languageName: node
   linkType: hard
 
 "run-parallel@npm:^1.1.9":
-  version: 1.1.10
-  resolution: "run-parallel@npm:1.1.10"
-  checksum: 360996d8b7abe586320a01a42093df2edf41699bbb0d493a4191ec52dda4354d0b25954e0608162d3bb304faa5f73a194f85d6d0d4c016154b2a8132f757fa98
+  version: 1.2.0
+  resolution: "run-parallel@npm:1.2.0"
+  dependencies:
+    queue-microtask: ^1.2.2
+  checksum: cb4f97ad25a75ebc11a8ef4e33bb962f8af8516bb2001082ceabd8902e15b98f4b84b4f8a9b222e5d57fc3bd1379c483886ed4619367a7680dad65316993021d
   languageName: node
   linkType: hard
 
-"rxjs@npm:^7.8.0":
-  version: 7.8.0
-  resolution: "rxjs@npm:7.8.0"
+"safe-array-concat@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "safe-array-concat@npm:1.0.1"
   dependencies:
-    tslib: ^2.1.0
-  checksum: 61b4d4fd323c1043d8d6ceb91f24183b28bcf5def4f01ca111511d5c6b66755bc5578587fe714ef5d67cf4c9f2e26f4490d4e1d8cabf9bd5967687835e9866a2
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    isarray: ^2.0.5
+  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
   languageName: node
   linkType: hard
 
@@ -16692,10 +16175,10 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"sax@npm:>=0.6.0":
-  version: 1.2.4
-  resolution: "sax@npm:1.2.4"
-  checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
+"sax@npm:>=0.6.0, sax@npm:^1.2.4":
+  version: 1.3.0
+  resolution: "sax@npm:1.3.0"
+  checksum: 238ab3a9ba8c8f8aaf1c5ea9120386391f6ee0af52f1a6a40bbb6df78241dd05d782f2359d614ac6aae08c4c4125208b456548a6cf68625aa4fe178486e63ecd
   languageName: node
   linkType: hard
 
@@ -16717,18 +16200,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.1.1":
-  version: 3.1.2
-  resolution: "schema-utils@npm:3.1.2"
-  dependencies:
-    "@types/json-schema": ^7.0.8
-    ajv: ^6.12.5
-    ajv-keywords: ^3.5.2
-  checksum: 39683edfe3beff018cdb1ae4fa296fc55cea13a080aa2b4d9351895cd64b22ba4d87e2e548c2a2ac1bc76e60980670adb0f413a58104479f1a0c12e5663cb8ca
-  languageName: node
-  linkType: hard
-
-"schema-utils@npm:^3.2.0":
+"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
   dependencies:
@@ -16740,21 +16212,21 @@ dexie@latest:
   linkType: hard
 
 "schema-utils@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "schema-utils@npm:4.0.0"
+  version: 4.2.0
+  resolution: "schema-utils@npm:4.2.0"
   dependencies:
     "@types/json-schema": ^7.0.9
-    ajv: ^8.8.0
+    ajv: ^8.9.0
     ajv-formats: ^2.1.1
-    ajv-keywords: ^5.0.0
-  checksum: c843e92fdd1a5c145dbb6ffdae33e501867f9703afac67bdf35a685e49f85b1dcc10ea250033175a64bd9d31f0555bc6785b8359da0c90bcea30cf6dfbb55a8f
+    ajv-keywords: ^5.1.0
+  checksum: 26a0463d47683258106e6652e9aeb0823bf0b85843039e068b57da1892f7ae6b6b1094d48e9ed5ba5cbe9f7166469d880858b9d91abe8bd249421eb813850cde
   languageName: node
   linkType: hard
 
-"sdp@npm:^2.6.0, sdp@npm:^2.9.0":
-  version: 2.12.0
-  resolution: "sdp@npm:2.12.0"
-  checksum: 5deb20ac50a1aeb4dd5ff2e506c22d1674222c21f08ae97105c9552ae979e90ddc42b8526f2c3dcacfeebc45c7b2e6b6b4254ae2cf335263bf3ddf2ad9b8ec76
+"sdp@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "sdp@npm:3.2.0"
+  checksum: 227885bddab9a5845e56ae184ff51e43ec7bc155e7f1ed2f17ca1b012e6767011d5bd01b6c4064ded8e3b6f6bf3c9b26b2cf754b9c8662285988ed27b54f37b1
   languageName: node
   linkType: hard
 
@@ -16766,31 +16238,31 @@ dexie@latest:
   linkType: hard
 
 "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.6.0":
-  version: 5.7.1
-  resolution: "semver@npm:5.7.1"
+  version: 5.7.2
+  resolution: "semver@npm:5.7.2"
   bin:
-    semver: ./bin/semver
-  checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf
+    semver: bin/semver
+  checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686
   languageName: node
   linkType: hard
 
-"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
-  version: 6.3.0
-  resolution: "semver@npm:6.3.0"
+"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
   bin:
-    semver: ./bin/semver.js
-  checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
+    semver: bin/semver.js
+  checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
   languageName: node
   linkType: hard
 
-"semver@npm:^7.1.2, semver@npm:^7.3.2, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8":
-  version: 7.3.8
-  resolution: "semver@npm:7.3.8"
+"semver@npm:^7.1.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.3, semver@npm:^7.5.4":
+  version: 7.5.4
+  resolution: "semver@npm:7.5.4"
   dependencies:
     lru-cache: ^6.0.0
   bin:
     semver: bin/semver.js
-  checksum: ba9c7cbbf2b7884696523450a61fee1a09930d888b7a8d7579025ad93d459b2d1949ee5bbfeb188b2be5f4ac163544c5e98491ad6152df34154feebc2cc337c1
+  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
   languageName: node
   linkType: hard
 
@@ -16819,6 +16291,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-function-name@npm:2.0.1"
+  dependencies:
+    define-data-property: ^1.0.1
+    functions-have-names: ^1.2.3
+    has-property-descriptors: ^1.0.0
+  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+  languageName: node
+  linkType: hard
+
 "set-getter@npm:^0.1.0":
   version: 0.1.1
   resolution: "set-getter@npm:0.1.1"
@@ -16878,14 +16361,21 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"simple-git@npm:3.19.0":
-  version: 3.19.0
-  resolution: "simple-git@npm:3.19.0"
+"signal-exit@npm:^4.0.1, signal-exit@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "signal-exit@npm:4.1.0"
+  checksum: 64c757b498cb8629ffa5f75485340594d2f8189e9b08700e69199069c8e3070fb3e255f7ab873c05dc0b3cec412aea7402e10a5990cb6a050bd33ba062a6c549
+  languageName: node
+  linkType: hard
+
+"simple-git@npm:3.20.0":
+  version: 3.20.0
+  resolution: "simple-git@npm:3.20.0"
   dependencies:
     "@kwsites/file-exists": ^1.1.1
     "@kwsites/promise-deferred": ^1.1.1
     debug: ^4.3.4
-  checksum: 103f754cc172f903d7ad798c0dd7a083618e4ef373d27b37f34f4a7d5b6e5f260636376fca180ce25296f0064120af38b7be665e340c2f6ca463f1810bae0414
+  checksum: 56b50c574a950a8ddc87033083e073216708ccf6aaa3c904da05a5b3e52502287049dde49df1df42d5ec072c1050ef8219733e6cfebf71885081917ffcdbb54c
   languageName: node
   linkType: hard
 
@@ -16905,9 +16395,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"sinon@npm:15.2.0":
-  version: 15.2.0
-  resolution: "sinon@npm:15.2.0"
+"sinon@npm:16.1.0":
+  version: 16.1.0
+  resolution: "sinon@npm:16.1.0"
   dependencies:
     "@sinonjs/commons": ^3.0.0
     "@sinonjs/fake-timers": ^10.3.0
@@ -16915,7 +16405,7 @@ dexie@latest:
     diff: ^5.1.0
     nise: ^5.1.4
     supports-color: ^7.2.0
-  checksum: 1641b9af8a73ba57c73c9b6fd955a2d062a5d78cce719887869eca45faf33b0fd20cabfeffdfd856bb35bfbd3d49debb2d954ff6ae5e9825a3da5ff4f604ab6c
+  checksum: b3f910e9b3d28f1241b28ac9d384f45c673b64ecfabf7ca2b94c964036118bd4166a2315f2ec2379a85745a7d4840384514aca416bbf189508a9d7fb55b9d5a8
   languageName: node
   linkType: hard
 
@@ -16940,17 +16430,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"slice-ansi@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "slice-ansi@npm:3.0.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    astral-regex: ^2.0.0
-    is-fullwidth-code-point: ^3.0.0
-  checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24
-  languageName: node
-  linkType: hard
-
 "slice-ansi@npm:^4.0.0":
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
@@ -17008,9 +16487,9 @@ dexie@latest:
   linkType: hard
 
 "sortobject@npm:^4.0.0":
-  version: 4.14.0
-  resolution: "sortobject@npm:4.14.0"
-  checksum: f37e0b765b280889d76bc06b40ab3d53957551549c084103c979ccc6e3757cdc041566ce8343e6455134e3dcaad3e97bb708b07775b6c444458e502766d4b65f
+  version: 4.16.0
+  resolution: "sortobject@npm:4.16.0"
+  checksum: 4212571c41cd5e265e3aa6531153c2ad6862f4b5dd8059647b4b89fdeee23ad8762dc8f3c0fc3c1756c9f87d1b46ba0e49b753c8ab7bd18c1a5bb75be2102c9a
   languageName: node
   linkType: hard
 
@@ -17021,7 +16500,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:^1.0.2":
+"source-map-js@npm:^1.0.1, source-map-js@npm:^1.0.2":
   version: 1.0.2
   resolution: "source-map-js@npm:1.0.2"
   checksum: c049a7fc4deb9a7e9b481ae3d424cc793cb4845daa690bc5a05d428bf41bf231ced49b4cf0c9e77f9d42fdb3d20d6187619fc586605f5eabe995a316da8d377c
@@ -17071,7 +16550,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"sourcemap-codec@npm:^1.4.4":
+"sourcemap-codec@npm:^1.4.8":
   version: 1.4.8
   resolution: "sourcemap-codec@npm:1.4.8"
   checksum: b57981c05611afef31605732b598ccf65124a9fcb03b833532659ac4d29ac0f7bfacbc0d6c5a28a03e84c7510e7e556d758d0bb57786e214660016fb94279316
@@ -17086,12 +16565,12 @@ dexie@latest:
   linkType: hard
 
 "spdx-correct@npm:^3.0.0":
-  version: 3.1.1
-  resolution: "spdx-correct@npm:3.1.1"
+  version: 3.2.0
+  resolution: "spdx-correct@npm:3.2.0"
   dependencies:
     spdx-expression-parse: ^3.0.0
     spdx-license-ids: ^3.0.0
-  checksum: 77ce438344a34f9930feffa61be0eddcda5b55fc592906ef75621d4b52c07400a97084d8701557b13f7d2aae0cb64f808431f469e566ef3fe0a3a131dcb775a6
+  checksum: e9ae98d22f69c88e7aff5b8778dc01c361ef635580e82d29e5c60a6533cc8f4d820803e67d7432581af0cc4fb49973125076ee3b90df191d153e223c004193b2
   languageName: node
   linkType: hard
 
@@ -17113,9 +16592,9 @@ dexie@latest:
   linkType: hard
 
 "spdx-license-ids@npm:^3.0.0":
-  version: 3.0.7
-  resolution: "spdx-license-ids@npm:3.0.7"
-  checksum: b52a88aebc19b4c69049349939e1948014c4d10f52a11870431fc1cc6551de411d19e4570f5f1df2d8b7089bec921df9017a3d5199ae2468b2b432171945278e
+  version: 3.0.16
+  resolution: "spdx-license-ids@npm:3.0.16"
+  checksum: 5cdaa85aaa24bd02f9353a2e357b4df0a4f205cb35655f3fd0a5674a4fb77081f28ffd425379214bc3be2c2b7593ce1215df6bcc75884aeee0a9811207feabe2
   languageName: node
   linkType: hard
 
@@ -17142,28 +16621,21 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "ssri@npm:9.0.1"
+"ssri@npm:^10.0.0":
+  version: 10.0.5
+  resolution: "ssri@npm:10.0.5"
   dependencies:
-    minipass: ^3.1.1
-  checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb
-  languageName: node
-  linkType: hard
-
-"stable@npm:^0.1.8":
-  version: 0.1.8
-  resolution: "stable@npm:0.1.8"
-  checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb
+    minipass: ^7.0.3
+  checksum: 0a31b65f21872dea1ed3f7c200d7bc1c1b91c15e419deca14f282508ba917cbb342c08a6814c7f68ca4ca4116dd1a85da2bbf39227480e50125a1ceffeecb750
   languageName: node
   linkType: hard
 
 "stack-utils@npm:^2.0.3":
-  version: 2.0.5
-  resolution: "stack-utils@npm:2.0.5"
+  version: 2.0.6
+  resolution: "stack-utils@npm:2.0.6"
   dependencies:
     escape-string-regexp: ^2.0.0
-  checksum: 76b69da0f5b48a34a0f93c98ee2a96544d2c4ca2557f7eef5ddb961d3bdc33870b46f498a84a7c4f4ffb781df639840e7ebf6639164ed4da5e1aeb659615b9c7
+  checksum: 052bf4d25bbf5f78e06c1d5e67de2e088b06871fa04107ca8d3f0e9d9263326e2942c8bedee3545795fc77d787d443a538345eef74db2f8e35db3558c6f91ff7
   languageName: node
   linkType: hard
 
@@ -17185,27 +16657,50 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"stream-shift@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "stream-shift@npm:1.0.1"
-  checksum: 59b82b44b29ec3699b5519a49b3cedcc6db58c72fb40c04e005525dfdcab1c75c4e0c180b923c380f204bed78211b9bad8faecc7b93dece4d004c3f6ec75737b
+"stream-composer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "stream-composer@npm:1.0.2"
+  dependencies:
+    streamx: ^2.13.2
+  checksum: 338b8e088f2eb2c91b0e06907db436525da3620991b13499e57441548e62d3585be185505901b0380cad425889572794e5fe178dd326f5efde654b3ab26df3d3
   languageName: node
   linkType: hard
 
-"string-argv@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "string-argv@npm:0.3.1"
-  checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf
+"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0, streamx@npm:^2.15.0":
+  version: 2.15.1
+  resolution: "streamx@npm:2.15.1"
+  dependencies:
+    fast-fifo: ^1.1.0
+    queue-tick: ^1.0.1
+  checksum: 6f2b4fed68caacd28efbd44d4264f5d3c2b81b0a5de14419333dac57f2075c49ae648df8d03db632a33587a6c8ab7cb9cdb4f9a2f8305be0c2cd79af35742b15
+  languageName: node
+  linkType: hard
+
+"string-argv@npm:0.3.2, string-argv@npm:^0.3.1":
+  version: 0.3.2
+  resolution: "string-argv@npm:0.3.2"
+  checksum: 8703ad3f3db0b2641ed2adbb15cf24d3945070d9a751f9e74a924966db9f325ac755169007233e8985a39a6a292f14d4fee20482989b89b96e473c4221508a0f
   languageName: node
   linkType: hard
 
 "string-length@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "string-length@npm:4.0.1"
+  version: 4.0.2
+  resolution: "string-length@npm:4.0.2"
   dependencies:
     char-regex: ^1.0.2
     strip-ansi: ^6.0.0
-  checksum: 7bd3191668ddafa6f574a8b17a1bd1b085737d64ceefa51f72cdd19c45a730422cd70d984eee7584d6e5b5c84b6318633c6d6a720a4bfd7c58769985fa77573e
+  checksum: ce85533ef5113fcb7e522bcf9e62cb33871aa99b3729cec5595f4447f660b0cefd542ca6df4150c97a677d58b0cb727a3fe09ac1de94071d05526c73579bf505
+  languageName: node
+  linkType: hard
+
+"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
+  version: 4.2.3
+  resolution: "string-width@npm:4.2.3"
+  dependencies:
+    emoji-regex: ^8.0.0
+    is-fullwidth-code-point: ^3.0.0
+    strip-ansi: ^6.0.1
+  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
   languageName: node
   linkType: hard
 
@@ -17220,63 +16715,64 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "string-width@npm:4.2.3"
-  dependencies:
-    emoji-regex: ^8.0.0
-    is-fullwidth-code-point: ^3.0.0
-    strip-ansi: ^6.0.1
-  checksum: e52c10dc3fbfcd6c3a15f159f54a90024241d0f149cf8aed2982a2d801d2e64df0bf1dc351cf8e95c3319323f9f220c16e740b06faecd53e2462df1d2b5443fb
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "string-width@npm:5.1.0"
+"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
   dependencies:
     eastasianwidth: ^0.2.0
     emoji-regex: ^9.2.2
     strip-ansi: ^7.0.1
-  checksum: f9f84226bade99b044ece0f143ba0979bbd0b4bbb867ce2e785debf8abe99e9491382d584e51c32272ec2dc82f2fa93b212ef4fdd21c739dac8e78f7815b7dfb
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
   languageName: node
   linkType: hard
 
 "string.prototype.matchall@npm:^4.0.6, string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+  version: 4.0.10
+  resolution: "string.prototype.matchall@npm:4.0.10"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.20.4
-    get-intrinsic: ^1.1.3
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.3
-    regexp.prototype.flags: ^1.4.3
+    internal-slot: ^1.0.5
+    regexp.prototype.flags: ^1.5.0
+    set-function-name: ^2.0.0
     side-channel: ^1.0.4
-  checksum: 952da3a818de42ad1c10b576140a5e05b4de7b34b8d9dbf00c3ac8c1293e9c0f533613a39c5cda53e0a8221f2e710bc2150e730b1c2278d60004a8a35726efb6
+  checksum: 3c78bdeff39360c8e435d7c4c6ea19f454aa7a63eda95fa6fadc3a5b984446a2f9f2c02d5c94171ce22268a573524263fbd0c8edbe3ce2e9890d7cc036cdc3ed
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "string.prototype.trimend@npm:1.0.5"
+"string.prototype.trim@npm:^1.2.8":
+  version: 1.2.8
+  resolution: "string.prototype.trim@npm:1.2.8"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.19.5
-  checksum: d44f543833112f57224e79182debadc9f4f3bf9d48a0414d6f0cbd2a86f2b3e8c0ca1f95c3f8e5b32ae83e91554d79d932fc746b411895f03f93d89ed3dfb6bc
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "string.prototype.trimstart@npm:1.0.5"
+"string.prototype.trimend@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimend@npm:1.0.7"
   dependencies:
     call-bind: ^1.0.2
-    define-properties: ^1.1.4
-    es-abstract: ^1.19.5
-  checksum: a4857c5399ad709d159a77371eeaa8f9cc284469a0b5e1bfe405de16f1fd4166a8ea6f4180e55032f348d1b679b1599fd4301fbc7a8b72bdb3e795e43f7b1048
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+  languageName: node
+  linkType: hard
+
+"string.prototype.trimstart@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "string.prototype.trimstart@npm:1.0.7"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
   languageName: node
   linkType: hard
 
@@ -17309,6 +16805,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "strip-ansi@npm:6.0.1"
+  dependencies:
+    ansi-regex: ^5.0.1
+  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
+  languageName: node
+  linkType: hard
+
 "strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1":
   version: 3.0.1
   resolution: "strip-ansi@npm:3.0.1"
@@ -17318,21 +16823,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
-  version: 6.0.1
-  resolution: "strip-ansi@npm:6.0.1"
-  dependencies:
-    ansi-regex: ^5.0.1
-  checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c
-  languageName: node
-  linkType: hard
-
-"strip-ansi@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "strip-ansi@npm:7.0.1"
+"strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "strip-ansi@npm:7.1.0"
   dependencies:
     ansi-regex: ^6.0.1
-  checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039
+  checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d
   languageName: node
   linkType: hard
 
@@ -17397,12 +16893,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"strip-indent@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "strip-indent@npm:3.0.0"
+"strip-indent@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "strip-indent@npm:4.0.0"
   dependencies:
-    min-indent: ^1.0.0
-  checksum: 18f045d57d9d0d90cd16f72b2313d6364fd2cb4bf85b9f593523ad431c8720011a4d5f08b6591c9d580f446e78855c5334a30fb91aa1560f5d9f95ed1b4a0530
+    min-indent: ^1.0.1
+  checksum: 06cbcd93da721c46bc13caeb1c00af93a9b18146a1c95927672d2decab6a25ad83662772417cea9317a2507fb143253ecc23c4415b64f5828cef9b638a744598
   languageName: node
   linkType: hard
 
@@ -17439,15 +16935,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"stylehacks@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "stylehacks@npm:5.1.1"
+"stylehacks@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "stylehacks@npm:6.0.0"
   dependencies:
     browserslist: ^4.21.4
     postcss-selector-parser: ^6.0.4
   peerDependencies:
     postcss: ^8.2.15
-  checksum: 11175366ef52de65bf06cefba0ddc9db286dc3a1451fd2989e74c6ea47091a02329a4bf6ce10b1a36950056927b6bbbe47c5ab3a1f4c7032df932d010fbde5a2
+  checksum: b6071ab5f4451576e3a445f7304b41c43329f84d7a7987a91442febaabc1de51e62f1e37c4f37fad21990d3f573a8110bd31e09f9df7b8628465e19b1cdc702b
   languageName: node
   linkType: hard
 
@@ -17486,58 +16982,53 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"stylelint@npm:14.16.1":
-  version: 14.16.1
-  resolution: "stylelint@npm:14.16.1"
+"stylelint@npm:^15":
+  version: 15.10.3
+  resolution: "stylelint@npm:15.10.3"
   dependencies:
-    "@csstools/selector-specificity": ^2.0.2
+    "@csstools/css-parser-algorithms": ^2.3.1
+    "@csstools/css-tokenizer": ^2.2.0
+    "@csstools/media-query-list-parser": ^2.1.4
+    "@csstools/selector-specificity": ^3.0.0
     balanced-match: ^2.0.0
     colord: ^2.9.3
-    cosmiconfig: ^7.1.0
-    css-functions-list: ^3.1.0
+    cosmiconfig: ^8.2.0
+    css-functions-list: ^3.2.0
+    css-tree: ^2.3.1
     debug: ^4.3.4
-    fast-glob: ^3.2.12
+    fast-glob: ^3.3.1
     fastest-levenshtein: ^1.0.16
     file-entry-cache: ^6.0.1
     global-modules: ^2.0.0
     globby: ^11.1.0
     globjoin: ^0.1.4
-    html-tags: ^3.2.0
-    ignore: ^5.2.1
+    html-tags: ^3.3.1
+    ignore: ^5.2.4
     import-lazy: ^4.0.0
     imurmurhash: ^0.1.4
     is-plain-object: ^5.0.0
-    known-css-properties: ^0.26.0
+    known-css-properties: ^0.28.0
     mathml-tag-names: ^2.1.3
-    meow: ^9.0.0
+    meow: ^10.1.5
     micromatch: ^4.0.5
     normalize-path: ^3.0.0
     picocolors: ^1.0.0
-    postcss: ^8.4.19
-    postcss-media-query-parser: ^0.2.3
+    postcss: ^8.4.27
     postcss-resolve-nested-selector: ^0.1.1
     postcss-safe-parser: ^6.0.0
-    postcss-selector-parser: ^6.0.11
+    postcss-selector-parser: ^6.0.13
     postcss-value-parser: ^4.2.0
     resolve-from: ^5.0.0
     string-width: ^4.2.3
     strip-ansi: ^6.0.1
     style-search: ^0.1.0
-    supports-hyperlinks: ^2.3.0
+    supports-hyperlinks: ^3.0.0
     svg-tags: ^1.0.0
     table: ^6.8.1
-    v8-compile-cache: ^2.3.0
-    write-file-atomic: ^4.0.2
+    write-file-atomic: ^5.0.1
   bin:
-    stylelint: bin/stylelint.js
-  checksum: bc24050415e3c357a76d8ca2799e74ce31f33c9158b4086462512b0191db5d6a161b81ef35b064039c6eacf98a5553e45fca4c5f21eb4d45e7f1d44b2d226e9b
-  languageName: node
-  linkType: hard
-
-"stylis@npm:4.1.3":
-  version: 4.1.3
-  resolution: "stylis@npm:4.1.3"
-  checksum: d04dbffcb9bf2c5ca8d8dc09534203c75df3bf711d33973ea22038a99cc475412a350b661ebd99cbc01daa50d7eedcf0d130d121800eb7318759a197023442a6
+    stylelint: bin/stylelint.mjs
+  checksum: eb70dd0e4d500141f4868ddb7403ad7eb8732b02a3f2fe3907d0859369cedd395b60b0075da758b5be07de771c586b1bf64de4eead8159d46b0d16beff827e67
   languageName: node
   linkType: hard
 
@@ -17582,13 +17073,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "supports-hyperlinks@npm:2.3.0"
+"supports-hyperlinks@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "supports-hyperlinks@npm:3.0.0"
   dependencies:
     has-flag: ^4.0.0
     supports-color: ^7.0.0
-  checksum: 9ee0de3c8ce919d453511b2b1588a8205bd429d98af94a01df87411391010fe22ca463f268c84b2ce2abad019dfff8452aa02806eeb5c905a8d7ad5c4f4c52b8
+  checksum: 41021305de5255b10d821bf93c7a781f783e1693d0faec293d7fc7ccf17011b90bde84b0295fa92ba75c6c390351fe84fdd18848cad4bf656e464a958243c3e7
   languageName: node
   linkType: hard
 
@@ -17617,20 +17108,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"svgo@npm:^2.7.0":
-  version: 2.8.0
-  resolution: "svgo@npm:2.8.0"
+"svgo@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "svgo@npm:3.0.2"
   dependencies:
     "@trysound/sax": 0.2.0
     commander: ^7.2.0
-    css-select: ^4.1.3
-    css-tree: ^1.1.3
-    csso: ^4.2.0
+    css-select: ^5.1.0
+    css-tree: ^2.2.1
+    csso: ^5.0.5
     picocolors: ^1.0.0
-    stable: ^0.1.8
   bin:
     svgo: bin/svgo
-  checksum: b92f71a8541468ffd0b81b8cdb36b1e242eea320bf3c1a9b2c8809945853e9d8c80c19744267eb91cabf06ae9d5fff3592d677df85a31be4ed59ff78534fa420
+  checksum: 381ba14aa782e71ab7033227634a3041c11fa3e2769aeaf0df43a08a615de61925108e34f55af6e7c5146f4a3109e78deabb4fa9d687e36d45d1f848b4e23d17
   languageName: node
   linkType: hard
 
@@ -17685,30 +17175,37 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"tar-stream@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "tar-stream@npm:2.2.0"
+"tar-stream@npm:^3.0.0":
+  version: 3.1.6
+  resolution: "tar-stream@npm:3.1.6"
   dependencies:
-    bl: ^4.0.3
-    end-of-stream: ^1.4.1
-    fs-constants: ^1.0.0
-    inherits: ^2.0.3
-    readable-stream: ^3.1.1
-  checksum: 699831a8b97666ef50021c767f84924cfee21c142c2eb0e79c63254e140e6408d6d55a065a2992548e72b06de39237ef2b802b99e3ece93ca3904a37622a66f3
+    b4a: ^1.6.4
+    fast-fifo: ^1.2.0
+    streamx: ^2.15.0
+  checksum: f3627f918581976e954ff03cb8d370551053796b82564f8c7ca8fac84c48e4d042026d0854fc222171a34ff9c682b72fae91be9c9b0a112d4c54f9e4f443e9c5
   languageName: node
   linkType: hard
 
 "tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.1.11
-  resolution: "tar@npm:6.1.11"
+  version: 6.2.0
+  resolution: "tar@npm:6.2.0"
   dependencies:
     chownr: ^2.0.0
     fs-minipass: ^2.0.0
-    minipass: ^3.0.0
+    minipass: ^5.0.0
     minizlib: ^2.1.1
     mkdirp: ^1.0.3
     yallist: ^4.0.0
-  checksum: a04c07bb9e2d8f46776517d4618f2406fb977a74d914ad98b264fc3db0fe8224da5bec11e5f8902c5b9bcb8ace22d95fbe3c7b36b8593b7dfc8391a25898f32f
+  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
+  languageName: node
+  linkType: hard
+
+"teex@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "teex@npm:1.0.1"
+  dependencies:
+    streamx: ^2.12.5
+  checksum: 36bf7ce8bb5eb428ad7b14b695ee7fb0a02f09c1a9d8181cc42531208543a920b299d711bf78dad4ff9bcf36ac437ae8e138053734746076e3e0e7d6d76eef64
   languageName: node
   linkType: hard
 
@@ -17731,7 +17228,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:5.3.9":
+"terser-webpack-plugin@npm:5.3.9, terser-webpack-plugin@npm:^5.3.7":
   version: 5.3.9
   resolution: "terser-webpack-plugin@npm:5.3.9"
   dependencies:
@@ -17753,53 +17250,17 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"terser-webpack-plugin@npm:^5.3.7":
-  version: 5.3.7
-  resolution: "terser-webpack-plugin@npm:5.3.7"
-  dependencies:
-    "@jridgewell/trace-mapping": ^0.3.17
-    jest-worker: ^27.4.5
-    schema-utils: ^3.1.1
-    serialize-javascript: ^6.0.1
-    terser: ^5.16.5
-  peerDependencies:
-    webpack: ^5.1.0
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    esbuild:
-      optional: true
-    uglify-js:
-      optional: true
-  checksum: 095e699fdeeb553cdf2c6f75f983949271b396d9c201d7ae9fc633c45c1c1ad14c7257ef9d51ccc62213dd3e97f875870ba31550f6d4f1b6674f2615562da7f7
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.0.0, terser@npm:^5.10.0, terser@npm:^5.16.5":
-  version: 5.16.6
-  resolution: "terser@npm:5.16.6"
-  dependencies:
-    "@jridgewell/source-map": ^0.3.2
-    acorn: ^8.5.0
-    commander: ^2.20.0
-    source-map-support: ~0.5.20
-  bin:
-    terser: bin/terser
-  checksum: f763a7bcc7b98cb2bfc41434f7b92bfe8a701a12c92ea6049377736c8e6de328240d654a20dfe15ce170fd783491b9873fad9f4cd8fee4f6c6fb8ca407859dee
-  languageName: node
-  linkType: hard
-
-"terser@npm:^5.16.8":
-  version: 5.17.1
-  resolution: "terser@npm:5.17.1"
+"terser@npm:^5.0.0, terser@npm:^5.10.0, terser@npm:^5.16.8":
+  version: 5.22.0
+  resolution: "terser@npm:5.22.0"
   dependencies:
-    "@jridgewell/source-map": ^0.3.2
-    acorn: ^8.5.0
+    "@jridgewell/source-map": ^0.3.3
+    acorn: ^8.8.2
     commander: ^2.20.0
     source-map-support: ~0.5.20
   bin:
     terser: bin/terser
-  checksum: 69b0e80e3c4084db2819de4d6ae8a2ba79f2fcd7ed6df40fe4b602ec7bfd8e889cc63c7d5268f30990ffecbf6eeda18f857adad9386fe2c2331b398d58ed855c
+  checksum: ee95981c54ebd381e0b7f5872c646e7a05543e53960f8e0c2f240863c368989d43a3ca80b7e9f691683c92ba199eb4b91d61785fef0b9ca4a887eb55866001f4
   languageName: node
   linkType: hard
 
@@ -17828,17 +17289,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"through2-filter@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "through2-filter@npm:3.0.0"
-  dependencies:
-    through2: ~2.0.0
-    xtend: ~4.0.0
-  checksum: 2fa0f042290749824b973c27ae006f9dfe7c9bcee570504ab066998e3bd7d43bea28b642eef8a4434dbfd0a7cd18c8823ac81927614234fd477ccd5ea38fab18
-  languageName: node
-  linkType: hard
-
-"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:^2.0.3, through2@npm:~2.0.0":
+"through2@npm:^2.0.0, through2@npm:^2.0.1":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
@@ -17857,7 +17308,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"through@npm:2, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1":
+"through@npm:2, through@npm:~2.3, through@npm:~2.3.1":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
   checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd
@@ -17871,16 +17322,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"tiny-glob@npm:^0.2.9":
-  version: 0.2.9
-  resolution: "tiny-glob@npm:0.2.9"
-  dependencies:
-    globalyzer: 0.1.0
-    globrex: ^0.1.2
-  checksum: aea5801eb6663ddf77ebb74900b8f8bd9dfcfc9b6a1cc8018cb7421590c00bf446109ff45e4b64a98e6c95ddb1255a337a5d488fb6311930e2a95334151ec9c6
-  languageName: node
-  linkType: hard
-
 "tinycolor2@npm:^1.6.0":
   version: 1.6.0
   resolution: "tinycolor2@npm:1.6.0"
@@ -17888,6 +17329,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"titleize@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "titleize@npm:3.0.0"
+  checksum: 71fbbeabbfb36ccd840559f67f21e356e1d03da2915b32d2ae1a60ddcc13a124be2739f696d2feb884983441d159a18649e8d956648d591bdad35c430a6b6d28
+  languageName: node
+  linkType: hard
+
 "tmp@npm:^0.2.1":
   version: 0.2.1
   resolution: "tmp@npm:0.2.1"
@@ -17904,16 +17352,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"to-absolute-glob@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "to-absolute-glob@npm:2.0.2"
-  dependencies:
-    is-absolute: ^1.0.0
-    is-negated-glob: ^1.0.0
-  checksum: 0a8bef172909e43d711bfd33792643f2eec35b9109bde927dabfd231e6ad643b7a657f306c93c6e7b89f71d3de74ac94060fe9637bca8c37b036523993664323
-  languageName: node
-  linkType: hard
-
 "to-fast-properties@npm:^2.0.0":
   version: 2.0.0
   resolution: "to-fast-properties@npm:2.0.0"
@@ -17955,12 +17393,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"to-through@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "to-through@npm:2.0.0"
+"to-through@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "to-through@npm:3.0.0"
   dependencies:
-    through2: ^2.0.3
-  checksum: 5834a69d68cbe0d74115373bbe219dbe60c1950021f5ec9dd4af179ffbb307bce3d45fde9dacec05a8f4f79b86734433eb9b42946ccb81d2d4d4f8828628b7e6
+    streamx: ^2.12.5
+  checksum: 404ad1a346babab53d75d3b4deb779916760fc9e605f4e64ec789366edf08e75ad592a262ca566e7864f77c03375151dcfac4744ff7fd52417cb2a2e9fc60795
   languageName: node
   linkType: hard
 
@@ -17968,33 +17406,21 @@ dexie@latest:
   version: 4.2.1
   resolution: "token-types@npm:4.2.1"
   dependencies:
-    "@tokenizer/token": ^0.3.0
-    ieee754: ^1.2.1
-  checksum: cce256766b33e0f08ceffefa2198fb4961a417866d00780e58625999ab5c0699821407053e64eadc41b00bbb6c0d0c4d02fbd2199940d8a3ccb71e1b148ab9a2
-  languageName: node
-  linkType: hard
-
-"tough-cookie@npm:4.1.3":
-  version: 4.1.3
-  resolution: "tough-cookie@npm:4.1.3"
-  dependencies:
-    psl: ^1.1.33
-    punycode: ^2.1.1
-    universalify: ^0.2.0
-    url-parse: ^1.5.3
-  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+    "@tokenizer/token": ^0.3.0
+    ieee754: ^1.2.1
+  checksum: cce256766b33e0f08ceffefa2198fb4961a417866d00780e58625999ab5c0699821407053e64eadc41b00bbb6c0d0c4d02fbd2199940d8a3ccb71e1b148ab9a2
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.0.0":
-  version: 4.1.2
-  resolution: "tough-cookie@npm:4.1.2"
+"tough-cookie@npm:4.1.3, tough-cookie@npm:^4.1.2":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
   dependencies:
     psl: ^1.1.33
     punycode: ^2.1.1
     universalify: ^0.2.0
     url-parse: ^1.5.3
-  checksum: a7359e9a3e875121a84d6ba40cc184dec5784af84f67f3a56d1d2ae39b87c0e004e6ba7c7331f9622a7d2c88609032473488b28fe9f59a1fec115674589de39a
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
   languageName: node
   linkType: hard
 
@@ -18032,10 +17458,19 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"trim-newlines@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "trim-newlines@npm:3.0.1"
-  checksum: b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206
+"trim-newlines@npm:^4.0.2":
+  version: 4.1.1
+  resolution: "trim-newlines@npm:4.1.1"
+  checksum: 5b09f8e329e8f33c1111ef26906332ba7ba7248cde3e26fc054bb3d69f2858bf5feedca9559c572ff91f33e52977c28e0d41c387df6a02a633cbb8c2d8238627
+  languageName: node
+  linkType: hard
+
+"ts-api-utils@npm:^1.0.1":
+  version: 1.0.3
+  resolution: "ts-api-utils@npm:1.0.3"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
   languageName: node
   linkType: hard
 
@@ -18093,29 +17528,29 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1":
-  version: 3.14.1
-  resolution: "tsconfig-paths@npm:3.14.1"
+"tsconfig-paths@npm:^3.14.2":
+  version: 3.14.2
+  resolution: "tsconfig-paths@npm:3.14.2"
   dependencies:
     "@types/json5": ^0.0.29
-    json5: ^1.0.1
+    json5: ^1.0.2
     minimist: ^1.2.6
     strip-bom: ^3.0.0
-  checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d
+  checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.10.0, tslib@npm:^1.8.1, tslib@npm:^1.9.0, tslib@npm:^1.9.3":
+"tslib@npm:^1.8.1, tslib@npm:^1.9.3":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd
   languageName: node
   linkType: hard
 
-"tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0":
-  version: 2.5.0
-  resolution: "tslib@npm:2.5.0"
-  checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1
+"tslib@npm:^2.0.3, tslib@npm:^2.3.0, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.6.0, tslib@npm:^2.6.1, tslib@npm:^2.6.2":
+  version: 2.6.2
+  resolution: "tslib@npm:2.6.2"
+  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
   languageName: node
   linkType: hard
 
@@ -18130,12 +17565,12 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"tsyringe@npm:4.7.0":
-  version: 4.7.0
-  resolution: "tsyringe@npm:4.7.0"
+"tsyringe@npm:4.8.0, tsyringe@npm:^4.8.0":
+  version: 4.8.0
+  resolution: "tsyringe@npm:4.8.0"
   dependencies:
     tslib: ^1.9.3
-  checksum: 6d84e0767538fabf60eafb926bd285d08d25847875b635f8a3ab8b3093c8814aca4f47072fbb51837bd431259dc2464572e5c28a838b833c9ef097d5b1a895b3
+  checksum: 6bf13235cc1ae86829169e3a887c3ff6ee2d220678df01dd0fff202b5a533d4eb47a52334b76d2b1b1cf80c8c92ff22173a54ad72c9f1b8ea0ea4957304966f0
   languageName: node
   linkType: hard
 
@@ -18164,13 +17599,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.11.0":
-  version: 0.11.0
-  resolution: "type-fest@npm:0.11.0"
-  checksum: 8e7589e1eb5ced6c8e1d3051553b59b9f525c41e58baa898229915781c7bf55db8cb2f74e56d8031f6af5af2eecc7cb8da9ca3af7e5b80b49d8ca5a81891f3f9
-  languageName: node
-  linkType: hard
-
 "type-fest@npm:^0.16.0":
   version: 0.16.0
   resolution: "type-fest@npm:0.16.0"
@@ -18178,13 +17606,6 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.18.0":
-  version: 0.18.1
-  resolution: "type-fest@npm:0.18.1"
-  checksum: e96dcee18abe50ec82dab6cbc4751b3a82046da54c52e3b2d035b3c519732c0b3dd7a2fa9df24efd1a38d953d8d4813c50985f215f1957ee5e4f26b0fe0da395
-  languageName: node
-  linkType: hard
-
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"
@@ -18192,17 +17613,64 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "type-fest@npm:0.6.0"
-  checksum: b2188e6e4b21557f6e92960ec496d28a51d68658018cba8b597bd3ef757721d1db309f120ae987abeeda874511d14b776157ff809f23c6d1ce8f83b9b2b7d60f
+"type-fest@npm:^0.21.3":
+  version: 0.21.3
+  resolution: "type-fest@npm:0.21.3"
+  checksum: e6b32a3b3877f04339bae01c193b273c62ba7bfc9e325b8703c4ee1b32dc8fe4ef5dfa54bf78265e069f7667d058e360ae0f37be5af9f153b22382cd55a9afe0
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.8.1":
-  version: 0.8.1
-  resolution: "type-fest@npm:0.8.1"
-  checksum: d61c4b2eba24009033ae4500d7d818a94fd6d1b481a8111612ee141400d5f1db46f199c014766b9fa9b31a6a7374d96fc748c6d688a78a3ce5a33123839becb7
+"type-fest@npm:^1.0.1, type-fest@npm:^1.0.2, type-fest@npm:^1.2.1, type-fest@npm:^1.2.2":
+  version: 1.4.0
+  resolution: "type-fest@npm:1.4.0"
+  checksum: b011c3388665b097ae6a109a437a04d6f61d81b7357f74cbcb02246f2f5bd72b888ae33631b99871388122ba0a87f4ff1c94078e7119ff22c70e52c0ff828201
+  languageName: node
+  linkType: hard
+
+"typed-array-buffer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-buffer@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.2.1
+    is-typed-array: ^1.1.10
+  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-length@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-length@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+  languageName: node
+  linkType: hard
+
+"typed-array-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "typed-array-byte-offset@npm:1.0.0"
+  dependencies:
+    available-typed-arrays: ^1.0.5
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    has-proto: ^1.0.1
+    is-typed-array: ^1.1.10
+  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+  languageName: node
+  linkType: hard
+
+"typed-array-length@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "typed-array-length@npm:1.0.4"
+  dependencies:
+    call-bind: ^1.0.2
+    for-each: ^0.3.3
+    is-typed-array: ^1.1.9
+  checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956
   languageName: node
   linkType: hard
 
@@ -18225,13 +17693,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.0.4, typescript@npm:^5.0.2":
-  version: 5.0.4
-  resolution: "typescript@npm:5.0.4"
+"typescript@npm:5.2.2, typescript@npm:^5, typescript@npm:^5.2.2":
+  version: 5.2.2
+  resolution: "typescript@npm:5.2.2"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 82b94da3f4604a8946da585f7d6c3025fff8410779e5bde2855ab130d05e4fd08938b9e593b6ebed165bda6ad9292b230984f10952cf82f0a0ca07bbeaa08172
+  checksum: 7912821dac4d962d315c36800fe387cdc0a6298dba7ec171b350b4a6e988b51d7b8f051317786db1094bd7431d526b648aba7da8236607febb26cf5b871d2d3c
   languageName: node
   linkType: hard
 
@@ -18245,38 +17713,28 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.0.2#~builtin<compat/typescript>":
-  version: 5.0.4
-  resolution: "typescript@patch:typescript@npm%3A5.0.4#~builtin<compat/typescript>::version=5.0.4&hash=a1c5e5"
+"typescript@patch:typescript@5.2.2#~builtin<compat/typescript>, typescript@patch:typescript@^5#~builtin<compat/typescript>, typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
+  version: 5.2.2
+  resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin<compat/typescript>::version=5.2.2&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 6a1fe9a77bb9c5176ead919cc4a1499ee63e46b4e05bf667079f11bf3a8f7887f135aa72460a4c3b016e6e6bb65a822cb8689a6d86cbfe92d22cc9f501f09213
+  checksum: 07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
   languageName: node
   linkType: hard
 
 "typeson-registry@npm:^1.0.0-alpha.20":
-  version: 1.0.0-alpha.38
-  resolution: "typeson-registry@npm:1.0.0-alpha.38"
+  version: 1.0.0-alpha.39
+  resolution: "typeson-registry@npm:1.0.0-alpha.39"
   dependencies:
-    base64-arraybuffer-es6: ^0.6.0
-    typeson: ^5.18.2
-    whatwg-url: ^8.1.0
-  checksum: 3aff6cf8444fad6a1be382a3204188a9c16c96a3ee71faabab0b60fc1450db3a2c4b8c29d2a85c12da4a0a1e47fd5c07ab2adacc2bb60450e3bac84c35215487
-  languageName: node
-  linkType: hard
-
-"typeson@npm:^5.18.2":
-  version: 5.18.2
-  resolution: "typeson@npm:5.18.2"
-  peerDependencies:
-    core-js-bundle: ^3.6.4
-    regenerator-runtime: ^0.13.3
-  checksum: ce2cb4899a925d7a960de0c83ec0665859faa5bc0de246cb0f52b7ae05b6b6e2bff4fb7d191e7f51605b71ed394894164cdef3f2fafb1e9ba6ff647962fa0517
+    base64-arraybuffer-es6: ^0.7.0
+    typeson: ^6.0.0
+    whatwg-url: ^8.4.0
+  checksum: c6b629697acf4652aecfff7be760356d764600afc9beca253278bbfc44fae0fe635b7619201b83e497cdc30645cbce7614d12a04b5726d9b8b505f73e6a3fc2a
   languageName: node
   linkType: hard
 
-"typeson@npm:^6.1.0":
+"typeson@npm:^6.0.0, typeson@npm:^6.1.0":
   version: 6.1.0
   resolution: "typeson@npm:6.1.0"
   checksum: 00a77b03ac8f704acb103307bad9295fe47d6b304c386297f078ec3be63875c0b81e022a4815edb9dc2c7da0a72a431345411d35c755a8510af4a420e9e46cdc
@@ -18318,7 +17776,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"unc-path-regex@npm:^0.1.0, unc-path-regex@npm:^0.1.2":
+"unc-path-regex@npm:^0.1.0":
   version: 0.1.2
   resolution: "unc-path-regex@npm:0.1.2"
   checksum: a05fa2006bf4606051c10fc7968f08ce7b28fa646befafa282813aeb1ac1a56f65cb1b577ca7851af2726198d59475bb49b11776036257b843eaacee2860a4ec
@@ -18332,6 +17790,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~5.25.1":
+  version: 5.25.3
+  resolution: "undici-types@npm:5.25.3"
+  checksum: ec9d2cc36520cbd9fbe3b3b6c682a87fe5be214699e1f57d1e3d9a2cb5be422e62735f06e0067dc325fd3dd7404c697e4d479f9147dc8a804e049e29f357f2ff
+  languageName: node
+  linkType: hard
+
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
@@ -18357,37 +17822,27 @@ dexie@latest:
   linkType: hard
 
 "unicode-property-aliases-ecmascript@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "unicode-property-aliases-ecmascript@npm:2.0.0"
-  checksum: dda4d39128cbbede2ac60fbb85493d979ec65913b8a486bf7cb7a375a2346fa48cbf9dc6f1ae23376e7e8e684c2b411434891e151e865a661b40a85407db51d0
-  languageName: node
-  linkType: hard
-
-"unique-filename@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "unique-filename@npm:2.0.1"
-  dependencies:
-    unique-slug: ^3.0.0
-  checksum: 807acf3381aff319086b64dc7125a9a37c09c44af7620bd4f7f3247fcd5565660ac12d8b80534dcbfd067e6fe88a67e621386dd796a8af828d1337a8420a255f
+  version: 2.1.0
+  resolution: "unicode-property-aliases-ecmascript@npm:2.1.0"
+  checksum: 243524431893649b62cc674d877bd64ef292d6071dd2fd01ab4d5ad26efbc104ffcd064f93f8a06b7e4ec54c172bf03f6417921a0d8c3a9994161fe1f88f815b
   languageName: node
   linkType: hard
 
-"unique-slug@npm:^3.0.0":
+"unique-filename@npm:^3.0.0":
   version: 3.0.0
-  resolution: "unique-slug@npm:3.0.0"
+  resolution: "unique-filename@npm:3.0.0"
   dependencies:
-    imurmurhash: ^0.1.4
-  checksum: 49f8d915ba7f0101801b922062ee46b7953256c93ceca74303bd8e6413ae10aa7e8216556b54dc5382895e8221d04f1efaf75f945c2e4a515b4139f77aa6640c
+    unique-slug: ^4.0.0
+  checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
   languageName: node
   linkType: hard
 
-"unique-stream@npm:^2.0.2":
-  version: 2.3.1
-  resolution: "unique-stream@npm:2.3.1"
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
   dependencies:
-    json-stable-stringify-without-jsonify: ^1.0.1
-    through2-filter: ^3.0.0
-  checksum: 65e433e68e46640e9283dbb022493c8d79ed1dac47807fe751dfe3bd50586927f63ad880ce9e01c2f85911f3caca48d04731aff6f07869434d5f76ecfe478559
+    imurmurhash: ^0.1.4
+  checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15
   languageName: node
   linkType: hard
 
@@ -18400,6 +17855,15 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"unique-string@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-string@npm:3.0.0"
+  dependencies:
+    crypto-random-string: ^4.0.0
+  checksum: 1a1e2e7d02eab1bb10f720475da735e1990c8a5ff34edd1a3b6bc31590cb4210b7a1233d779360cc622ce11c211e43afa1628dd658f35d3e6a89964b622940df
+  languageName: node
+  linkType: hard
+
 "universalify@npm:^0.2.0":
   version: 0.2.0
   resolution: "universalify@npm:0.2.0"
@@ -18414,6 +17878,13 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"untildify@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "untildify@npm:4.0.0"
+  checksum: 39ced9c418a74f73f0a56e1ba4634b4d959422dff61f4c72a8e39f60b99380c1b45ed776fbaa0a4101b157e4310d873ad7d114e8534ca02609b4916bb4187fb9
+  languageName: node
+  linkType: hard
+
 "upath@npm:^1.2.0":
   version: 1.2.0
   resolution: "upath@npm:1.2.0"
@@ -18421,23 +17892,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.10":
-  version: 1.0.10
-  resolution: "update-browserslist-db@npm:1.0.10"
-  dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
-  peerDependencies:
-    browserslist: ">= 4.21.0"
-  bin:
-    browserslist-lint: cli.js
-  checksum: 12db73b4f63029ac407b153732e7cd69a1ea8206c9100b482b7d12859cd3cd0bc59c602d7ae31e652706189f1acb90d42c53ab24a5ba563ed13aebdddc5561a0
-  languageName: node
-  linkType: hard
-
-"update-browserslist-db@npm:^1.0.11":
-  version: 1.0.11
-  resolution: "update-browserslist-db@npm:1.0.11"
+"update-browserslist-db@npm:^1.0.13":
+  version: 1.0.13
+  resolution: "update-browserslist-db@npm:1.0.13"
   dependencies:
     escalade: ^3.1.1
     picocolors: ^1.0.0
@@ -18445,7 +17902,7 @@ dexie@latest:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: b98327518f9a345c7cad5437afae4d2ae7d865f9779554baf2a200fdf4bac4969076b679b1115434bd6557376bdd37ca7583d0f9b8f8e302d7d4cc1e91b5f231
+  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
   languageName: node
   linkType: hard
 
@@ -18490,11 +17947,11 @@ dexie@latest:
   linkType: hard
 
 "utif2@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "utif2@npm:4.0.1"
+  version: 4.1.0
+  resolution: "utif2@npm:4.1.0"
   dependencies:
     pako: ^1.0.11
-  checksum: 96f7bd28696e041b1e518890265dc7896567d8c7bf1acf9a3c8ea8d3eb677560fed098a57767b15990c3c76918853dca51cdaddf456a5ad6091ce45fd21064dd
+  checksum: b8a7ba68c503c95dd3137eb20c677553dab7641f4539a75dacc2a94ad7e3d1b5b62b547daa559b07cbeb4b9e2f54c15130ced97667775e320bfdccfba9843edd
   languageName: node
   linkType: hard
 
@@ -18535,21 +17992,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"v8-compile-cache@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: adb0a271eaa2297f2f4c536acbfee872d0dd26ec2d76f66921aa7fc437319132773483344207bdbeee169225f4739016d8d2dbf0553913a52bb34da6d0334f8e
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^9.0.1":
-  version: 9.0.1
-  resolution: "v8-to-istanbul@npm:9.0.1"
+  version: 9.1.3
+  resolution: "v8-to-istanbul@npm:9.1.3"
   dependencies:
     "@jridgewell/trace-mapping": ^0.3.12
     "@types/istanbul-lib-coverage": ^2.0.1
-    convert-source-map: ^1.6.0
-  checksum: a49c34bf0a3af0c11041a3952a2600913904a983bd1bc87148b5c033bc5c1d02d5a13620fcdbfa2c60bc582a2e2970185780f0c844b4c3a220abf405f8af6311
+    convert-source-map: ^2.0.0
+  checksum: 5d592ab3d186b386065dace8e01c543a922a904b3cfac39667de172455a6b3d0e8e1401574fecb8a12092ad0809b5a8fd15f1cc14d0666139a1bb77cd6ac2cf8
   languageName: node
   linkType: hard
 
@@ -18563,50 +18013,56 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"value-or-function@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "value-or-function@npm:3.0.0"
-  checksum: 2b901d05b82deb8565d4edeba02e0737be73e7fb2c640b79fa64152aae8b450f790a46c86bf7039f91938c1b69d2cc0908cd18c4695b120293bb442179061fac
+"value-or-function@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "value-or-function@npm:4.0.0"
+  checksum: 16b6aed84b8f9732a7eb7a5035a1480be3689d097a73b1154fb827caf021d5f2b6f60c0dfe694bfc8c9605f06cfc093dc428efdc3d24cb2768fbe202ffd42ae1
   languageName: node
   linkType: hard
 
-"vinyl-fs@npm:^3.0.1":
-  version: 3.0.3
-  resolution: "vinyl-fs@npm:3.0.3"
+"vinyl-contents@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "vinyl-contents@npm:2.0.0"
+  dependencies:
+    bl: ^5.0.0
+    vinyl: ^3.0.0
+  checksum: 10d72a032e6317bf89713565d616df8726ee41601a41c48c7d778e61ab557c0a5fdee883ceecbfb33da4a5e11ea80e76e5ae63c1d13fda61edbb5ef50445c8b2
+  languageName: node
+  linkType: hard
+
+"vinyl-fs@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "vinyl-fs@npm:4.0.0"
   dependencies:
-    fs-mkdirp-stream: ^1.0.0
-    glob-stream: ^6.1.0
-    graceful-fs: ^4.0.0
+    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
-    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
-  checksum: 948366325994e13e331bc559ac38d10bff9469eeb227e627cc903cb7580c73779158c7b25dd7ac416df2fc261cdd5341896e680c086de693de71420ccbdb9cd5
+    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
+  checksum: 4cf83dea5123ac1f99e43e0710f22f5cb7524e6e13568cbac434a51015ae1d97965210feb9ff0787c4fa1cd79eb5f8538d86210cdafb76fd64c19bc3e755802a
   languageName: node
   linkType: hard
 
-"vinyl-sourcemap@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "vinyl-sourcemap@npm:1.1.0"
+"vinyl-sourcemap@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "vinyl-sourcemap@npm:2.0.0"
   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
-  checksum: e7174851faff44ffd0f91d4d7234a0c153cad7da9c142e5ef46b4a24fe5ab0c98c997db7c719919cbab28edb4b9cf9ec3d7fed8460f047b3d640740a613ec944
+    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
+  checksum: c805fe46f586cf4435ac58d60818c1ae5d82f0c47498895f49842ca5d9f8b5167bfa88f6b4a84c0cb6761abf791d593ee580712685a57aaf3388122d22740afa
   languageName: node
   linkType: hard
 
@@ -18621,49 +18077,39 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"vinyl@npm:^2.0.0, vinyl@npm:^2.2.0":
-  version: 2.2.1
-  resolution: "vinyl@npm:2.2.1"
+"vinyl@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "vinyl@npm:3.0.0"
   dependencies:
-    clone: ^2.1.1
-    clone-buffer: ^1.0.0
+    clone: ^2.1.2
     clone-stats: ^1.0.0
-    cloneable-readable: ^1.0.0
-    remove-trailing-separator: ^1.0.1
-    replace-ext: ^1.0.0
-  checksum: 1f663973f1362f2d074b554f79ff7673187667082373b3d3e628beb1fc2a7ff33024f10b492fbd8db421a09ea3b7b22c3d3de4a0f0e73ead7b4685af570b906f
+    remove-trailing-separator: ^1.1.0
+    replace-ext: ^2.0.0
+    teex: ^1.0.1
+  checksum: 29c563d6a027d49ec216bc8259b494bd048d1f9df39103aea6877e02af1d0a6956b11ad977206b5a807b331ef5431bed9f6b8890de5e55188389d31cf7af7fbe
   languageName: node
   linkType: hard
 
-"vscode-languageserver-textdocument@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "vscode-languageserver-textdocument@npm:1.0.8"
-  checksum: d6b685456ceca2736793d7fc1924d78a8483997c96c6ec4900d90e64115730da6c0c03e3fbc2c5d031a4592f2acd9cca2ca58a651b696c4f40b8690a48538c06
-  languageName: node
-  linkType: hard
-
-"vscode-uri@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "vscode-uri@npm:3.0.7"
-  checksum: c899a0334f9f6ba53021328e083f6307978c09b94407d7e5fe86fcd8fcb8f1da0cb344123a335e55769055007a46d51aff83f9ee1dfc0296ee54b78f34ef0e4f
+"vscode-languageserver-textdocument@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "vscode-languageserver-textdocument@npm:1.0.11"
+  checksum: ea7cdc9d4ffaae5952071fa11d17d714215a76444e6936c9359f94b9ba3222a52a55edb5bd5928bd3e9712b900a9f175bb3565ec1c8923234fe3bd327584bafb
   languageName: node
   linkType: hard
 
-"w3c-hr-time@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "w3c-hr-time@npm:1.0.2"
-  dependencies:
-    browser-process-hrtime: ^1.0.0
-  checksum: ec3c2dacbf8050d917bbf89537a101a08c2e333b4c19155f7d3bedde43529d4339db6b3d049d9610789cb915f9515f8be037e0c54c079e9d4735c50b37ed52b9
+"vscode-uri@npm:^3.0.8":
+  version: 3.0.8
+  resolution: "vscode-uri@npm:3.0.8"
+  checksum: 514249126850c0a41a7d8c3c2836cab35983b9dc1938b903cfa253b9e33974c1416d62a00111385adcfa2b98df456437ab704f709a2ecca76a90134ef5eb4832
   languageName: node
   linkType: hard
 
-"w3c-xmlserializer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "w3c-xmlserializer@npm:3.0.0"
+"w3c-xmlserializer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "w3c-xmlserializer@npm:4.0.0"
   dependencies:
     xml-name-validator: ^4.0.0
-  checksum: 0af8589942eeb11c9fe29eb31a1a09f3d5dd136aea53a9848dfbabff79ac0dd26fe13eb54d330d5555fe27bb50b28dca0715e09f9cc2bfa7670ccc8b7f919ca2
+  checksum: eba070e78deb408ae8defa4d36b429f084b2b47a4741c4a9be3f27a0a3d1845e277e3072b04391a138f7e43776842627d1334e448ff13ff90ad9fb1214ee7091
   languageName: node
   linkType: hard
 
@@ -18785,12 +18231,13 @@ dexie@latest:
   linkType: hard
 
 "webpack-merge@npm:^5.7.3":
-  version: 5.7.3
-  resolution: "webpack-merge@npm:5.7.3"
+  version: 5.10.0
+  resolution: "webpack-merge@npm:5.10.0"
   dependencies:
     clone-deep: ^4.0.1
+    flat: ^5.0.2
     wildcard: ^2.0.0
-  checksum: 09608c3a4928246e9c1c09c22b5f867c38d0ab0fb027ebcc3b15d42659f06a10cfa7f7e2cf2a0ace6f2d571c1cd744ec23e7b2069d34a70378e163e8e035c290
+  checksum: 1fe8bf5309add7298e1ac72fb3f2090e1dfa80c48c7e79fa48aa60b5961332c7d0d61efa8851acb805e6b91a4584537a347bc106e05e9aec87fa4f7088c62f2f
   languageName: node
   linkType: hard
 
@@ -18811,9 +18258,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"webpack@npm:5.88.0":
-  version: 5.88.0
-  resolution: "webpack@npm:5.88.0"
+"webpack@npm:5.89.0":
+  version: 5.89.0
+  resolution: "webpack@npm:5.89.0"
   dependencies:
     "@types/eslint-scope": ^3.7.3
     "@types/estree": ^1.0.0
@@ -18844,17 +18291,16 @@ dexie@latest:
       optional: true
   bin:
     webpack: bin/webpack.js
-  checksum: 9fd1568b34ec2e99ba97c8509a15ab2576ec80c396e7015551ec814b24cfc11de173acba3e114dafe95f1a6d460781b09d6201e6a1fb15110e1d01a09f61a283
+  checksum: 43fe0dbc30e168a685ef5a86759d5016a705f6563b39a240aa00826a80637d4a3deeb8062e709d6a4b05c63e796278244c84b04174704dc4a37bedb0f565c5ed
   languageName: node
   linkType: hard
 
-"webrtc-adapter@npm:6.4.8":
-  version: 6.4.8
-  resolution: "webrtc-adapter@npm:6.4.8"
+"webrtc-adapter@npm:8.2.3":
+  version: 8.2.3
+  resolution: "webrtc-adapter@npm:8.2.3"
   dependencies:
-    rtcpeerconnection-shim: ^1.2.14
-    sdp: ^2.9.0
-  checksum: c485ae6f0ad68929eb822a15dc8d4f679619313ce5afd8097c1d371210fc313572b08661face39eb1e765ee5ae25f55ebfe07ba6ab87463df13353cee2ff7d1b
+    sdp: ^3.2.0
+  checksum: 8239c9452c489c9aad2584b5d00af22462c3e0f1b7885c6e4036b518d2b9411d94c00d2ceadbed987459a3647cfc4ce04c0eb75dd5ae7c3d7df9b810525e6a07
   languageName: node
   linkType: hard
 
@@ -18868,9 +18314,9 @@ dexie@latest:
   linkType: hard
 
 "whatwg-fetch@npm:^3.4.1":
-  version: 3.6.2
-  resolution: "whatwg-fetch@npm:3.6.2"
-  checksum: ee976b7249e7791edb0d0a62cd806b29006ad7ec3a3d89145921ad8c00a3a67e4be8f3fb3ec6bc7b58498724fd568d11aeeeea1f7827e7e1e5eae6c8a275afed
+  version: 3.6.19
+  resolution: "whatwg-fetch@npm:3.6.19"
+  checksum: 2896bc9ca867ea514392c73e2a272f65d5c4916248fe0837a9df5b1b92f247047bc76cf7c29c28a01ac6c5fb4314021d2718958c8a08292a96d56f72b2f56806
   languageName: node
   linkType: hard
 
@@ -18912,7 +18358,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^8.1.0":
+"whatwg-url@npm:^8.4.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
   dependencies:
@@ -18936,6 +18382,26 @@ dexie@latest:
   languageName: node
   linkType: hard
 
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
+  dependencies:
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
 "which-collection@npm:^1.0.1":
   version: 1.0.1
   resolution: "which-collection@npm:1.0.1"
@@ -18955,17 +18421,16 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.9":
-  version: 1.1.9
-  resolution: "which-typed-array@npm:1.1.9"
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.9":
+  version: 1.1.11
+  resolution: "which-typed-array@npm:1.1.11"
   dependencies:
     available-typed-arrays: ^1.0.5
     call-bind: ^1.0.2
     for-each: ^0.3.3
     gopd: ^1.0.1
     has-tostringtag: ^1.0.0
-    is-typed-array: ^1.1.10
-  checksum: fe0178ca44c57699ca2c0e657b64eaa8d2db2372a4e2851184f568f98c478ae3dc3fdb5f7e46c384487046b0cf9e23241423242b277e03e8ba3dabc7c84c98ef
+  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
   languageName: node
   linkType: hard
 
@@ -19001,9 +18466,9 @@ dexie@latest:
   linkType: hard
 
 "wildcard@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "wildcard@npm:2.0.0"
-  checksum: 1f4fe4c03dfc492777c60f795bbba597ac78794f1b650d68f398fbee9adb765367c516ebd4220889b6a81e9626e7228bbe0d66237abb311573c2ee1f4902a5ad
+  version: 2.0.1
+  resolution: "wildcard@npm:2.0.1"
+  checksum: e0c60a12a219e4b12065d1199802d81c27b841ed6ad6d9d28240980c73ceec6f856771d575af367cbec2982d9ae7838759168b551776577f155044f5a5ba843c
   languageName: node
   linkType: hard
 
@@ -19011,152 +18476,133 @@ dexie@latest:
   version: 0.0.0-use.local
   resolution: "wire-webapp@workspace:."
   dependencies:
-    "@babel/core": 7.22.5
-    "@babel/eslint-parser": 7.22.5
-    "@babel/plugin-proposal-decorators": 7.22.5
-    "@babel/preset-env": 7.22.5
-    "@babel/preset-react": 7.22.5
-    "@babel/preset-typescript": 7.22.5
-    "@datadog/browser-logs": ^4.43.0
-    "@datadog/browser-rum": ^4.43.0
+    "@babel/core": 7.23.2
+    "@babel/eslint-parser": 7.22.15
+    "@babel/plugin-proposal-decorators": 7.23.2
+    "@babel/preset-env": 7.23.2
+    "@babel/preset-react": 7.22.15
+    "@babel/preset-typescript": 7.23.2
+    "@datadog/browser-logs": ^4.50.1
+    "@datadog/browser-rum": ^4.50.1
     "@emotion/eslint-plugin": ^11.11.0
     "@emotion/react": 11.11.1
-    "@faker-js/faker": 7.6.0
-    "@formatjs/cli": 6.1.3
+    "@faker-js/faker": 8.1.0
+    "@formatjs/cli": 6.2.1
     "@koush/wrtc": 0.5.3
-    "@testing-library/react": 13.4.0
-    "@types/adm-zip": 0.5.0
-    "@types/caniuse-lite": ^1.0.1
-    "@types/classnames": 2.3.1
-    "@types/dexie-batch": 0.4.3
-    "@types/eslint": 8.37.0
-    "@types/fs-extra": 11.0.1
-    "@types/generate-changelog": 1.8.1
-    "@types/highlight.js": 10.1.0
-    "@types/jest": 29.5.2
+    "@lexical/history": 0.12.2
+    "@lexical/react": 0.12.2
+    "@peculiar/x509": 1.9.5
+    "@testing-library/react": 14.0.0
+    "@types/adm-zip": 0.5.2
+    "@types/dexie-batch": 0.4.6
+    "@types/eslint": ^8
+    "@types/fs-extra": 11.0.3
+    "@types/generate-changelog": 1.8.2
+    "@types/jest": 29.5.6
     "@types/jquery": ^3
-    "@types/js-cookie": 3.0.3
-    "@types/jsdom": 21.1.1
-    "@types/keyboardjs": 2.5.1
+    "@types/js-cookie": 3.0.5
+    "@types/jsdom": 21.1.4
+    "@types/keyboardjs": 2.5.2
     "@types/libsodium-wrappers": ^0
-    "@types/linkify-it": 3.0.2
-    "@types/markdown-it": 12.2.3
-    "@types/node": ^18.16.3
-    "@types/open-graph": 0.2.2
-    "@types/platform": 1.3.4
-    "@types/prettier": ^2.7.3
-    "@types/react": 18.0.28
-    "@types/react-dom": 18.2.6
-    "@types/react-redux": 7.1.25
-    "@types/react-transition-group": 4.4.6
-    "@types/redux-mock-store": 1.0.3
+    "@types/linkify-it": 3.0.4
+    "@types/loadable__component": ^5
+    "@types/markdown-it": 13.0.4
+    "@types/node": ^20.8.7
+    "@types/open-graph": 0.2.4
+    "@types/platform": 1.3.5
+    "@types/react": 18.2.28
+    "@types/react-dom": 18.2.14
+    "@types/react-redux": 7.1.28
+    "@types/react-transition-group": 4.4.8
+    "@types/redux-mock-store": 1.0.5
     "@types/seedrandom": ^3
-    "@types/sinon": 10.0.15
-    "@types/speakingurl": 13.0.3
-    "@types/uint32": 0.2.0
-    "@types/underscore": 1.11.5
-    "@types/webpack-env": 1.18.1
-    "@typescript-eslint/eslint-plugin": ^5.60.0
-    "@typescript-eslint/parser": ^5.60.0
-    "@wireapp/avs": 9.2.15
-    "@wireapp/copy-config": 2.1.1
-    "@wireapp/core": 40.6.0
-    "@wireapp/eslint-config": 2.2.2
+    "@types/sinon": 10.0.19
+    "@types/speakingurl": 13.0.5
+    "@types/underscore": 1.11.12
+    "@types/webpack-env": 1.18.3
+    "@wireapp/avs": 9.5.2
+    "@wireapp/commons": 5.2.1
+    "@wireapp/copy-config": 2.1.9
+    "@wireapp/core": 42.17.0
+    "@wireapp/eslint-config": 3.0.4
     "@wireapp/lru-cache": 3.8.1
-    "@wireapp/prettier-config": 0.6.0
-    "@wireapp/react-ui-kit": 9.7.5
-    "@wireapp/store-engine": ^5.1.1
-    "@wireapp/store-engine-dexie": 2.1.1
+    "@wireapp/prettier-config": 0.6.3
+    "@wireapp/react-ui-kit": 9.9.11
+    "@wireapp/store-engine": ^5.1.4
+    "@wireapp/store-engine-dexie": 2.1.6
     "@wireapp/store-engine-sqleet": 1.8.9
-    "@wireapp/webapp-events": 0.17.0
+    "@wireapp/webapp-events": 0.18.3
     adm-zip: 0.5.10
     amplify: "https://github.com/wireapp/amplify#head=master"
-    archiver: ^5.3.1
-    autoprefixer: ^10.4.13
-    babel-loader: 9.1.2
-    babel-plugin-transform-import-meta: ^2.2.0
-    beautiful-react-hooks: ^4.3.0
-    caniuse-lite: ^1.0.30001507
+    archiver: ^6.0.1
+    autoprefixer: ^10.4.16
+    babel-loader: 9.1.3
+    babel-plugin-transform-import-meta: ^2.2.1
+    beautiful-react-hooks: ^5.0.0
     classnames: 2.3.2
     copy-webpack-plugin: 11.0.0
-    core-js: 3.25.5
-    countly-sdk-web: 23.2.2
+    core-js: 3.33.1
+    countly-sdk-web: 23.6.2
     cross-env: 7.0.3
-    cspell: 6.31.1
+    cspell: 7.3.8
     css-loader: ^6.8.1
-    cssnano: ^5.1.14
+    cssnano: 6.0.1
     date-fns: 2.30.0
-    dexie: 3.2.3
+    dexie: 3.2.4
     dexie-batch: 0.4.3
     dotenv: 16.3.1
-    dpdm: 3.13.1
-    eslint: ^8.41.0
-    eslint-config-prettier: ^8.8.0
-    eslint-import-resolver-alias: ^1.1.2
-    eslint-import-resolver-typescript: ^3.5.5
-    eslint-plugin-babel: 5.3.1
-    eslint-plugin-better-styled-components: ^1.1.2
-    eslint-plugin-header: ^3.1.1
-    eslint-plugin-import: ^2.27.5
-    eslint-plugin-jest: ^27.2.2
-    eslint-plugin-jest-dom: ^4.0.3
-    eslint-plugin-jsdoc: ^39.8.0
-    eslint-plugin-jsx-a11y: ^6.7.1
-    eslint-plugin-no-unsanitized: ^4.0.2
-    eslint-plugin-prettier: ^4.2.1
-    eslint-plugin-react: ^7.32.2
-    eslint-plugin-react-hooks: ^4.6.0
-    eslint-plugin-simple-import-sort: ^8.0.0
-    eslint-plugin-sort-keys-fix: 1.1.2
-    eslint-plugin-testing-library: ^5.11.0
-    eslint-plugin-typescript-sort-keys: 2.3.0
-    eslint-plugin-unused-imports: ^2.0.0
-    fake-indexeddb: 4.0.1
+    dpdm: 3.14.0
+    emoji-picker-react: 4.5.3
+    eslint: ^8.52.0
+    eslint-plugin-prettier: ^5.0.1
+    fake-indexeddb: 4.0.2
     generate-changelog: 1.8.0
-    highlight.js: 11.8.0
+    highlight.js: 11.9.0
     html-webpack-plugin: ^5.5.3
-    http-status-codes: 2.2.0
-    husky: 7.0.4
-    i18next-scanner: 4.2.0
+    http-status-codes: 2.3.0
+    husky: 8.0.3
+    i18next-scanner: 4.4.0
     intersection-observer: 0.12.2
-    jest: 29.5.0
-    jest-canvas-mock: 2.5.1
-    jest-environment-jsdom: 29.5.0
-    jest-jasmine2: 29.5.0
-    jimp: 0.22.8
-    jquery: 3.7.0
-    js-cookie: 3.0.1
+    jest: 29.7.0
+    jest-canvas-mock: 2.5.2
+    jest-environment-jsdom: 29.7.0
+    jest-jasmine2: 29.7.0
+    jimp: 0.22.10
+    jquery: 3.7.1
+    js-cookie: 3.0.5
     jsdom-worker: 0.3.0
     jszip: 3.10.1
     keyboardjs: 2.7.0
     knockout: 3.5.1
-    less: 3.13.1
+    less: 4.2.0
     less-loader: ^11.1.3
-    libsodium-wrappers: 0.7.11
+    lexical: 0.12.2
+    libsodium-wrappers: 0.7.13
     linkify-it: 4.0.1
-    lint-staged: 13.2.2
+    lint-staged: 15.0.1
     long: 5.2.3
-    markdown-it: 13.0.1
+    markdown-it: 13.0.2
     murmurhash: 2.0.1
-    node-fetch: 2.6.11
+    node-fetch: 2.7.0
+    oidc-client-ts: ^2.2.5
     os-browserify: 0.3.0
     path-browserify: 1.0.1
     platform: 1.3.6
-    postcss: 8.4.24
+    postcss: 8.4.31
     postcss-import: ^15.1.0
     postcss-less: 6.0.0
     postcss-loader: ^7.3.3
-    postcss-preset-env: ^8.5.1
-    postcss-scss: 4.0.6
-    prettier: ^2.8.8
+    postcss-preset-env: ^9.2.0
+    postcss-scss: 4.0.9
+    prettier: ^3.0.3
     raf: 3.4.1
     react: 18.2.0
     react-dom: 18.2.0
-    react-error-boundary: 4.0.10
-    react-intl: 6.4.4
-    react-redux: 8.1.1
-    react-router: 6.14.0
-    react-router-dom: 6.14.0
+    react-error-boundary: 4.0.11
+    react-intl: 6.5.1
+    react-redux: 8.1.3
+    react-router: 6.17.0
+    react-router-dom: 6.17.0
     react-transition-group: 4.4.5
     redux: 4.2.1
     redux-devtools-extension: 2.13.9
@@ -19164,12 +18610,12 @@ dexie@latest:
     redux-mock-store: 1.5.4
     redux-thunk: 2.4.2
     seedrandom: ^3.0.5
-    simple-git: 3.19.0
-    sinon: 15.2.0
+    simple-git: 3.20.0
+    sinon: 16.1.0
     snabbdom: 3.5.1
     speakingurl: 14.0.1
     style-loader: ^3.3.3
-    stylelint: 14.16.1
+    stylelint: ^15
     stylelint-config-idiomatic-order: 9.0.0
     stylelint-config-prettier: 9.0.5
     svg-inline-loader: 0.8.2
@@ -19178,50 +18624,49 @@ dexie@latest:
     text-encoding: 0.7.0
     ts-node: 10.9.1
     tsc-watch: 6.0.4
-    tsyringe: 4.7.0
-    typescript: 5.0.4
-    uint32: 0.2.1
+    tsyringe: 4.8.0
+    typescript: 5.2.2
     underscore: 1.13.6
     uuidjs: 4.2.13
-    webpack: 5.88.0
+    webpack: 5.89.0
     webpack-cli: 5.1.4
     webpack-dev-middleware: 6.1.1
     webpack-hot-middleware: 2.25.4
-    webrtc-adapter: 6.4.8
-    workbox-webpack-plugin: 6.6.1
-    zustand: 4.3.8
+    webrtc-adapter: 8.2.3
+    workbox-webpack-plugin: 7.0.0
+    zustand: 4.4.4
   languageName: unknown
   linkType: soft
 
-"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
-  version: 1.2.3
-  resolution: "word-wrap@npm:1.2.3"
-  checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
+"word-wrap@npm:~1.2.3":
+  version: 1.2.5
+  resolution: "word-wrap@npm:1.2.5"
+  checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb
   languageName: node
   linkType: hard
 
-"workbox-background-sync@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-background-sync@npm:6.6.1"
+"workbox-background-sync@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-background-sync@npm:7.0.0"
   dependencies:
     idb: ^7.0.1
-    workbox-core: 6.6.1
-  checksum: cc05e68c075c58020fe435506df5c555a83ebd9b4cdbe5f38f40783112c7e6218be82354077af8b80c311946a824590fe24ee11bbd3b95008ec209b456212c20
+    workbox-core: 7.0.0
+  checksum: 79b64416563761d36b91342d6ce2618d1c984bebcd511ce56b80098127e42c676d4831dd566a0a80a6bb52a618ad815b277ce6b310e4a5c5043e7394829d30c6
   languageName: node
   linkType: hard
 
-"workbox-broadcast-update@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-broadcast-update@npm:6.6.1"
+"workbox-broadcast-update@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-broadcast-update@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: 4cc88f5e2e94beed805e128da62f77ef6da77c84a687cce1639252884c8a2d1453179cc5b719fc8c1458dd15da6dccc8f335580db398619cfda56cc520b3b4ff
+    workbox-core: 7.0.0
+  checksum: eee5c09fd78b3439348c7c92013f63700f14004d46161f19b0daf0d01303c6785f0953b746258cfb2627932108631370c8fa52ec5b526177cd528ae02530370e
   languageName: node
   linkType: hard
 
-"workbox-build@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-build@npm:6.6.1"
+"workbox-build@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-build@npm:7.0.0"
   dependencies:
     "@apideck/better-ajv-errors": ^0.3.1
     "@babel/core": ^7.11.1
@@ -19245,163 +18690,174 @@ dexie@latest:
     strip-comments: ^2.0.1
     tempy: ^0.6.0
     upath: ^1.2.0
-    workbox-background-sync: 6.6.1
-    workbox-broadcast-update: 6.6.1
-    workbox-cacheable-response: 6.6.1
-    workbox-core: 6.6.1
-    workbox-expiration: 6.6.1
-    workbox-google-analytics: 6.6.1
-    workbox-navigation-preload: 6.6.1
-    workbox-precaching: 6.6.1
-    workbox-range-requests: 6.6.1
-    workbox-recipes: 6.6.1
-    workbox-routing: 6.6.1
-    workbox-strategies: 6.6.1
-    workbox-streams: 6.6.1
-    workbox-sw: 6.6.1
-    workbox-window: 6.6.1
-  checksum: 858d88a0aa9e0a8aec5f528b305e3fa7db3778f762d1866fe69c16a11016d0ab8675625ad967660edf8e262ff62dd599c30ac8b5a0618f6974e89ed1d2b41a38
-  languageName: node
-  linkType: hard
-
-"workbox-cacheable-response@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-cacheable-response@npm:6.6.1"
+    workbox-background-sync: 7.0.0
+    workbox-broadcast-update: 7.0.0
+    workbox-cacheable-response: 7.0.0
+    workbox-core: 7.0.0
+    workbox-expiration: 7.0.0
+    workbox-google-analytics: 7.0.0
+    workbox-navigation-preload: 7.0.0
+    workbox-precaching: 7.0.0
+    workbox-range-requests: 7.0.0
+    workbox-recipes: 7.0.0
+    workbox-routing: 7.0.0
+    workbox-strategies: 7.0.0
+    workbox-streams: 7.0.0
+    workbox-sw: 7.0.0
+    workbox-window: 7.0.0
+  checksum: f230463833a8b6d1beadbfb4db5526d1b6b047ffa23abcd2afdc306510e1f3f942a74d1c59c76ee371a326bb2fe616ced05d0c53aefee5902c68a3f31faa27dc
+  languageName: node
+  linkType: hard
+
+"workbox-cacheable-response@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-cacheable-response@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: 5095404f11b44d97fdec1bedf6a59dd4e6967c9bbd5d13ff7a93433208b4c63062c72f8fcfe358bc310c14fe4dd062f11c1d07cdd88cf050fcfab9c303b7e8cc
+    workbox-core: 7.0.0
+  checksum: c9d834b25564ee01dd4df17b1f27e61160a3b610f40c0e297a9973712878fe617e168e3b1541c7b70b0de3828cb4b62de3088424b4a2872ed5a106e7e777772f
   languageName: node
   linkType: hard
 
-"workbox-core@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-core@npm:6.6.1"
-  checksum: b11f3908607328e3886878aafb326f1d62052e3adf778f65ae9f80dc10a002e84e1c70e9c32d852bd4961fd1e42dd42cbf4617de6bb4692f941abab458780baf
+"workbox-core@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-core@npm:7.0.0"
+  checksum: ca64872f9ce59ee1f3f32a5ecbde36377081a221930c6f925e2c0d7fe39d3fdc309166c430d56d972eba4f7c40d2e7e91a0020699a0745790fbef578ff8f34f6
   languageName: node
   linkType: hard
 
-"workbox-expiration@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-expiration@npm:6.6.1"
+"workbox-expiration@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-expiration@npm:7.0.0"
   dependencies:
     idb: ^7.0.1
-    workbox-core: 6.6.1
-  checksum: ae1425b9554345900a2a391b221434fcfe8976cf746c11116f4e72427c5e3b2e49f63276505de08017fec93169101241d57b0a9bca7cc39e48db25bbc289dfb8
+    workbox-core: 7.0.0
+  checksum: 3d7cce573111bfb32f35d97ea95d5016ac42bdc0f3ab5096e5c0fd799dd466ccc3cbfdbdeab4e7158923ae3e406f2002add01e5c9369f9c3e2623e41bc04b324
   languageName: node
   linkType: hard
 
-"workbox-google-analytics@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-google-analytics@npm:6.6.1"
+"workbox-google-analytics@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-google-analytics@npm:7.0.0"
   dependencies:
-    workbox-background-sync: 6.6.1
-    workbox-core: 6.6.1
-    workbox-routing: 6.6.1
-    workbox-strategies: 6.6.1
-  checksum: 85f2b783ba95241e241f29a239bd42ee099f318e74517e89c9f66961b2ac0ec57fa7840112df38cb8c46c18531a715edb3ca306f58afb8f285abb8e984ae3e33
+    workbox-background-sync: 7.0.0
+    workbox-core: 7.0.0
+    workbox-routing: 7.0.0
+    workbox-strategies: 7.0.0
+  checksum: defb12c3f4cf924aef8c647724c32d1100042447aed20128702815eba0f6d55ba6dde6557036dc13d68c0ab0570188757136bd453823fe25f2fa541cb18b8e0c
   languageName: node
   linkType: hard
 
-"workbox-navigation-preload@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-navigation-preload@npm:6.6.1"
+"workbox-navigation-preload@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-navigation-preload@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: 2b3e2a7aa127f9b5934a430b5bc9ab1871238c7a4488aa86592fe796869dac4dd9a192d1c16be2d09e176a046f7b851d5fc9e46a938eb5e4523b58f6a41e50bf
+    workbox-core: 7.0.0
+  checksum: 329018003ce44812d37f1e168960abe34c7ac4b8cd1c8f86da172e73919fb51ba94a63db3b4024614066bf1ea38e1a89839eafd46eed9a13015dd4cf6fcd056c
   languageName: node
   linkType: hard
 
-"workbox-precaching@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-precaching@npm:6.6.1"
+"workbox-precaching@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-precaching@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-    workbox-routing: 6.6.1
-    workbox-strategies: 6.6.1
-  checksum: 48d1926f2c82c28d860076c23db19ad2f863c430261ca6287e134e9f88a6bdabb8ed97734d2893cc1136fb4d35c342b842e5745407f34a2e6176e352e4b1a2df
+    workbox-core: 7.0.0
+    workbox-routing: 7.0.0
+    workbox-strategies: 7.0.0
+  checksum: 311b1c4a162e976e0a41e36e6a96eb64fea381eda538d8a9ae962d4f39c5ba420617753aac44e19105de19aef5242c9c68a09226d144ca3cf62738fc9f491f5d
   languageName: node
   linkType: hard
 
-"workbox-range-requests@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-range-requests@npm:6.6.1"
+"workbox-range-requests@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-range-requests@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: 0002496256bdc86749f39723f6428e98855f8725a4c3d1cfe0526994383ac6d18ddbfc662109214fa7648cd3d63c2183dced6732d25493e4037c4145fa181ada
+    workbox-core: 7.0.0
+  checksum: 04f6d7921a8a4a024b0bf0049a592ebedcdd285a52d1b8714e0a53efc936339dac39c3a5b5b6db9a3356b9f3ed1876024403260ec426cf9dc65e3b7ba5464914
   languageName: node
   linkType: hard
 
-"workbox-recipes@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-recipes@npm:6.6.1"
+"workbox-recipes@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-recipes@npm:7.0.0"
   dependencies:
-    workbox-cacheable-response: 6.6.1
-    workbox-core: 6.6.1
-    workbox-expiration: 6.6.1
-    workbox-precaching: 6.6.1
-    workbox-routing: 6.6.1
-    workbox-strategies: 6.6.1
-  checksum: 2ed3dc06798ee31a8c8930b8656224aac0a1513d6476b432155e9aedca6c946fe4b034f358364886c733398ecb776f42fd5806d52ab83d406a456d03b6af5a15
+    workbox-cacheable-response: 7.0.0
+    workbox-core: 7.0.0
+    workbox-expiration: 7.0.0
+    workbox-precaching: 7.0.0
+    workbox-routing: 7.0.0
+    workbox-strategies: 7.0.0
+  checksum: 253d50a315855917ca6683d6a3e910ac3c6f8915a8bcc80a7f15f277db7f48dc288c0ec2d9cdc64390bdd50446e66910246f384ce19f46688db97c715b323123
   languageName: node
   linkType: hard
 
-"workbox-routing@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-routing@npm:6.6.1"
+"workbox-routing@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-routing@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: fc9763ebddadf1b4edaa8ae327c382b98f356d5212315cd7c902e2b863f7fa28b439bcfa56d9cdfaf573a357b0852adfb4821c11635bf68cdd34795104d5c60e
+    workbox-core: 7.0.0
+  checksum: 9ea5b00fde5d90819e29ebf6d4aec3b84abec97854eb333c71b83548f1ba12b7f92d764a159f23cfa9e8164940e7b7136536fc0477784560cf2108d8dfe7f83b
   languageName: node
   linkType: hard
 
-"workbox-strategies@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-strategies@npm:6.6.1"
+"workbox-strategies@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-strategies@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-  checksum: e0382eac3062b243e0e422ee2b09dc3105158d4280893d351c69b7cf737c935e3028e3bf4cd35ecefa996fbc7813f1bd222dc0b48caa99394743189d30d4dabb
+    workbox-core: 7.0.0
+  checksum: 4f20604e762fb43b32a16d60e014d14c0933300083c109a95251c06c65c25c9d78ab16bbe638b64435911d4a01ae5f7c28c7e78d611a122ee6453be2c42a87dc
   languageName: node
   linkType: hard
 
-"workbox-streams@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-streams@npm:6.6.1"
+"workbox-streams@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-streams@npm:7.0.0"
   dependencies:
-    workbox-core: 6.6.1
-    workbox-routing: 6.6.1
-  checksum: dffab50f95380db3cf48496db1d42df25ec1c6054da2a6176479290b0fd6ba3e0acedb1f946ee0425a8009a79cbcddc691a9bf3d710b62bc0e676db4306d7c46
+    workbox-core: 7.0.0
+    workbox-routing: 7.0.0
+  checksum: e2975eb773bcf765c9cc8166936a9a2aaec2609fcddc178cbf6b2da54a113c4e2e62cbd257104861ea21b80c2a051936d62249f06d2414072405147f5181c0ef
   languageName: node
   linkType: hard
 
-"workbox-sw@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-sw@npm:6.6.1"
-  checksum: 8a9eeae4531ceb5cbdaf6c6ed3dc5039a67f20a644c5ff1869fc3a219a8155a4dfc4acb783b0dce0a9bb42090bf7b9618e21d6deb2483c8eb168e5c15ae9ade7
+"workbox-sw@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-sw@npm:7.0.0"
+  checksum: f2673bc3f73ef5a54349eb7c4c63aefb7dfe6b6492947851ffa44079efdbfff07a26e68a0f7ea3801e03ab3fdc29acdc36cd315b9fbdb8a60963c7cb95f2de43
   languageName: node
   linkType: hard
 
-"workbox-webpack-plugin@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-webpack-plugin@npm:6.6.1"
+"workbox-webpack-plugin@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-webpack-plugin@npm:7.0.0"
   dependencies:
     fast-json-stable-stringify: ^2.1.0
     pretty-bytes: ^5.4.1
     upath: ^1.2.0
     webpack-sources: ^1.4.3
-    workbox-build: 6.6.1
+    workbox-build: 7.0.0
   peerDependencies:
     webpack: ^4.4.0 || ^5.9.0
-  checksum: 91d379f63202a0daae51b9f27db18b6d27c3184bb553925143002ada79e28735be22b339ce88cbe804d451345d5840fa21a362915c092e1eb036507630cdb8f1
+  checksum: bfe366dbfe8258587a2160478700f3cb14ccb4c7485e933ea276b18e4636136323e293db96a1acd4ed521b90ec21cc6cbf17f7a1c06a77e6bac56f2a295843d3
   languageName: node
   linkType: hard
 
-"workbox-window@npm:6.6.1":
-  version: 6.6.1
-  resolution: "workbox-window@npm:6.6.1"
+"workbox-window@npm:7.0.0":
+  version: 7.0.0
+  resolution: "workbox-window@npm:7.0.0"
   dependencies:
     "@types/trusted-types": ^2.0.2
-    workbox-core: 6.6.1
-  checksum: 24f193ce44c214bbddea3eec9a937b97d3edf706f20bb47a3699babcf0d172a8be97cd3d97b9d6838bbca711c35530cd82bd8be23e6546bbb58e708c13d33167
+    workbox-core: 7.0.0
+  checksum: 486ceaf2c04953cd73fe04760929a9c42818b57fffbbaca3fc9065cfd6bf3f5a571d2ea78db177e548a98041c8752faa360dda8eaf0f10b8638ef3eb1b696b13
+  languageName: node
+  linkType: hard
+
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "wrap-ansi@npm:7.0.0"
+  dependencies:
+    ansi-styles: ^4.0.0
+    string-width: ^4.1.0
+    strip-ansi: ^6.0.0
+  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
   languageName: node
   linkType: hard
 
@@ -19415,25 +18871,14 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^6.2.0":
-  version: 6.2.0
-  resolution: "wrap-ansi@npm:6.2.0"
-  dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: 6cd96a410161ff617b63581a08376f0cb9162375adeb7956e10c8cd397821f7eb2a6de24eb22a0b28401300bf228c86e50617cd568209b5f6775b93c97d2fe3a
-  languageName: node
-  linkType: hard
-
-"wrap-ansi@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "wrap-ansi@npm:7.0.0"
+"wrap-ansi@npm:^8.0.1, wrap-ansi@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "wrap-ansi@npm:8.1.0"
   dependencies:
-    ansi-styles: ^4.0.0
-    string-width: ^4.1.0
-    strip-ansi: ^6.0.0
-  checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b
+    ansi-styles: ^6.1.0
+    string-width: ^5.0.1
+    strip-ansi: ^7.0.1
+  checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238
   languageName: node
   linkType: hard
 
@@ -19444,7 +18889,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^3.0.0":
+"write-file-atomic@npm:^3.0.3":
   version: 3.0.3
   resolution: "write-file-atomic@npm:3.0.3"
   dependencies:
@@ -19466,25 +18911,35 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"ws@npm:8.11.0, ws@npm:^8.8.0":
-  version: 8.11.0
-  resolution: "ws@npm:8.11.0"
+"write-file-atomic@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "write-file-atomic@npm:5.0.1"
+  dependencies:
+    imurmurhash: ^0.1.4
+    signal-exit: ^4.0.1
+  checksum: 8dbb0e2512c2f72ccc20ccedab9986c7d02d04039ed6e8780c987dc4940b793339c50172a1008eed7747001bfacc0ca47562668a069a7506c46c77d7ba3926a9
+  languageName: node
+  linkType: hard
+
+"ws@npm:8.14.2, ws@npm:^8.11.0":
+  version: 8.14.2
+  resolution: "ws@npm:8.14.2"
   peerDependencies:
     bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
+    utf-8-validate: ">=5.0.2"
   peerDependenciesMeta:
     bufferutil:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 316b33aba32f317cd217df66dbfc5b281a2f09ff36815de222bc859e3424d83766d9eb2bd4d667de658b6ab7be151f258318fb1da812416b30be13103e5b5c67
+  checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b
   languageName: node
   linkType: hard
 
-"xdg-basedir@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "xdg-basedir@npm:4.0.0"
-  checksum: 0073d5b59a37224ed3a5ac0dd2ec1d36f09c49f0afd769008a6e9cd3cd666bd6317bd1c7ce2eab47e1de285a286bad11a9b038196413cd753b79770361855f3c
+"xdg-basedir@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "xdg-basedir@npm:5.1.0"
+  checksum: b60e8a2c663ccb1dac77c2d913f3b96de48dafbfa083657171d3d50e10820b8a04bb4edfe9f00808c8c20e5f5355e1927bea9029f03136e29265cb98291e1fea
   languageName: node
   linkType: hard
 
@@ -19545,7 +19000,7 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
+"xtend@npm:^4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
   checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
@@ -19560,9 +19015,9 @@ dexie@latest:
   linkType: hard
 
 "y18n@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "y18n@npm:5.0.5"
-  checksum: f97d3cc7e5a0f68114721e39036cd64f4b993b06d08cea6e0cc8a684a7f34a2fee05be55e2e7dde7329ba77788376bd43b4eb19c6c9dbc3e2c3cdea68b3ba38e
+  version: 5.0.8
+  resolution: "y18n@npm:5.0.8"
+  checksum: 54f0fb95621ee60898a38c572c515659e51cc9d9f787fb109cef6fde4befbe1c4602dc999d30110feee37456ad0f1660fa2edcfde6a9a740f86a290999550d30
   languageName: node
   linkType: hard
 
@@ -19580,24 +19035,24 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"yaml@npm:^1.10.0, yaml@npm:^1.10.2":
-  version: 1.10.2
-  resolution: "yaml@npm:1.10.2"
-  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
+"yaml@npm:2.3.2":
+  version: 2.3.2
+  resolution: "yaml@npm:2.3.2"
+  checksum: acd80cc24df12c808c6dec8a0176d404ef9e6f08ad8786f746ecc9d8974968c53c6e8a67fdfabcc5f99f3dc59b6bb0994b95646ff03d18e9b1dcd59eccc02146
   languageName: node
   linkType: hard
 
-"yaml@npm:^2.2.2":
-  version: 2.2.2
-  resolution: "yaml@npm:2.2.2"
-  checksum: d90c235e099e30094dcff61ba3350437aef53325db4a6bcd04ca96e1bfe7e348b191f6a7a52b5211e2dbc4eeedb22a00b291527da030de7c189728ef3f2b4eb3
+"yaml@npm:^1.10.0":
+  version: 1.10.2
+  resolution: "yaml@npm:1.10.2"
+  checksum: ce4ada136e8a78a0b08dc10b4b900936912d15de59905b2bf415b4d33c63df1d555d23acb2a41b23cf9fb5da41c256441afca3d6509de7247daa062fd2c5ea5f
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^20.2.3":
-  version: 20.2.6
-  resolution: "yargs-parser@npm:20.2.6"
-  checksum: 4209eed182dfaa83f6f35610e50c1deab5156b35fc79738aadce083895265261d65431404a3b70b7b16a1e3f8751c1aeb1877683326827eea512b3242e338699
+"yargs-parser@npm:^20.2.9":
+  version: 20.2.9
+  resolution: "yargs-parser@npm:20.2.9"
+  checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3
   languageName: node
   linkType: hard
 
@@ -19618,9 +19073,9 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.7.1":
-  version: 17.7.1
-  resolution: "yargs@npm:17.7.1"
+"yargs@npm:^17.3.1, yargs@npm:^17.7.2":
+  version: 17.7.2
+  resolution: "yargs@npm:17.7.2"
   dependencies:
     cliui: ^8.0.1
     escalade: ^3.1.1
@@ -19629,7 +19084,7 @@ dexie@latest:
     string-width: ^4.2.3
     y18n: ^5.0.5
     yargs-parser: ^21.1.1
-  checksum: 3d8a43c336a4942bc68080768664aca85c7bd406f018bad362fd255c41c8f4e650277f42fd65d543fce99e084124ddafee7bbfc1a5c6a8fda4cec78609dcf8d4
+  checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a
   languageName: node
   linkType: hard
 
@@ -19668,30 +19123,47 @@ dexie@latest:
   languageName: node
   linkType: hard
 
-"zip-stream@npm:^4.1.0":
-  version: 4.1.0
-  resolution: "zip-stream@npm:4.1.0"
+"yocto-queue@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "yocto-queue@npm:1.0.0"
+  checksum: 2cac84540f65c64ccc1683c267edce396b26b1e931aa429660aefac8fbe0188167b7aee815a3c22fa59a28a58d898d1a2b1825048f834d8d629f4c2a5d443801
+  languageName: node
+  linkType: hard
+
+"zip-stream@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "zip-stream@npm:5.0.1"
   dependencies:
-    archiver-utils: ^2.1.0
-    compress-commons: ^4.1.0
+    archiver-utils: ^4.0.1
+    compress-commons: ^5.0.1
     readable-stream: ^3.6.0
-  checksum: 4a73da856738b0634700b52f4ab3fe0bf0a532bea6820ad962d0bda0163d2d5525df4859f89a7238e204a378384e12551985049790c1894c3ac191866e85887f
+  checksum: 116cee5a2c1ecce7aa440b665470653f58ef56670c6aafa1b5491c9f9335992352145502af5fa865ac82f46336905e37fb7cbc649c2be72e2152c6b91802995c
+  languageName: node
+  linkType: hard
+
+"zod@npm:3.22.4":
+  version: 3.22.4
+  resolution: "zod@npm:3.22.4"
+  checksum: 80bfd7f8039b24fddeb0718a2ec7c02aa9856e4838d6aa4864335a047b6b37a3273b191ef335bf0b2002e5c514ef261ffcda5a589fb084a48c336ffc4cdbab7f
   languageName: node
   linkType: hard
 
-"zustand@npm:4.3.8":
-  version: 4.3.8
-  resolution: "zustand@npm:4.3.8"
+"zustand@npm:4.4.4":
+  version: 4.4.4
+  resolution: "zustand@npm:4.4.4"
   dependencies:
     use-sync-external-store: 1.2.0
   peerDependencies:
+    "@types/react": ">=16.8"
     immer: ">=9.0"
     react: ">=16.8"
   peerDependenciesMeta:
+    "@types/react":
+      optional: true
     immer:
       optional: true
     react:
       optional: true
-  checksum: 24db6bf063ce1fc8b2ee238f13211a88f43236541a716e5f6f706f613c671a45332465f9ed06d694f8c353da3d24c53ea668e5712a86aceda9ad74f6c433e8c0
+  checksum: 371fd842dc704ed5983c6d64a77994c9c91867338c742d162ac95c4252b5f98fc38aeb2d5a07f48311babed5ca7dbff2d2258301db0ae143d32897bcf3ae651b
   languageName: node
   linkType: hard